Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25790
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/VideoMacOSX/video.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** video.c 5 Apr 2006 05:46:53 -0000 1.14
--- video.c 21 Apr 2006 04:35:34 -0000 1.15
***************
*** 1248,1266 ****
// assign the one specified at compile-time as the default.
if (!pixFormat) {
! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy)
pixFormat = k2vuyPixelFormat; // k422YpCbCr8CodecType, k422YpCbCr8PixelFormat
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs)
pixFormat = kYUVSPixelFormat; // kComponentVideoUnsigned
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB)
pixFormat = k24RGBPixelFormat;
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR)
pixFormat = k24BGRPixelFormat;
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB)
pixFormat = k32ARGBPixelFormat;
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA)
pixFormat = k32RGBAPixelFormat;
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR)
pixFormat = k32ABGRPixelFormat;
! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA)
pixFormat = k32BGRAPixelFormat;
#else
--- 1248,1266 ----
// assign the one specified at compile-time as the default.
if (!pixFormat) {
! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy)
pixFormat = k2vuyPixelFormat; // k422YpCbCr8CodecType, k422YpCbCr8PixelFormat
! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs)
pixFormat = kYUVSPixelFormat; // kComponentVideoUnsigned
! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB)
pixFormat = k24RGBPixelFormat;
! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR)
pixFormat = k24BGRPixelFormat;
! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB)
pixFormat = k32ARGBPixelFormat;
! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA)
pixFormat = k32RGBAPixelFormat;
! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR)
pixFormat = k32ABGRPixelFormat;
! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA)
pixFormat = k32BGRAPixelFormat;
#else
|
