Update of /cvsroot/playerstage/code/player/server/drivers/blobfinder/cmvision
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27311
Modified Files:
P2CMV.cc
Log Message:
added ifdef's around jpeg code in cmvision driver
Index: P2CMV.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/blobfinder/cmvision/P2CMV.cc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** P2CMV.cc 24 Apr 2007 21:29:58 -0000 1.27
--- P2CMV.cc 18 Jul 2007 01:42:13 -0000 1.28
***************
*** 103,106 ****
--- 103,110 ----
/** @} */
+ #if HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+
#include <assert.h>
#include <stdio.h>
***************
*** 117,120 ****
--- 121,128 ----
#include <libplayerjpeg/playerjpeg.h>
+ #if HAVE_JPEGLIB_H
+ #include <libplayerjpeg/playerjpeg.h>
+ #endif
+
#include "conversions.h"
#include "cmvision.h"
***************
*** 423,426 ****
--- 431,443 ----
assert(camera_data);
+
+ #if !HAVE_JPEGLIB_H
+ if (camera_data->compression == PLAYER_CAMERA_COMPRESS_JPEG)
+ {
+ PLAYER_ERROR("No support for jpeg decompression");
+ return(-1);
+ }
+ #endif
+
assert(camera_data->bpp == 24);
if ((camera_data->width) && (camera_data->height))
***************
*** 439,442 ****
--- 456,460 ----
if (camera_data->compression == PLAYER_CAMERA_COMPRESS_JPEG)
{
+ #if HAVE_JPEGLIB_H
jpeg_decompress((unsigned char*)mTmp,
PLAYER_CAMERA_IMAGE_SIZE,
***************
*** 444,447 ****
--- 462,466 ----
camera_data->image_count
);
+ #endif
ptr = mTmp;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
