diff -crB trunk//opencv/modules/objdetect/include/opencv2/objdetect/objdetect.hpp patched//opencv/modules/objdetect/include/opencv2/objdetect/objdetect.hpp *** trunk//opencv/modules/objdetect/include/opencv2/objdetect/objdetect.hpp 2010-08-12 00:34:00.000000000 +0200 --- patched//opencv/modules/objdetect/include/opencv2/objdetect/objdetect.hpp 2010-08-12 00:22:59.000000000 +0200 *************** *** 128,134 **** CvHaarClassifierCascade* cascade, CvMemStorage* storage, double scale_factor CV_DEFAULT(1.1), int min_neighbors CV_DEFAULT(3), int flags CV_DEFAULT(0), ! CvSize min_size CV_DEFAULT(cvSize(0,0))); /* sets images for haar classifier cascade */ CVAPI(void) cvSetImagesForHaarClassifierCascade( CvHaarClassifierCascade* cascade, --- 128,135 ---- CvHaarClassifierCascade* cascade, CvMemStorage* storage, double scale_factor CV_DEFAULT(1.1), int min_neighbors CV_DEFAULT(3), int flags CV_DEFAULT(0), ! CvSize min_size CV_DEFAULT(cvSize(0,0)), ! CvSize maxSize CV_DEFAULT(cvSize(0,0))); /* sets images for haar classifier cascade */ CVAPI(void) cvSetImagesForHaarClassifierCascade( CvHaarClassifierCascade* cascade, diff -crB trunk//opencv/modules/objdetect/include/opencv2/objdetect/.svn/entries patched//opencv/modules/objdetect/include/opencv2/objdetect/.svn/entries *** trunk//opencv/modules/objdetect/include/opencv2/objdetect/.svn/entries 2010-08-12 00:34:00.000000000 +0200 --- patched//opencv/modules/objdetect/include/opencv2/objdetect/.svn/entries 2010-08-12 00:22:59.000000000 +0200 *************** *** 32,38 **** ! 2010-08-11T22:34:00.000000Z 3b275476319a964831b2b6531bd6e649 2010-06-01T13:53:20.743888Z 3126 --- 32,38 ---- ! 2010-07-15T06:50:59.000000Z 3b275476319a964831b2b6531bd6e649 2010-06-01T13:53:20.743888Z 3126 diff -crB trunk//opencv/modules/objdetect/src/haar.cpp patched//opencv/modules/objdetect/src/haar.cpp *** trunk//opencv/modules/objdetect/src/haar.cpp 2010-08-12 00:34:00.000000000 +0200 --- patched//opencv/modules/objdetect/src/haar.cpp 2010-08-12 00:22:59.000000000 +0200 *************** *** 986,992 **** cvHaarDetectObjects( const CvArr* _img, CvHaarClassifierCascade* cascade, CvMemStorage* storage, double scaleFactor, ! int minNeighbors, int flags, CvSize minSize ) { const double GROUP_EPS = 0.2; CvMat stub, *img = (CvMat*)_img; --- 986,992 ---- cvHaarDetectObjects( const CvArr* _img, CvHaarClassifierCascade* cascade, CvMemStorage* storage, double scaleFactor, ! int minNeighbors, int flags, CvSize minSize, CvSize maxSize ) { const double GROUP_EPS = 0.2; CvMat stub, *img = (CvMat*)_img; *************** *** 1128,1136 **** cvIntegral( temp, sumcanny ); } for( n_factors = 0, factor = 1; ! factor*cascade->orig_window_size.width < img->cols - 10 && ! factor*cascade->orig_window_size.height < img->rows - 10; n_factors++, factor *= scaleFactor ) ; --- 1128,1138 ---- cvIntegral( temp, sumcanny ); } + if(maxSize.height==0) maxSize.height=img->height-10; + if(maxSize.width==0) maxSize.width=img->cols-10; for( n_factors = 0, factor = 1; ! factor*cascade->orig_window_size.width < maxSize.width && ! factor*cascade->orig_window_size.height < maxSize.height; n_factors++, factor *= scaleFactor ) ; diff -crB trunk//opencv/modules/objdetect/src/.svn/entries patched//opencv/modules/objdetect/src/.svn/entries *** trunk//opencv/modules/objdetect/src/.svn/entries 2010-08-12 00:34:00.000000000 +0200 --- patched//opencv/modules/objdetect/src/.svn/entries 2010-08-12 00:22:58.000000000 +0200 *************** *** 100,106 **** ! 2010-08-11T22:34:00.000000Z 1145216715c6aa64e3b49ed34d64a3f7 2010-07-16T12:54:53.212687Z 3343 --- 100,106 ---- ! 2010-07-24T17:33:07.000000Z 1145216715c6aa64e3b49ed34d64a3f7 2010-07-16T12:54:53.212687Z 3343