adapt headers to compile with Open Cv version 2.0

svn path=/trunk/externals/pix_opencv/; revision=12574

28 files changed, 55 insertions, 55 deletions

diff --git a/Makefile b/Makefile
index 3c7039c..d47e444 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PD_DIR = /Software/pd-svn/trunk/pd
+PD_DIR = /usr/local/pd
 GEM_DIR = /usr/local/pd/gem
 
 GEM_OPENCV_VERSION = 0.2
@@ -21,7 +21,7 @@ ifeq ($(UNAME),Linux)
 endif
 ifeq ($(UNAME),Darwin)
  CPPFLAGS += -DDARWIN
- INCLUDES += -I/System/Library/Frameworks/OpenCV.framework/Headers/
+ INCLUDES += -I/Library/Frameworks/OpenCV.framework/Headers/
  LDFLAGS =  -bundle -undefined dynamic_lookup
  LIBS =  -lm -framework OpenCV
  EXTENSION = pd_darwin
diff --git a/Makefile.in b/Makefile.in
index bfc81a4..c7e2985 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,7 +21,7 @@ ifeq ($(UNAME),Linux)
 endif
 ifeq ($(UNAME),Darwin)
  CPPFLAGS += -DDARWIN
- INCLUDES += -I/System/Library/Frameworks/OpenCV.framework/Headers/
+ INCLUDES += -I/Library/Frameworks/OpenCV.framework/Headers/
  LDFLAGS =  -bundle -undefined dynamic_lookup
  LIBS =  -lm -framework OpenCV
  EXTENSION = pd_darwin
diff --git a/pix_opencv_athreshold.h b/pix_opencv_athreshold.h
index 071449c..f1aaade 100644
--- a/pix_opencv_athreshold.h
+++ b/pix_opencv_athreshold.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_ATHRESHOLD_H_
 #define INCLUDE_PIX_OPENCV_ATHRESHOLD_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS
diff --git a/pix_opencv_bgstats.h b/pix_opencv_bgstats.h
index 01935d1..52592dd 100644
--- a/pix_opencv_bgstats.h
+++ b/pix_opencv_bgstats.h
@@ -16,13 +16,13 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_BGSTATS_H
 #define INCLUDE_PIX_OPENCV_BGSTATS_H
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #include "cvaux.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS
diff --git a/pix_opencv_bgsubstract.h b/pix_opencv_bgsubstract.h
index 8d12a91..96b0dd5 100644
--- a/pix_opencv_bgsubstract.h
+++ b/pix_opencv_bgsubstract.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_BGSUBSTRACT_H_
 #define INCLUDE_PIX_OPENCV_BGSUBSTRACT_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS
diff --git a/pix_opencv_camshift.h b/pix_opencv_camshift.h
index 5ec988e..58debb9 100644
--- a/pix_opencv_camshift.h
+++ b/pix_opencv_camshift.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_CAMSHIFT_H_
 #define INCLUDE_PIX_OPENCV_CAMSHIFT_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 #define MAX_MARKERS 500
 const int MAX_COUNT = 500;
 
diff --git a/pix_opencv_colorfilt.h b/pix_opencv_colorfilt.h
index b3a3949..8a92af6 100644
--- a/pix_opencv_colorfilt.h
+++ b/pix_opencv_colorfilt.h
@@ -16,14 +16,14 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_COLORFILT_H_
 #define INCLUDE_PIX_OPENCV_COLORFILT_H_
 
