[Igarden-commit] CommonSource/CQTImagePane CGWorld.cpp, 1.22.2.2, 1.22.2.3

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/CommonSource/CQTImagePane
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13905/CQTImagePane

Modified Files:
      Tag: Release_branch_v1
	CGWorld.cpp 
Log Message:
Fix a problem with displaying pictures in OpenGL

Index: CGWorld.cpp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/CQTImagePane/CGWorld.cpp,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -C2 -d -r1.22.2.2 -r1.22.2.3
*** CGWorld.cpp	12 Mar 2008 22:52:16 -0000	1.22.2.2
--- CGWorld.cpp	18 Apr 2008 21:59:32 -0000	1.22.2.3
***************
*** 260,264 ****
--- 260,268 ----
  		destX = static_cast<long>(xSize/rectScale);
  		destY = static_cast<long>(ySize/rectScale);
+ #if OPT_NATIVEORDER
  		glDrawPixels(destX, destY, GL_BGRA_EXT, GL_UNSIGNED_INT_8_8_8_8_REV, baseAddress);
+ #else
+ 		glDrawPixels(destX, destY, GL_BGRA_EXT, GL_UNSIGNED_INT_8_8_8_8, baseAddress);
+ #endif
  		UnlockPixels();
  	}
***************
*** 356,360 ****
--- 360,368 ----
  		if(ySiz > inSrcRect.bottom-inSrcRect.top)
  			ySiz = inSrcRect.bottom-inSrcRect.top;
+ #if OPT_NATIVEORDER
  		glDrawPixels(xSiz, ySiz, GL_BGRA_EXT, GL_UNSIGNED_INT_8_8_8_8_REV, baseAddress);
+ #else
+ 		glDrawPixels(xSiz, ySiz, GL_BGRA_EXT, GL_UNSIGNED_INT_8_8_8_8, baseAddress);
+ #endif
  		errCode = glGetError();
  		if(errCode != GL_NO_ERROR)