[artoolkit-commits] artoolkit/lib/SRC/Gl gsub_lite.c,1.2,1.3

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13031

Modified Files:
	gsub_lite.c 
Log Message:
Revert to use of int rather than BOOL.

Index: gsub_lite.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gsub_lite.c	7 Nov 2004 23:42:20 -0000	1.2
--- gsub_lite.c	18 Feb 2005 04:18:51 -0000	1.3
***************
*** 15,18 ****
--- 15,19 ----
   *	2.7.4	2004-07-14	PRL		Added gluCheckExtension hack for GLU versions pre-1.3.
   *	2.7.5	2004-07-15	PRL		Added arglDispImageStateful(); removed extraneous glPixelStorei(GL_UNPACK_IMAGE_HEIGHT,...) calls.
+  *	2.7.6	2005-02-18	PRL		Go back to using int rather than BOOL, to avoid conflict with Objective-C.
   *
   */
***************
*** 137,149 ****
  
  struct _ARGL_CONTEXT_SETTINGS {
! 	BOOL		textureRectangleCapabilitiesChecked;
! 	BOOL		texturePow2CapabilitiesChecked;
  	GLuint		textureRectangle;
  	GLuint		texturePow2;
  	GLuint		listRectangle;
  	GLuint		listPow2;
! 	BOOL		initedRectangle;
  	int			initedRectangleTexmapScaleFactor;
! 	BOOL		initedPow2;
  	int			initedPow2TexmapScaleFactor;
  	GLsizei		texturePow2SizeX;
--- 138,150 ----
  
  struct _ARGL_CONTEXT_SETTINGS {
! 	int		textureRectangleCapabilitiesChecked;
! 	int		texturePow2CapabilitiesChecked;
  	GLuint		textureRectangle;
  	GLuint		texturePow2;
  	GLuint		listRectangle;
  	GLuint		listPow2;
! 	int		initedRectangle;
  	int			initedRectangleTexmapScaleFactor;
! 	int		initedPow2;
  	int			initedPow2TexmapScaleFactor;
  	GLsizei		texturePow2SizeX;
***************
*** 160,174 ****
  int	arglDrawMode   = DEFAULT_DRAW_MODE;
  int	arglTexmapMode = DEFAULT_DRAW_TEXTURE_IMAGE;
! BOOL arglTexRectangle = TRUE; // TRUE | FALSE .
  
  // These items relate to Apple's fast texture transfer support.
  //#define ARGL_USE_TEXTURE_RANGE	// Commented out due to conflicts with GL_APPLE_ycbcr_422 extension.
  #if defined(__APPLE__) && defined(APPLE_TEXTURE_FAST_TRANSFER)
! BOOL arglAppleClientStorage = TRUE; // TRUE | FALSE .
  #  ifdef ARGL_USE_TEXTURE_RANGE
! BOOL arglAppleTextureRange = TRUE; // TRUE | FALSE .
  GLuint arglAppleTextureRangeStorageHint = GL_STORAGE_SHARED_APPLE; // GL_STORAGE_PRIVATE_APPLE | GL_STORAGE_SHARED_APPLE | GL_STORAGE_CACHED_APPLE .
  #  else
! BOOL arglAppleTextureRange = FALSE; // TRUE | FALSE .
  GLuint arglAppleTextureRangeStorageHint = GL_STORAGE_PRIVATE_APPLE; // GL_STORAGE_PRIVATE_APPLE | GL_STORAGE_SHARED_APPLE | GL_STORAGE_CACHED_APPLE .
  #  endif // ARGL_USE_TEXTURE_RANGE
--- 161,175 ----
  int	arglDrawMode   = DEFAULT_DRAW_MODE;
  int	arglTexmapMode = DEFAULT_DRAW_TEXTURE_IMAGE;
! int arglTexRectangle = TRUE; // TRUE | FALSE .
  
  // These items relate to Apple's fast texture transfer support.
  //#define ARGL_USE_TEXTURE_RANGE	// Commented out due to conflicts with GL_APPLE_ycbcr_422 extension.
  #if defined(__APPLE__) && defined(APPLE_TEXTURE_FAST_TRANSFER)
! int arglAppleClientStorage = TRUE; // TRUE | FALSE .
  #  ifdef ARGL_USE_TEXTURE_RANGE
! int arglAppleTextureRange = TRUE; // TRUE | FALSE .
  GLuint arglAppleTextureRangeStorageHint = GL_STORAGE_SHARED_APPLE; // GL_STORAGE_PRIVATE_APPLE | GL_STORAGE_SHARED_APPLE | GL_STORAGE_CACHED_APPLE .
  #  else
! int arglAppleTextureRange = FALSE; // TRUE | FALSE .
  GLuint arglAppleTextureRangeStorageHint = GL_STORAGE_PRIVATE_APPLE; // GL_STORAGE_PRIVATE_APPLE | GL_STORAGE_SHARED_APPLE | GL_STORAGE_CACHED_APPLE .
  #  endif // ARGL_USE_TEXTURE_RANGE
***************
*** 280,284 ****
  //  Returns: TRUE If either of the tests passes, or FALSE if both fail.
  //
! static BOOL arglGLCapabilityCheck(const unsigned short minVersion, const char *extension)
  {
  	const GLubyte * strRenderer;
--- 281,285 ----
  //  Returns: TRUE If either of the tests passes, or FALSE if both fail.
  //
! static int arglGLCapabilityCheck(const unsigned short minVersion, const char *extension)
  {
  	const GLubyte * strRenderer;
***************
*** 310,314 ****
  
  #ifdef AR_OPENGL_TEXTURE_RECTANGLE
! static BOOL arglDispImageTexRectangleCapabilitiesCheck(const ARParam *cparam, ARGL_CONTEXT_SETTINGS_REF contextSettings)
  {
  	GLint textureRectangleSizeMax;
--- 311,315 ----
  
  #ifdef AR_OPENGL_TEXTURE_RECTANGLE
! static int arglDispImageTexRectangleCapabilitiesCheck(const ARParam *cparam, ARGL_CONTEXT_SETTINGS_REF contextSettings)
  {
  	GLint textureRectangleSizeMax;
***************
*** 461,465 ****
  #endif // AR_OPENGL_TEXTURE_RECTANGLE
  
! static BOOL arglDispImageTexPow2CapabilitiesCheck(const ARParam *cparam, ARGL_CONTEXT_SETTINGS_REF contextSettings)
  {
  	GLint format;
--- 462,466 ----
  #endif // AR_OPENGL_TEXTURE_RECTANGLE
  
! static int arglDispImageTexPow2CapabilitiesCheck(const ARParam *cparam, ARGL_CONTEXT_SETTINGS_REF contextSettings)
  {
  	GLint format;