[artoolkit-commits] artoolkit/include/AR gsub_lite.h,1.9,1.10 config.h.in,1.4,1.5

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

Update of /cvsroot/artoolkit/artoolkit/include/AR
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25700

Modified Files:
	gsub_lite.h config.h.in 
Log Message:
Rename AR_PIXEL_FORMAT_DEFAULT to AR_DEFAULT_PIXEL_FORMAT, fix pow2 half-res tex in gsub_lite.

Index: config.h.in
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/include/AR/config.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** config.h.in	5 Apr 2006 05:48:43 -0000	1.4
--- config.h.in	21 Apr 2006 04:35:13 -0000	1.5
***************
*** 28,43 ****
  #  ifdef AR_INPUT_V4L
  #    ifdef USE_EYETOY
! #      define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_RGB
  #    else
! #      define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_BGR
  #    endif
  #  endif
  
  #  ifdef AR_INPUT_DV
! #    define  AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_RGB
  #  endif
  
  #  ifdef AR_INPUT_1394CAM
! #    define  AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_RGB
  #  endif
  
--- 28,43 ----
  #  ifdef AR_INPUT_V4L
  #    ifdef USE_EYETOY
! #      define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_RGB
  #    else
! #      define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_BGR
  #    endif
  #  endif
  
  #  ifdef AR_INPUT_DV
! #    define  AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_RGB
  #  endif
  
  #  ifdef AR_INPUT_1394CAM
! #    define  AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_RGB
  #  endif
  
***************
*** 53,57 ****
  #  define  AR_BIG_ENDIAN
  #  undef   AR_LITTLE_ENDIAN
! #  define  AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_ABGR
  #endif
  
--- 53,57 ----
  #  define  AR_BIG_ENDIAN
  #  undef   AR_LITTLE_ENDIAN
! #  define  AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_ABGR
  #endif
  
***************
*** 62,66 ****
  #  undef   AR_BIG_ENDIAN
  #  define  AR_LITTLE_ENDIAN
! #  define  AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_BGRA
  #endif
  
--- 62,66 ----
  #  undef   AR_BIG_ENDIAN
  #  define  AR_LITTLE_ENDIAN
! #  define  AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_BGRA
  #endif
  
***************
*** 76,80 ****
  #    define  AR_LITTLE_ENDIAN
  #  endif
! #  define  AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_2vuy
  #endif
  
--- 76,80 ----
  #    define  AR_LITTLE_ENDIAN
  #  endif
! #  define  AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_2vuy
  #endif
  
***************
*** 181,189 ****
  
  
! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB)
  #  define AR_PIX_SIZE_DEFAULT      4
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB)
  #  define AR_PIX_SIZE_DEFAULT      3
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs)
  #  define AR_PIX_SIZE_DEFAULT      2
  #else
--- 181,189 ----
  
  
! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) || (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) || (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) || (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB)
  #  define AR_PIX_SIZE_DEFAULT      4
! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) || (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB)
  #  define AR_PIX_SIZE_DEFAULT      3
! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) || (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs)
  #  define AR_PIX_SIZE_DEFAULT      2
  #else

Index: gsub_lite.h
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/include/AR/gsub_lite.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gsub_lite.h	6 Apr 2006 11:19:08 -0000	1.9
--- gsub_lite.h	21 Apr 2006 04:35:13 -0000	1.10
***************
*** 400,404 ****
  		are in. This setting applies only to the context passed in parameter
  		contextSettings. The default format is determined by
! 		the value of AR_PIXEL_FORMAT_DEFAULT at the time the library was built.
  		Usually, image data is passed in directly from images generated by ARVideo,
  		and so you should ensure that ARVideo is generating pixels of the same format.
--- 400,404 ----
  		are in. This setting applies only to the context passed in parameter
  		contextSettings. The default format is determined by
! 		the value of AR_DEFAULT_PIXEL_FORMAT at the time the library was built.
  		Usually, image data is passed in directly from images generated by ARVideo,
  		and so you should ensure that ARVideo is generating pixels of the same format.
***************
*** 417,421 ****
      @discussion This function enquires as to the current format of pixel data being
  		expected by the arglDispImage*() functions. The default format is determined by
! 		the value of AR_PIXEL_FORMAT_DEFAULT at the time the library was built.
  	@param contextSettings A reference to ARGL's settings for the current OpenGL
  		context, as returned by arglSetupForCurrentContext() for this context. 
--- 417,421 ----
      @discussion This function enquires as to the current format of pixel data being
  		expected by the arglDispImage*() functions. The default format is determined by
! 		the value of AR_DEFAULT_PIXEL_FORMAT at the time the library was built.
  	@param contextSettings A reference to ARGL's settings for the current OpenGL
  		context, as returned by arglSetupForCurrentContext() for this context.