Merge revision 4924:4925 from trunk to ogl-es:

- Fix bug with multiple SetPixelFormat calls.
- Fixed bug related to memory release in PNG image loader. Thanks elephoenix for it.
- Fix crash in CGUIListBox when users pressed end key folled by any other key in an empty, focused list box (thanks at porcus for report and patch).
- Fix use of enabling defines for wal2 (halflife) image loader. Thanks to hendu for noticing.
- Fix proper screenshot creation in test by inserting the stabilizeScreenBackground call.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4937 dfc29bdd-3216-0410-991c-e03cc46cb475

changes.txt

@@ -83,6 +83,13 @@ Changes in 1.9 (not yet released)
 --------------------------
 Changes in 1.8.2
 
+ - Fix bug with multiple SetPixelFormat calls. (reported and fixed by anontypist)
+ - Fix bug related to memory release in PNG image loader. Thanks elephoenix for it.
+ - Fix crash in CGUIListBox when users pressed end key folled by any other key in an empty, focused list box (thanks at porcus for report and patch).
+ - Fix use of enabling defines for wal2 (halflife) image loader. Thanks to hendu for noticing.
+ - Fix userClipPlane test by inserting the stabilizeScreenBackground call
+ - Demo enables antialiasing now correct (thanks to Mel for noticing).
+ - Update glext.h (bug #429)
  - Example 22 no longer select a random texture after loading a new texture (thanks at mongoose7 for reporting).
  - Fix bug in IGUISkin serialization which messed up serialization of the button-pressed offsets (thanks at Midnight for reporting).
  - IGUIStaticText::getTextHeight returns now the correct height for texts with newlines even WordWrap is not set.

source/Irrlicht/CGUIListBox.cpp

@@ -267,11 +267,11 @@ bool CGUIListBox::OnEvent(const SEvent& event)
 					default:
 						break;
 				}
-				if (Selected >= (s32)Items.size())
-					Selected = Items.size() - 1;
-				else
 				if (Selected<0)
 					Selected = 0;
+				if (Selected >= (s32)Items.size())
+					Selected = Items.size() - 1;	// will set Selected to -1 for empty listboxes which is correct
+				
 
 				recalculateScrollPos();
 

source/Irrlicht/CImageLoaderPNG.cpp

@@ -258,7 +258,7 @@ IImage* CImageLoaderPng::loadImage(io::IReadFile* file) const
 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 		delete [] RowPointers;
 		image->unlock();
-		delete [] image;
+		delete image;
 		return 0;
 	}
 

source/Irrlicht/CNullDriver.cpp

@@ -124,10 +124,8 @@ CNullDriver::CNullDriver(io::IFileSystem* io, const core::dimension2d<u32>& scre
 
 	// create surface loader
 
-#ifdef _IRR_COMPILE_WITH_HALFLIFE_LOADER_
-	SurfaceLoader.push_back(video::createImageLoaderHalfLife());
-#endif
 #ifdef _IRR_COMPILE_WITH_WAL_LOADER_
+	SurfaceLoader.push_back(video::createImageLoaderHalfLife());
 	SurfaceLoader.push_back(video::createImageLoaderWAL());
 #endif
 #ifdef _IRR_COMPILE_WITH_LMP_LOADER_

source/Irrlicht/CWGLManager.cpp

@@ -363,13 +363,13 @@ bool CWGLManager::generateSurface()
 			if (PixelFormat)
 				break;
 		}
-	}
+		
-
+		// set pixel format
-	// set pixel format
+		if (!SetPixelFormat(HDc, PixelFormat, &pfd))
-	if (!SetPixelFormat(HDc, PixelFormat, &pfd))
+		{
-	{
+			os::Printer::log("Cannot set the pixel format.", ELL_ERROR);
-		os::Printer::log("Cannot set the pixel format.", ELL_ERROR);
+			return false;
-		return false;
+		}
 	}
 
 	if (pfd.cAlphaBits != 0)

tests/userClipPlane.cpp

@@ -12,6 +12,8 @@ static bool withSphere(video::E_DRIVER_TYPE type)
 	video::IVideoDriver* driver = device->getVideoDriver();
 	scene::ISceneManager* smgr = device->getSceneManager();
 
+	stabilizeScreenBackground(driver);
+
 	driver->setClipPlane(0, core::plane3df(core::vector3df(0,18,0), core::vector3df(0,-1,0)), true);
 	smgr->addLightSceneNode(0, core::vector3df(30,30,50));
 	// create first sphere