luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6519 through r6561 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6562 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2023-10-16 21:17:56 +00:00
parent e9c494503d
commit 849336343d
169 changed files with 465 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/Irrlicht/CImageLoaderDDS.cpp
View File

@@ -18,9 +18,7 @@
#include "IReadFile.h"
#include "os.h"
#include "CColorConverter.h"
#include "CImage.h"
#include "irrString.h"
// Header flag values
#define DDSD_CAPS 0x00000001
@@ -721,9 +719,8 @@ IImage* CImageLoaderDDS::loadImage(io::IReadFile* file) const
image = new CImage(ECF_A8R8G8B8, core::dimension2d<u32>(width, height));
if (DDSDecompress(&header, memFile, (u8*)image->lock()) == -1)
if (DDSDecompress(&header, memFile, (u8*)image->getData()) == -1)
{
image->unlock();
image->drop();
image = 0;
}