minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-07-04 09:10:27 +02:00
Code Issues Projects Releases Wiki Activity

Add IImage::checkDataSizeLimit and make IImage getDataSizeFromFormat return size_t

Browse Source 
It's to allow image loader to check for sane limits for image sizes.
Idea came from this patch from sfan5 for Minetest: dbd39120e7
Thought solution is a bit different. 
Image loader checks not yet added (will come soon).
Also note that limit is to s32. While u32 might work mostly it will run into some troubles with color converter for now (which maybe could be changes). Also 2GB ought to be enough for anybody, right?

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6386 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2022-05-06 19:47:38 +00:00
parent 76d013d9d6
commit 72b1522083
7 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/Irrlicht/CD3D9Texture.cpp
View File

@ -335,7 +335,7 @@ void CD3D9Texture::regenerateMipMapLevels(void* data, u32 layer)
u32 width = Size.Width;
u32 height = Size.Height;
u8* tmpData = static_cast<u8*>(data);
u32 dataSize = 0;
size_t dataSize = 0;
u32 level = 0;
do
@ -714,7 +714,7 @@ void CD3D9Texture::uploadTexture(void* data, u32 mipmapLevel, u32 layer)
u32 width = Size.Width >> mipmapLevel;
u32 height = Size.Height >> mipmapLevel;
u32 dataSize = IImage::getDataSizeFromFormat(ColorFormat, width, height);
size_t dataSize = IImage::getDataSizeFromFormat(ColorFormat, width, height);
HRESULT hr = 0;