Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Reading gif, off-by-one

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2017-10-16 19:38:35 +03:00
parent d721c661ea
commit 81adb6c787
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/nel/src/misc/bitmap_gif.cpp
View file

@ -215,9 +215,6 @@ uint8 CBitmap::readGIF( NLMISC::IStream &f )
for (uint32 x = 0; x < width; x++) for (uint32 x = 0; x < width; x++)
{ {
srcOffset++;
dstOffset+= dstChannels;
uint32 index = curFrame->RasterBits[srcOffset]; uint32 index = curFrame->RasterBits[srcOffset];
if ((sint32)index != transparency) if ((sint32)index != transparency)
@ -250,6 +247,9 @@ uint8 CBitmap::readGIF( NLMISC::IStream &f )
_Data[0][dstOffset+1] = g; _Data[0][dstOffset+1] = g;
_Data[0][dstOffset+2] = b; _Data[0][dstOffset+2] = b;
_Data[0][dstOffset+3] = a; _Data[0][dstOffset+3] = a;
srcOffset++;
dstOffset+= dstChannels;
} // x loop } // x loop
} // y loop } // y loop
} // pass loop } // pass loop
@ -262,9 +262,6 @@ uint8 CBitmap::readGIF( NLMISC::IStream &f )
uint32 dstOffset = (y + offset_y)*gif->SWidth*dstChannels + offset_x*dstChannels; uint32 dstOffset = (y + offset_y)*gif->SWidth*dstChannels + offset_x*dstChannels;
for (uint32 x = 0; x < width; x++) for (uint32 x = 0; x < width; x++)
{ {
srcOffset++;
dstOffset+= dstChannels;
uint32 index = curFrame->RasterBits[srcOffset]; uint32 index = curFrame->RasterBits[srcOffset];
if ((sint32)index != transparency) if ((sint32)index != transparency)
@ -297,6 +294,9 @@ uint8 CBitmap::readGIF( NLMISC::IStream &f )
_Data[0][dstOffset+1] = g; _Data[0][dstOffset+1] = g;
_Data[0][dstOffset+2] = b; _Data[0][dstOffset+2] = b;
_Data[0][dstOffset+3] = a; _Data[0][dstOffset+3] = a;
srcOffset++;
dstOffset+= dstChannels;
} // x loop } // x loop
} // y loop } // y loop
} }