From 1ef173907202154bf15cc3f6260f68b93ccaeef3 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Tue, 1 Dec 2009 19:37:09 +0000 Subject: fix contours count svn path=/trunk/externals/pix_opencv/; revision=12817 --- 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.cc | 15 +++++++++------ 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_of_bm.h | 4 ---- pix_opencv_of_hs.h | 4 ---- pix_opencv_of_lk.h | 4 ---- pix_opencv_pgh_compare.h | 4 ---- pix_opencv_surf.h | 4 ---- pix_opencv_threshold.h | 4 ---- 30 files changed, 9 insertions(+), 122 deletions(-) diff --git a/pix_opencv_athreshold.h b/pix_opencv_athreshold.h index 9fbfbb4..f1aaade 100644 --- a/pix_opencv_athreshold.h +++ b/pix_opencv_athreshold.h @@ -17,12 +17,8 @@ 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 b843913..52592dd 100644 --- a/pix_opencv_bgstats.h +++ b/pix_opencv_bgstats.h @@ -17,13 +17,9 @@ 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 b678ad8..96b0dd5 100644 --- a/pix_opencv_bgsubstract.h +++ b/pix_opencv_bgsubstract.h @@ -17,12 +17,8 @@ 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 a6bb7c7..58debb9 100644 --- a/pix_opencv_camshift.h +++ b/pix_opencv_camshift.h @@ -17,12 +17,8 @@ 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 e96c556..8a92af6 100644 --- a/pix_opencv_colorfilt.h +++ b/pix_opencv_colorfilt.h @@ -19,12 +19,8 @@ LOG #include #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_contours_boundingrect.cc b/pix_opencv_contours_boundingrect.cc index 60e9583..fa35c82 100644 --- a/pix_opencv_contours_boundingrect.cc +++ b/pix_opencv_contours_boundingrect.cc @@ -156,6 +156,7 @@ void pix_opencv_contours_boundingrect :: processRGBAImage(imageStruct &image) } int i = 0; // Indicator of cycles. + int ic = 0; // Indicator of contours. for( ; contours != 0; contours = contours->h_next ) { int count = contours->total; // This is number point in contour @@ -206,10 +207,10 @@ void pix_opencv_contours_boundingrect :: processRGBAImage(imageStruct &image) outlet_list( m_dataout, 0, 5, rlist ); i++; + ic++; } - outlet_float( m_countout, i ); - } + outlet_float( m_countout, ic ); // delete lost objects for ( im=0; imh_next ) { int count = contours->total; // This is number point in contour @@ -335,10 +337,10 @@ void pix_opencv_contours_boundingrect :: processRGBImage(imageStruct &image) outlet_list( m_dataout, 0, 5, rlist ); i++; + ic++; } - outlet_float( m_countout, i ); - } + outlet_float( m_countout, ic ); // delete lost objects for ( im=0; imh_next ) { int count = contours->total; // This is number point in contour @@ -470,10 +473,10 @@ void pix_opencv_contours_boundingrect :: processGrayImage(imageStruct &image) outlet_list( m_dataout, 0, 5, rlist ); i++; + ic++; } - outlet_float( m_countout, i ); - } + outlet_float( m_countout, i ); // delete lost objects for ( im=0; im -#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 3262607..70d9a61 100644 --- a/pix_opencv_contours_convexhull.h +++ b/pix_opencv_contours_convexhull.h @@ -17,12 +17,8 @@ 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 9984557..37939e0 100644 --- a/pix_opencv_contours_convexity.h +++ b/pix_opencv_contours_convexity.h @@ -17,12 +17,8 @@ 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 c1115d6..d309660 100644 --- a/pix_opencv_dft.h +++ b/pix_opencv_dft.h @@ -17,12 +17,8 @@ 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 611bb2a..bfa1506 100644 --- a/pix_opencv_distrans.h +++ b/pix_opencv_distrans.h @@ -17,12 +17,8 @@ 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 899e411..344b629 100644 --- a/pix_opencv_edge.h +++ b/pix_opencv_edge.h @@ -17,12 +17,8 @@ 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 c67f92b..2313059 100644 --- a/pix_opencv_floodfill.h +++ b/pix_opencv_floodfill.h @@ -17,12 +17,8 @@ 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 6c63a16..94ebc44 100644 --- a/pix_opencv_haarcascade.h +++ b/pix_opencv_haarcascade.h @@ -17,12 +17,8 @@ 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 02648e8..fd1bb29 100644 --- a/pix_opencv_hist_compare.h +++ b/pix_opencv_hist_compare.h @@ -17,12 +17,8 @@ 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 f21f190..cf2ee26 100644 --- a/pix_opencv_hough_circles.h +++ b/pix_opencv_hough_circles.h @@ -17,12 +17,8 @@ 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 1967ee2..aa30533 100644 --- a/pix_opencv_hough_lines.h +++ b/pix_opencv_hough_lines.h @@ -17,12 +17,8 @@ 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 4930414..ad098b5 100644 --- a/pix_opencv_hu_compare.h +++ b/pix_opencv_hu_compare.h @@ -17,12 +17,8 @@ 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 62e3fa7..8b60781 100755 --- a/pix_opencv_hu_moments.h +++ b/pix_opencv_hu_moments.h @@ -17,12 +17,8 @@ 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 16dbee6..37537a5 100644 --- a/pix_opencv_knear.h +++ b/pix_opencv_knear.h @@ -17,14 +17,10 @@ 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 a6c1f7f..8eeb25d 100644 --- a/pix_opencv_laplace.h +++ b/pix_opencv_laplace.h @@ -17,12 +17,8 @@ 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 5810d4f..cae97a7 100644 --- a/pix_opencv_lk.h +++ b/pix_opencv_lk.h @@ -17,12 +17,8 @@ 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 fabd859..238549e 100644 --- a/pix_opencv_morphology.h +++ b/pix_opencv_morphology.h @@ -17,12 +17,8 @@ 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 2bf26ad..e83a3bf 100644 --- a/pix_opencv_motempl.h +++ b/pix_opencv_motempl.h @@ -17,15 +17,11 @@ 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_of_bm.h b/pix_opencv_of_bm.h index 814fdb8..f5c75f0 100755 --- a/pix_opencv_of_bm.h +++ b/pix_opencv_of_bm.h @@ -17,12 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_OF_BM_H_ #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_of_hs.h b/pix_opencv_of_hs.h index 3152f8c..b51cc67 100755 --- a/pix_opencv_of_hs.h +++ b/pix_opencv_of_hs.h @@ -17,12 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_OF_HS_H_ #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_of_lk.h b/pix_opencv_of_lk.h index 96ccb10..fb23b78 100755 --- a/pix_opencv_of_lk.h +++ b/pix_opencv_of_lk.h @@ -17,12 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_OF_LK_H_ #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_pgh_compare.h b/pix_opencv_pgh_compare.h index d894870..43e3261 100644 --- a/pix_opencv_pgh_compare.h +++ b/pix_opencv_pgh_compare.h @@ -17,12 +17,8 @@ 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 e7d3aaa..7c819c3 100644 --- a/pix_opencv_surf.h +++ b/pix_opencv_surf.h @@ -17,12 +17,8 @@ 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 7cbd845..d061d1e 100644 --- a/pix_opencv_threshold.h +++ b/pix_opencv_threshold.h @@ -17,12 +17,8 @@ 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