Merge pull request #1593 from psi29a/fix_mips_builds

fix building on mips machines
pull/1595/head
Bret Curtis 7 years ago committed by GitHub
commit b86118f76f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -153,12 +153,12 @@ void NiPixelData::read(NIFStream *nif)
// Unknown // Unknown
nif->skip(12); nif->skip(12);
mips = nif->getInt(); numberOfMipmaps = nif->getInt();
// Bytes per pixel, should be bpp * 8 // Bytes per pixel, should be bpp * 8
/* int bytes = */ nif->getInt(); /* int bytes = */ nif->getInt();
for(int i=0; i<mips; i++) for(int i=0; i<numberOfMipmaps; i++)
{ {
// Image size and offset in the following data field // Image size and offset in the following data field
Mipmap m; Mipmap m;

@ -115,7 +115,7 @@ public:
Format fmt; Format fmt;
unsigned int rmask, gmask, bmask, amask; unsigned int rmask, gmask, bmask, amask;
int bpp, mips; int bpp, numberOfMipmaps;
struct Mipmap struct Mipmap
{ {

Loading…
Cancel
Save