Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25730
Modified Files:
video.c
Log Message:
Rename AR_PIXEL_FORMAT_DEFAULT to AR_DEFAULT_PIXEL_FORMAT, fix pow2 half-res tex in gsub_lite.
Index: video.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L/video.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** video.c 5 Apr 2006 05:48:13 -0000 1.4
--- video.c 21 Apr 2006 04:35:20 -0000 1.5
***************
*** 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
--- 159,165 ----
vid->width = DEFAULT_VIDEO_WIDTH;
vid->height = DEFAULT_VIDEO_HEIGHT;
! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA)
vid->palette = VIDEO_PALETTE_RGB32; /* palette format */
! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) || (AR_DEFAULT_PIXEL_FORMAT == 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 (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 (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA)
vid->palette = VIDEO_PALETTE_RGB32; /* palette format */
! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR)|| (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB)
vid->palette = VIDEO_PALETTE_RGB24; /* palette format */
#endif
|
