[artoolkit-commits] artoolkit/lib/SRC/VideoLinuxV4L video.c,1.3,1.4

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

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

Modified Files:
	video.c 
Log Message:
Move pixel format from gsub_lite into global namespace.

Index: video.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L/video.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** video.c	27 Jul 2005 21:21:24 -0000	1.3
--- video.c	5 Apr 2006 05:48:13 -0000	1.4
***************
*** 159,165 ****
      vid->width      = DEFAULT_VIDEO_WIDTH;
      vid->height     = DEFAULT_VIDEO_HEIGHT;
! #if defined(AR_PIX_FORMAT_BGRA)
      vid->palette = VIDEO_PALETTE_RGB32;     /* palette format */
! #elif defined(AR_PIX_FORMAT_BGR) || defined(AR_PIX_FORMAT_RGB)
      vid->palette = VIDEO_PALETTE_RGB24;     /* palette format */
  #endif
--- 159,165 ----
      vid->width      = DEFAULT_VIDEO_WIDTH;
      vid->height     = DEFAULT_VIDEO_HEIGHT;
! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA)
      vid->palette = VIDEO_PALETTE_RGB32;     /* palette format */
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB)
      vid->palette = VIDEO_PALETTE_RGB24;     /* palette format */
  #endif
***************
*** 212,218 ****
              else if( strncmp( a, "-palette=", 9 ) == 0 ) {
                  if( strncmp( &a[9], "RGB", 3) == 0 ) {
! #if defined(AR_PIX_FORMAT_BGRA)
  		  vid->palette = VIDEO_PALETTE_RGB32;     /* palette format */
! #elif defined(AR_PIX_FORMAT_BGR)|| defined(AR_PIX_FORMAT_RGB)
  		  vid->palette = VIDEO_PALETTE_RGB24;     /* palette format */
  #endif
--- 212,218 ----
              else if( strncmp( a, "-palette=", 9 ) == 0 ) {
                  if( strncmp( &a[9], "RGB", 3) == 0 ) {
! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA)
  		  vid->palette = VIDEO_PALETTE_RGB32;     /* palette format */
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR)|| (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB)
  		  vid->palette = VIDEO_PALETTE_RGB24;     /* palette format */
  #endif