diff options
| author | lluís gómez i bigordà <lluisbigorda@users.sourceforge.net> | 2009-09-24 22:26:25 +0000 |
|---|---|---|
| committer | lluís gómez i bigordà <lluisbigorda@users.sourceforge.net> | 2009-09-24 22:26:25 +0000 |
| commit | 39a1fe185fff8502e003e517307e309735b05779 (patch) | |
| tree | c7e107f6d8568ff2b9c3ef54892ac7f935c0f0af | |
| parent | cefd72ea63da87674df0d2cc9371c70ec80108a3 (diff) | |
pix_opencv_colorfilt now works both in linux and macos in RGBA colorspace.
don't know in others ;)
svn path=/trunk/externals/pix_opencv/; revision=12448
| -rw-r--r-- | pix_opencv_colorfilt.cc | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/pix_opencv_colorfilt.cc b/pix_opencv_colorfilt.cc index 7e038b8..b8642fe 100644 --- a/pix_opencv_colorfilt.cc +++ b/pix_opencv_colorfilt.cc @@ -55,11 +55,7 @@ pix_opencv_colorfilt :: pix_opencv_colorfilt() rgba = cvCreateImage(cvSize(comp_xsize,comp_ysize), IPL_DEPTH_8U, 4); rgb = cvCreateImage(cvSize(comp_xsize,comp_ysize), IPL_DEPTH_8U, 3); -#ifdef DARWIN brgb = cvCreateImage(cvSize(comp_xsize,comp_ysize), IPL_DEPTH_8U, 4); -#else - brgb = cvCreateImage(cvSize(comp_xsize,comp_ysize), IPL_DEPTH_8U, 3); -#endif } ///////////////////////////////////////////////////////// @@ -115,11 +111,7 @@ void pix_opencv_colorfilt :: processRGBAImage(imageStruct &image) //create the orig image with new size rgba = cvCreateImage(cvSize(image.xsize,image.ysize), IPL_DEPTH_8U, 4); rgb = cvCreateImage(cvSize(image.xsize,image.ysize), IPL_DEPTH_8U, 3); -#ifdef DARWIN brgb = cvCreateImage(cvSize(image.xsize,image.ysize), IPL_DEPTH_8U, 4); -#else - brgb = cvCreateImage(cvSize(image.xsize,image.ysize), IPL_DEPTH_8U, 3); -#endif } memcpy( rgba->imageData, image.data, image.xsize*image.ysize*4 ); cvCopy(rgba, brgb); @@ -178,11 +170,7 @@ void pix_opencv_colorfilt :: processRGBImage(imageStruct &image) //create the orig image with new size rgba = cvCreateImage(cvSize(image.xsize,image.ysize), IPL_DEPTH_8U, 4); rgb = cvCreateImage(cvSize(image.xsize,image.ysize), IPL_DEPTH_8U, 3); -#ifdef DARWIN brgb = cvCreateImage(cvSize(rgb->width,rgb->height), IPL_DEPTH_8U, 4); -#else - brgb = cvCreateImage(cvSize(rgb->width,rgb->height), IPL_DEPTH_8U, 3); -#endif } memcpy( rgb->imageData, image.data, image.xsize*image.ysize*3 ); @@ -255,9 +243,9 @@ void pix_opencv_colorfilt :: pickMess (float xcur, float ycur) x_colorB = ((uchar*)(brgb->imageData + brgb->widthStep*(int)ycur))[(int)xcur*4+3]; #else ycur = brgb->height - ycur; - x_colorR = ((uchar*)(brgb->imageData + brgb->widthStep*(int)ycur))[(int)xcur*3]; - x_colorG = ((uchar*)(brgb->imageData + brgb->widthStep*(int)ycur))[(int)xcur*3+1]; - x_colorB = ((uchar*)(brgb->imageData + brgb->widthStep*(int)ycur))[(int)xcur*3+2]; + x_colorR = ((uchar*)(brgb->imageData + brgb->widthStep*(int)ycur))[(int)xcur*4]; + x_colorG = ((uchar*)(brgb->imageData + brgb->widthStep*(int)ycur))[(int)xcur*4+1]; + x_colorB = ((uchar*)(brgb->imageData + brgb->widthStep*(int)ycur))[(int)xcur*4+2]; #endif outlet_float( x_R, x_colorR ); outlet_float( x_G, x_colorG ); |