minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-12-25 18:20:30 +01:00
Code Issues Projects Releases Wiki Activity

Ensure enough alignment for IImages

Browse Source
This commit is contained in:
sfan5 2024-03-10 13:57:48 +01:00
parent 9d07f906a7
commit 26c4f4e63d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/Irrlicht/CImage.cpp
View File

@ -25,8 +25,10 @@ CImage::CImage(ECOLOR_FORMAT format, const core::dimension2d<u32>& size, void* d
else else
{ {
const u32 dataSize = getDataSizeFromFormat(Format, Size.Width, Size.Height); const u32 dataSize = getDataSizeFromFormat(Format, Size.Width, Size.Height);
const u32 allocSize = align_next(dataSize, 16);
Data = new u8[align_next(dataSize,16)]; // allocate as u32 to ensure enough alignment when casted
Data = reinterpret_cast<u8*>(new u32[allocSize / 4]);
memcpy(Data, data, dataSize); memcpy(Data, data, dataSize);
DeleteMemory = true; DeleteMemory = true;
} }
@ -36,7 +38,10 @@ CImage::CImage(ECOLOR_FORMAT format, const core::dimension2d<u32>& size, void* d
//! Constructor of empty image //! Constructor of empty image
CImage::CImage(ECOLOR_FORMAT format, const core::dimension2d<u32>& size) : IImage(format, size, true) CImage::CImage(ECOLOR_FORMAT format, const core::dimension2d<u32>& size) : IImage(format, size, true)
{ {
Data = new u8[align_next(getDataSizeFromFormat(Format, Size.Width, Size.Height),16)]; const u32 dataSize = getDataSizeFromFormat(Format, Size.Width, Size.Height);
const u32 allocSize = align_next(dataSize, 16);
Data = reinterpret_cast<u8*>(new u32[allocSize / 4]);
DeleteMemory = true; DeleteMemory = true;
} }