zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from 1.7 branch, revisions 3515-3533. createImage memleak fixed. TGA loader fixed. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3534 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2011-01-03 22:38:16 +00:00
parent f1cc2dca01
commit a8be8a8c02
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/Irrlicht/CImage.cpp
View File

@ -52,7 +52,10 @@ void CImage::initData()
Pitch = BytesPerPixel * Size.Width;
if (!Data)
{
DeleteMemory=true;
Data = new u8[Size.Height * Pitch];
}
}

2
source/Irrlicht/CImageWriterTGA.cpp
View File

@ -133,7 +133,7 @@ bool CImageWriterTGA::writeImage(io::IWriteFile *file, IImage *image,u32 param)
if (file->write(&imageFooter, sizeof(imageFooter)) < (s32)sizeof(imageFooter))
return false;
return imageHeader.ImageHeight < y;
return imageHeader.ImageHeight <= y;
}
} // namespace video

3
source/Irrlicht/COpenGLDriver.cpp
View File

@ -839,7 +839,8 @@ void COpenGLDriver::clearBuffers(bool backBuffer, bool zBuffer, bool stencilBuff
if (stencilBuffer)
mask |= GL_STENCIL_BUFFER_BIT;
glClear(mask);
if (mask)
glClear(mask);
}