Merge pull request #274 from JamesLupiani/BinaryXFileFix

Fixes #158 via anonymous user
pull/280/head
Kim Kulling 2014-05-12 19:57:50 +02:00
commit c5ba04cabf
2 changed files with 4 additions and 1 deletions

View File

@ -136,6 +136,9 @@ XFileParser::XFileParser( const std::vector<char>& pBuffer)
ThrowException( boost::str( boost::format( "Unknown float size %1% specified in xfile header.")
% mBinaryFloatSize));
// The x format specifies size in bits, but we work in bytes
mBinaryFloatSize /= 8;
P += 16;
// If this is a compressed X file, apply the inflate algorithm to it

View File

@ -144,7 +144,7 @@ protected:
protected:
unsigned int mMajorVersion, mMinorVersion; ///< version numbers
bool mIsBinaryFormat; ///< true if the file is in binary, false if it's in text form
unsigned int mBinaryFloatSize; ///< float size, either 32 or 64 bits
unsigned int mBinaryFloatSize; ///< float size in bytes, either 4 or 8
// counter for number arrays in binary format
unsigned int mBinaryNumCount;