diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2009-10-10 04:54:15 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2009-10-10 04:54:15 +0000 |
| commit | 674532bbdadd8f476616a202dc9766533c99416c (patch) | |
| tree | b2e6ca498da6a7121f2502a3a23126b5bf7f3bfc /pix_opencv_colorfilt.cc | |
| parent | cea42162b92d1c8820c1d46eacca122d605378c7 (diff) | |
reverted all my changes
svn path=/trunk/externals/pix_opencv/; revision=12571
Diffstat (limited to 'pix_opencv_colorfilt.cc')
| -rw-r--r-- | pix_opencv_colorfilt.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pix_opencv_colorfilt.cc b/pix_opencv_colorfilt.cc index d977e0a..af13535 100644 --- a/pix_opencv_colorfilt.cc +++ b/pix_opencv_colorfilt.cc @@ -118,7 +118,7 @@ void pix_opencv_colorfilt :: processRGBAImage(imageStruct &image) for( py=0; py<rgba->height; py++ ) { for( px=0; px<rgba->width; px++ ) { -#ifdef __APPLE__ +#ifdef DARWIN g = ((uchar*)(rgba->imageData + rgba->widthStep*(int)py))[(int)px*4]; r = ((uchar*)(rgba->imageData + rgba->widthStep*(int)py))[(int)px*4+1]; b = ((uchar*)(rgba->imageData + rgba->widthStep*(int)py))[(int)px*4+3]; @@ -237,7 +237,7 @@ void pix_opencv_colorfilt :: pickMess (float xcur, float ycur) if ( ( xcur >= 0. ) && ( xcur <= comp_xsize ) && ( ycur > 0. ) && ( ycur < comp_ysize ) ) { -#ifdef __APPLE__ +#ifdef DARWIN x_colorR = ((uchar*)(brgb->imageData + brgb->widthStep*(int)ycur))[(int)xcur*4+1]; x_colorG = ((uchar*)(brgb->imageData + brgb->widthStep*(int)ycur))[(int)xcur*4+2]; x_colorB = ((uchar*)(brgb->imageData + brgb->widthStep*(int)ycur))[(int)xcur*4+3]; |