Merge branch 'master' of github.com:FreeCAD/FreeCAD

This commit is contained in:
Yorik van Havre
2016-10-31 11:07:59 -02:00

View File

@@ -179,7 +179,7 @@ public:
void setOffset( uint32 offset ) { cdir_offset = offset ; }
void setTotalCount( uint16 c ) { cdir_entries = c ; cdir_tot_entries = c ; }
int eocdOffSetFromEnd() const { return eocd_offset_from_end ; }
int eocdOffSetFromEnd() const { return static_cast<int>(eocd_offset_from_end) ; }
bool read( vector<unsigned char> &buf, int pos ) ;
private:
static const uint32 signature;