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

Merge branch releases/1.8 revisions 5125:5127 into trunk: 

- Fix compiling with IRR_LINUX_XCURSOR_


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5128 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2015-08-29 16:26:05 +00:00
parent d72189faf2
commit 6e48dfe928
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes.txt
View File

@ -116,7 +116,8 @@ Changes in 1.9 (not yet released)
--------------------------
Changes in 1.8.2
- Fix compiling with -DNO_IRR_COMPILE_WITH_LIBJPEG_ (thx to anontypist for report and patch).
- Fix compiling with IRR_LINUX_XCURSOR_
- Fix compiling with NO_IRR_COMPILE_WITH_LIBJPEG_ (thx to anontypist for report and patch).
- Fix compiling on GCC5 on MinGW (thanks to Slipxy for finding the bug and to osense for reporting it).
- Fix loading of .X and .B3D models with non-normalized quaternion rotations (thanks to JLouisB for a test-model).
- Fix compiling on Free BSD (thanks to leper for reporting and patch)

2
source/Irrlicht/CIrrDeviceLinux.cpp
View File

@ -2298,7 +2298,7 @@ Cursor CIrrDeviceLinux::TextureToARGBCursor(irr::video::ITexture * tex, const co
u32 bytesLeftGap = sourceRect.UpperLeftCorner.X * bytesPerPixel;
u32 bytesRightGap = tex->getPitch() - sourceRect.LowerRightCorner.X * bytesPerPixel;
XcursorPixel* target = image->pixels;
const u8* data = (const u8*)tex->lock(ETLM_READ_ONLY, 0);
const u8* data = (const u8*)tex->lock(video::ETLM_READ_ONLY, 0);
data += sourceRect.UpperLeftCorner.Y*tex->getPitch();
for ( s32 y = 0; y < sourceRect.getHeight(); ++y )
{