aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pix_opencv_colorfilt.cc4
-rw-r--r--pix_opencv_contours_convexhull.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/pix_opencv_colorfilt.cc b/pix_opencv_colorfilt.cc
index af13535..d977e0a 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 DARWIN
+#ifdef __APPLE__
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 DARWIN
+#ifdef __APPLE__
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];
diff --git a/pix_opencv_contours_convexhull.cc b/pix_opencv_contours_convexhull.cc
index ae70e20..ee41e8b 100644
--- a/pix_opencv_contours_convexhull.cc
+++ b/pix_opencv_contours_convexhull.cc
@@ -182,7 +182,7 @@ void pix_opencv_contours_convexhull :: processRGBAImage(imageStruct &image)
// Draw convex hull for current contour.
for(i=0; i<hullsize-1; i++)
{
-#ifdef DARWIN
+#ifdef __APPLE__
cvLine(rgb, PointArray[hull[i]],
PointArray[hull[i+1]],CV_RGB(0,255,0),1, CV_AA, 0 );
#else
@@ -193,7 +193,7 @@ void pix_opencv_contours_convexhull :: processRGBAImage(imageStruct &image)
SETFLOAT(&rlist[j+1], PointArray[hull[i]].y);
j = j + 2;
}
-#ifdef DARWIN
+#ifdef __APPLE__
cvLine(rgb, PointArray[hull[hullsize-1]],
PointArray[hull[0]],CV_RGB(0,255,0),1, CV_AA, 0 );
#else