Merge pull request #274 from JamesLupiani/BinaryXFileFix
Fixes #158 via anonymous userpull/280/head
commit
c5ba04cabf
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue