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

Merge branch releases/1.8 revisions 5121:5124 into trunk: 

- Fix compiling with -DNO_IRR_COMPILE_WITH_LIBJPEG_


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5125 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2015-08-29 14:48:50 +00:00
parent acd601edbc
commit d72189faf2
2 changed files with 4 additions and 1 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 on GCC5 on MinGW (thannks to Slipxy for finding the bug and to osense for reporting it).
- Fix compiling with -DNO_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)
- Fix bug with multiple SetPixelFormat calls. (reported and fixed by anontypist)

2
source/Irrlicht/CImageLoaderJPG.cpp
View File

@ -16,8 +16,10 @@ namespace irr
namespace video
{
#ifdef _IRR_COMPILE_WITH_LIBJPEG_
// Static members
io::path CImageLoaderJPG::Filename;
#endif
//! constructor
CImageLoaderJPG::CImageLoaderJPG()