diff options
| author | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-06-12 20:41:49 +0000 |
|---|---|---|
| committer | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-06-12 20:41:49 +0000 |
| commit | 20b3d56987ca7b7a9d7f27b0a32a93f12e8dc530 (patch) | |
| tree | 5fd7cc45a44c46b1134788ed90ffb70398179f4d /source/Irrlicht/CImageLoaderRGB.cpp | |
| parent | 084e0e669a8d9c6a373ff3bcb410febca4d4a48a (diff) | |
| download | irrlicht-20b3d56987ca7b7a9d7f27b0a32a93f12e8dc530.tar.xz | |
Merging r6075 through r6106 from trunk to ogl-es branch.
Burnings renderer changes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6116 dfc29bdd-3216-0410-991c-e03cc46cb475
Diffstat (limited to 'source/Irrlicht/CImageLoaderRGB.cpp')
| -rw-r--r-- | source/Irrlicht/CImageLoaderRGB.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/Irrlicht/CImageLoaderRGB.cpp b/source/Irrlicht/CImageLoaderRGB.cpp index 1f0b141..dfb4b8b 100644 --- a/source/Irrlicht/CImageLoaderRGB.cpp +++ b/source/Irrlicht/CImageLoaderRGB.cpp @@ -555,7 +555,7 @@ void CImageLoaderRGB::readRGBrow(u8 *buf, int y, int z, io::IReadFile* file, rgb // limit the count value to the remaining row size
if (oPtr + count*rgb.Header.BPC > buf + rgb.Header.Xsize * rgb.Header.BPC)
{
- count = ( (buf + rgb.Header.Xsize * rgb.Header.BPC) - oPtr ) / rgb.Header.BPC;
+ count = (s32)( (buf + rgb.Header.Xsize * rgb.Header.BPC) - oPtr ) / rgb.Header.BPC;
}
if (count<=0)
|