Fixed 1bit bitmap conversion. Removed unnecessary ifdefs.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@994 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CColorConverter.cpp

@@ -29,7 +29,7 @@ void CColorConverter::convert1BitTo16Bit(const u8* in, s16* out, s32 width, s32
 
 		for (s32 x=0; x<width; ++x)
 		{
-			out[x] = *in>>shift & 0x01 ? (s16)0xffff : (s16)0x0000;
+			out[x] = *in>>shift & 0x01 ? (s16)0xffff : (s16)0x8000;
 
 			if ((--shift)<0) // 8 pixel done
 			{

source/Irrlicht/COpenGLExtensionHandler.cpp

@@ -33,9 +33,7 @@ COpenGLExtensionHandler::COpenGLExtensionHandler() :
 	pGlUniformMatrix3fvARB(0), pGlUniformMatrix4fvARB(0), pGlGetActiveUniformARB(0), pGlPointParameterfARB(0), pGlPointParameterfvARB(0),
 	pGlStencilFuncSeparate(0), pGlStencilOpSeparate(0),
 	pGlStencilFuncSeparateATI(0), pGlStencilOpSeparateATI(0),
-	#ifdef PFNGLCOMPRESSEDTEXIMAGE2DPROC
-		pGlCompressedTexImage2D(0),
-	#endif
+	pGlCompressedTexImage2D(0),
 #ifdef _IRR_USE_WINDOWS_DEVICE_
 	wglSwapIntervalEXT(0),
 #elif defined(GLX_SGI_swap_control)
@@ -147,9 +145,7 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 	pGlStencilOpSeparateATI = (PFNGLSTENCILOPSEPARATEATIPROC) wglGetProcAddress("glStencilOpSeparateATI");
 
 	// compressed textures
-	#ifdef PFNGLCOMPRESSEDTEXIMAGE2DPROC
 	pGlCompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC) wglGetProcAddress("glCompressedTexImage2D");
-	#endif
 
         // FrameBufferObjects
         pGlBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC) wglGetProcAddress("glBindFramebufferEXT");
@@ -298,10 +294,8 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 		IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glStencilOpSeparateATI"));
 
 	// compressed textures
-	#ifdef PFNGLCOMPRESSEDTEXIMAGE2DPROC
 	pGlCompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC)
 		IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glCompressedTexImage2D"));
-	#endif
 
 	#if defined(GLX_SGI_swap_control) && !defined(_IRR_USE_SDL_DEVICE_)
 		// get vsync extension

source/Irrlicht/COpenGLExtensionHandler.h

@@ -770,15 +770,11 @@ class COpenGLExtensionHandler
 		PFNGLGETACTIVEUNIFORMARBPROC pGlGetActiveUniformARB;
 		PFNGLPOINTPARAMETERFARBPROC  pGlPointParameterfARB;
 		PFNGLPOINTPARAMETERFVARBPROC pGlPointParameterfvARB;
-		#ifdef GL_ATI_separate_stencil
 		PFNGLSTENCILFUNCSEPARATEPROC pGlStencilFuncSeparate;
 		PFNGLSTENCILOPSEPARATEPROC pGlStencilOpSeparate;
 		PFNGLSTENCILFUNCSEPARATEATIPROC pGlStencilFuncSeparateATI;
 		PFNGLSTENCILOPSEPARATEATIPROC pGlStencilOpSeparateATI;
-		#endif
-		#ifdef PFNGLCOMPRESSEDTEXIMAGE2DPROC
 		PFNGLCOMPRESSEDTEXIMAGE2DPROC pGlCompressedTexImage2D;
-		#endif
 		#ifdef _IRR_WINDOWS_API_
 		typedef BOOL (APIENTRY *PFNWGLSWAPINTERVALFARPROC)(int);
 		PFNWGLSWAPINTERVALFARPROC wglSwapIntervalEXT;
@@ -1182,10 +1178,8 @@ inline void COpenGLExtensionHandler::extGlCompressedTexImage2D (GLenum target, G
 		GLsizei height, GLint border, GLsizei imageSize, const void* data)
 {
 #ifdef _IRR_OPENGL_USE_EXTPOINTER_
-	#ifdef PFNGLCOMPRESSEDTEXIMAGE2DPROC
-		if (pGlCompressedTexImage2D)
-			pGlCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
-	#endif
+	if (pGlCompressedTexImage2D)
+		pGlCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 #elif defined(GL_ARB_texture_compression)
 	glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 #else