From 2d413c5df4d10befc2927e847003f94f22bc7c35 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Tue, 13 Oct 2009 15:49:57 +0000 Subject: changed headers for Mac OSX svn path=/trunk/externals/pix_opencv/; revision=12589 --- pix_opencv_athreshold.h | 4 ++++ pix_opencv_bgstats.h | 4 ++++ pix_opencv_bgsubstract.h | 4 ++++ pix_opencv_camshift.h | 4 ++++ pix_opencv_colorfilt.h | 4 ++++ pix_opencv_contours_boundingrect.h | 4 ++++ pix_opencv_contours_convexhull.h | 4 ++++ pix_opencv_contours_convexity.h | 4 ++++ pix_opencv_dft.h | 4 ++++ pix_opencv_distrans.h | 4 ++++ pix_opencv_edge.h | 4 ++++ pix_opencv_floodfill.h | 4 ++++ pix_opencv_haarcascade.h | 4 ++++ pix_opencv_hist_compare.h | 4 ++++ pix_opencv_hough_circles.h | 4 ++++ pix_opencv_hough_lines.h | 4 ++++ pix_opencv_hu_compare.h | 4 ++++ pix_opencv_hu_moments.h | 4 ++++ pix_opencv_knear.h | 4 ++++ pix_opencv_laplace.h | 4 ++++ pix_opencv_lk.h | 4 ++++ pix_opencv_morphology.h | 4 ++++ pix_opencv_motempl.h | 4 ++++ pix_opencv_pgh_compare.h | 4 ++++ pix_opencv_surf.h | 4 ++++ pix_opencv_threshold.h | 4 ++++ 26 files changed, 104 insertions(+) diff --git a/pix_opencv_athreshold.h b/pix_opencv_athreshold.h index f1aaade..9fbfbb4 100644 --- a/pix_opencv_athreshold.h +++ b/pix_opencv_athreshold.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_ATHRESHOLD_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_bgstats.h b/pix_opencv_bgstats.h index 52592dd..b843913 100644 --- a/pix_opencv_bgstats.h +++ b/pix_opencv_bgstats.h @@ -17,9 +17,13 @@ LOG #define INCLUDE_PIX_OPENCV_BGSTATS_H #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #include "cvaux.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_bgsubstract.h b/pix_opencv_bgsubstract.h index 96b0dd5..b678ad8 100644 --- a/pix_opencv_bgsubstract.h +++ b/pix_opencv_bgsubstract.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_BGSUBSTRACT_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_camshift.h b/pix_opencv_camshift.h index 58debb9..a6bb7c7 100644 --- a/pix_opencv_camshift.h +++ b/pix_opencv_camshift.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_CAMSHIFT_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_colorfilt.h b/pix_opencv_colorfilt.h index 8a92af6..e96c556 100644 --- a/pix_opencv_colorfilt.h +++ b/pix_opencv_colorfilt.h @@ -19,8 +19,12 @@ LOG #include #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_contours_boundingrect.h b/pix_opencv_contours_boundingrect.h index 434a77c..6ed90ea 100644 --- a/pix_opencv_contours_boundingrect.h +++ b/pix_opencv_contours_boundingrect.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_CONTOURS_BOUNDINGRECT_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_contours_convexhull.h b/pix_opencv_contours_convexhull.h index 70d9a61..3262607 100644 --- a/pix_opencv_contours_convexhull.h +++ b/pix_opencv_contours_convexhull.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_CONTOURS_CONVEXITY_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_contours_convexity.h b/pix_opencv_contours_convexity.h index 37939e0..9984557 100644 --- a/pix_opencv_contours_convexity.h +++ b/pix_opencv_contours_convexity.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_CONTOURS_CONVEXITY_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_dft.h b/pix_opencv_dft.h index d309660..c1115d6 100644 --- a/pix_opencv_dft.h +++ b/pix_opencv_dft.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_DFT_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_distrans.h b/pix_opencv_distrans.h index bfa1506..611bb2a 100644 --- a/pix_opencv_distrans.h +++ b/pix_opencv_distrans.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_DISTRANS_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_edge.h b/pix_opencv_edge.h index 344b629..899e411 100644 --- a/pix_opencv_edge.h +++ b/pix_opencv_edge.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_EDGE_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_floodfill.h b/pix_opencv_floodfill.h index 2313059..c67f92b 100644 --- a/pix_opencv_floodfill.h +++ b/pix_opencv_floodfill.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_FLOODFILL_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_haarcascade.h b/pix_opencv_haarcascade.h index 94ebc44..6c63a16 100644 --- a/pix_opencv_haarcascade.h +++ b/pix_opencv_haarcascade.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_HAARSCASCADE_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_hist_compare.h b/pix_opencv_hist_compare.h index fd1bb29..02648e8 100644 --- a/pix_opencv_hist_compare.h +++ b/pix_opencv_hist_compare.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_HIST_COMPARE_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_hough_circles.h b/pix_opencv_hough_circles.h index cf2ee26..f21f190 100644 --- a/pix_opencv_hough_circles.h +++ b/pix_opencv_hough_circles.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_HOUGH_CIRCLES_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_hough_lines.h b/pix_opencv_hough_lines.h index aa30533..1967ee2 100644 --- a/pix_opencv_hough_lines.h +++ b/pix_opencv_hough_lines.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_HOUGH_LINES_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_hu_compare.h b/pix_opencv_hu_compare.h index ad098b5..4930414 100644 --- a/pix_opencv_hu_compare.h +++ b/pix_opencv_hu_compare.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_HU_COMPARE_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixDualObj.h" diff --git a/pix_opencv_hu_moments.h b/pix_opencv_hu_moments.h index 8b60781..62e3fa7 100755 --- a/pix_opencv_hu_moments.h +++ b/pix_opencv_hu_moments.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_HU_MOMENTS_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_knear.h b/pix_opencv_knear.h index 37537a5..16dbee6 100644 --- a/pix_opencv_knear.h +++ b/pix_opencv_knear.h @@ -17,10 +17,14 @@ LOG #define INCLUDE_PIX_OPENCV_KNEAR_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #include "highgui.h" #include "ml.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_laplace.h b/pix_opencv_laplace.h index 8eeb25d..a6c1f7f 100644 --- a/pix_opencv_laplace.h +++ b/pix_opencv_laplace.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_LAPLACE_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_lk.h b/pix_opencv_lk.h index cae97a7..5810d4f 100644 --- a/pix_opencv_lk.h +++ b/pix_opencv_lk.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_LK_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_morphology.h b/pix_opencv_morphology.h index 238549e..fabd859 100644 --- a/pix_opencv_morphology.h +++ b/pix_opencv_morphology.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_MORPHOLOGY_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_motempl.h b/pix_opencv_motempl.h index e83a3bf..2bf26ad 100644 --- a/pix_opencv_motempl.h +++ b/pix_opencv_motempl.h @@ -17,11 +17,15 @@ LOG #define INCLUDE_PIX_OPENCV_MOTEMPL_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #include #include #include #endif +#endif #include #include "Base/GemPixObj.h" diff --git a/pix_opencv_pgh_compare.h b/pix_opencv_pgh_compare.h index 43e3261..d894870 100644 --- a/pix_opencv_pgh_compare.h +++ b/pix_opencv_pgh_compare.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_PGH_COMPARE_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixDualObj.h" diff --git a/pix_opencv_surf.h b/pix_opencv_surf.h index 7c819c3..e7d3aaa 100644 --- a/pix_opencv_surf.h +++ b/pix_opencv_surf.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_SURF_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_threshold.h b/pix_opencv_threshold.h index d061d1e..7cbd845 100644 --- a/pix_opencv_threshold.h +++ b/pix_opencv_threshold.h @@ -17,8 +17,12 @@ LOG #define INCLUDE_PIX_OPENCV_THRESHOLD_H_ #ifndef _EiC +#ifdef __APPLE__ +#include +#else #include "cv.h" #endif +#endif #include "Base/GemPixObj.h" -- cgit v1.2.1