-#include "Base/GemPixObj.h"
-
 #include <stdio.h>
 
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS
diff --git a/pix_opencv_contours_boundingrect.h b/pix_opencv_contours_boundingrect.h
index 0c23402..434a77c 100644
--- a/pix_opencv_contours_boundingrect.h
+++ b/pix_opencv_contours_boundingrect.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_CONTOURS_BOUNDINGRECT_H_
 #define INCLUDE_PIX_OPENCV_CONTOURS_BOUNDINGRECT_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 #define MAX_MARKERS 100
 
 /*-----------------------------------------------------------------
diff --git a/pix_opencv_contours_convexhull.h b/pix_opencv_contours_convexhull.h
index 494136f..70d9a61 100644
--- a/pix_opencv_contours_convexhull.h
+++ b/pix_opencv_contours_convexhull.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_CONTOURS_CONVEXITY_H_
 #define INCLUDE_PIX_OPENCV_CONTOURS_CONVEXITY_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS
diff --git a/pix_opencv_contours_convexity.h b/pix_opencv_contours_convexity.h
index 045cb96..37939e0 100644
--- a/pix_opencv_contours_convexity.h
+++ b/pix_opencv_contours_convexity.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_CONTOURS_CONVEXITY_H_
 #define INCLUDE_PIX_OPENCV_CONTOURS_CONVEXITY_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS
diff --git a/pix_opencv_dft.h b/pix_opencv_dft.h
index 6af0a5e..d309660 100644
--- a/pix_opencv_dft.h
+++ b/pix_opencv_dft.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_DFT_H_
 #define INCLUDE_PIX_OPENCV_DFT_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS
diff --git a/pix_opencv_distrans.h b/pix_opencv_distrans.h
index ef283ff..bfa1506 100644
--- a/pix_opencv_distrans.h
+++ b/pix_opencv_distrans.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_DISTRANS_H_
 #define INCLUDE_PIX_OPENCV_DISTRANS_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS
diff --git a/pix_opencv_edge.h b/pix_opencv_edge.h
index e67de6c..344b629 100644
--- a/pix_opencv_edge.h
+++ b/pix_opencv_edge.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_EDGE_H_
 #define INCLUDE_PIX_OPENCV_EDGE_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS
diff --git a/pix_opencv_floodfill.h b/pix_opencv_floodfill.h
index 380730a..2313059 100644
--- a/pix_opencv_floodfill.h
+++ b/pix_opencv_floodfill.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_FLOODFILL_H_
 #define INCLUDE_PIX_OPENCV_FLOODFILL_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 #define MAX_COMPONENTS 10
 
 /*-----------------------------------------------------------------
diff --git a/pix_opencv_haarcascade.h b/pix_opencv_haarcascade.h
index ecdc92e..94ebc44 100644
--- a/pix_opencv_haarcascade.h
+++ b/pix_opencv_haarcascade.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_HAARSCASCADE_H_
 #define INCLUDE_PIX_OPENCV_HAARSCASCADE_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 #define MAX_MARKERS 50
 
 const char* cascade_name ="./haarcascade_frontalface_alt.xml";
diff --git a/pix_opencv_hist_compare.h b/pix_opencv_hist_compare.h
index 987dff3..fd1bb29 100644
--- a/pix_opencv_hist_compare.h
+++ b/pix_opencv_hist_compare.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_HIST_COMPARE_H_
 #define INCLUDE_PIX_OPENCV_HIST_COMPARE_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 #define MAX_HISTOGRAMS_TO_COMPARE 80
 
 /*-----------------------------------------------------------------
diff --git a/pix_opencv_hough_circles.h b/pix_opencv_hough_circles.h
index 9c2a63b..cf2ee26 100644
--- a/pix_opencv_hough_circles.h
+++ b/pix_opencv_hough_circles.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_HOUGH_CIRCLES_H_
 #define INCLUDE_PIX_OPENCV_HOUGH_CIRCLES_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 #define MAX_HISTOGRAMS_TO_COMPARE 80
 
 /*-----------------------------------------------------------------
diff --git a/pix_opencv_hough_lines.h b/pix_opencv_hough_lines.h
index a0aaef4..aa30533 100644
--- a/pix_opencv_hough_lines.h
+++ b/pix_opencv_hough_lines.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_HOUGH_LINES_H_
 #define INCLUDE_PIX_OPENCV_HOUGH_LINES_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 #define MAX_HISTOGRAMS_TO_COMPARE 80
 
 /*-----------------------------------------------------------------
diff --git a/pix_opencv_hu_compare.h b/pix_opencv_hu_compare.h
index f083a22..ad098b5 100644
--- a/pix_opencv_hu_compare.h
+++ b/pix_opencv_hu_compare.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_HU_COMPARE_H_
 #define INCLUDE_PIX_OPENCV_HU_COMPARE_H_
 
-#include "Base/GemPixDualObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixDualObj.h"
+
 /*-----------------------------------------------------------------
 CLASS
     pix_opencv_hu_compare
diff --git a/pix_opencv_hu_moments.h b/pix_opencv_hu_moments.h
index 20c031c..8b60781 100755
--- a/pix_opencv_hu_moments.h
+++ b/pix_opencv_hu_moments.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_HU_MOMENTS_H_
 #define INCLUDE_PIX_OPENCV_HU_MOMENTS_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS
diff --git a/pix_opencv_knear.h b/pix_opencv_knear.h
index faa9483..37537a5 100644
--- a/pix_opencv_knear.h
+++ b/pix_opencv_knear.h
@@ -16,14 +16,14 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_KNEAR_H_
 #define INCLUDE_PIX_OPENCV_KNEAR_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #include "highgui.h"
 #include "ml.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS
diff --git a/pix_opencv_laplace.h b/pix_opencv_laplace.h
index 674126b..8eeb25d 100644
--- a/pix_opencv_laplace.h
+++ b/pix_opencv_laplace.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_LAPLACE_H_
 #define INCLUDE_PIX_OPENCV_LAPLACE_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS
diff --git a/pix_opencv_lk.h b/pix_opencv_lk.h
index f60fa63..cae97a7 100644
--- a/pix_opencv_lk.h
+++ b/pix_opencv_lk.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_LK_H_
 #define INCLUDE_PIX_OPENCV_LK_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 #define MAX_MARKERS 500
 const int MAX_COUNT = 500;
 
diff --git a/pix_opencv_morphology.h b/pix_opencv_morphology.h
index be1e143..238549e 100644
--- a/pix_opencv_morphology.h
+++ b/pix_opencv_morphology.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_MORPHOLOGY_H_
 #define INCLUDE_PIX_OPENCV_MORPHOLOGY_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS
diff --git a/pix_opencv_motempl.h b/pix_opencv_motempl.h
index 8a8e0b5..e83a3bf 100644
--- a/pix_opencv_motempl.h
+++ b/pix_opencv_motempl.h
@@ -16,8 +16,6 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_MOTEMPL_H_
 #define INCLUDE_PIX_OPENCV_MOTEMPL_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #include <time.h>
@@ -26,6 +24,8 @@ LOG
 #endif
 #include <stdio.h>
 
+#include "Base/GemPixObj.h"
+
 
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
diff --git a/pix_opencv_pgh_compare.h b/pix_opencv_pgh_compare.h
index 94e9c78..43e3261 100644
--- a/pix_opencv_pgh_compare.h
+++ b/pix_opencv_pgh_compare.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_PGH_COMPARE_H_
 #define INCLUDE_PIX_OPENCV_PGH_COMPARE_H_
 
-#include "Base/GemPixDualObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixDualObj.h"
+
 /*-----------------------------------------------------------------
 CLASS
     pix_opencv_pgh_compare
diff --git a/pix_opencv_surf.h b/pix_opencv_surf.h
index e551d70..7c819c3 100644
--- a/pix_opencv_surf.h
+++ b/pix_opencv_surf.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_SURF_H_
 #define INCLUDE_PIX_OPENCV_SURF_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 #define MAX_MARKERS 500
 #define DSCSIZE 128
 
diff --git a/pix_opencv_threshold.h b/pix_opencv_threshold.h
index 018002b..d061d1e 100644
--- a/pix_opencv_threshold.h
+++ b/pix_opencv_threshold.h
@@ -16,12 +16,12 @@ LOG
 #ifndef INCLUDE_PIX_OPENCV_THRESHOLD_H_
 #define INCLUDE_PIX_OPENCV_THRESHOLD_H_
 
-#include "Base/GemPixObj.h"
-
 #ifndef _EiC
 #include "cv.h"
 #endif
 
+#include "Base/GemPixObj.h"
+
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
 CLASS