From d58459ccdd754efbe071fbdcf5fb5b73ad8a20d0 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <no@email>
Date: Thu, 11 Aug 2011 13:16:00 +0000
Subject: [PATCH] fixed default maxSize case in cvHaarDetectObjects (ticket
 #1296)

---
 modules/objdetect/src/haar.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/objdetect/src/haar.cpp b/modules/objdetect/src/haar.cpp
index 2984dd9913..6ff21c6090 100644
--- a/modules/objdetect/src/haar.cpp
+++ b/modules/objdetect/src/haar.cpp
@@ -1037,12 +1037,6 @@ cvHaarDetectObjectsForROC( const CvArr* _img,
     bool findBiggestObject = (flags & CV_HAAR_FIND_BIGGEST_OBJECT) != 0;
     bool roughSearch = (flags & CV_HAAR_DO_ROUGH_SEARCH) != 0;
 
-    if( maxSize.height == 0 || maxSize.width == 0 )
-    {
-        maxSize.height = img->rows;
-        maxSize.width = img->cols;
-    }
-
     if( !CV_IS_HAAR_CLASSIFIER(cascade) )
         CV_Error( !cascade ? CV_StsNullPtr : CV_StsBadArg, "Invalid classifier cascade" );
 
@@ -1061,6 +1055,12 @@ cvHaarDetectObjectsForROC( const CvArr* _img,
 
     if( findBiggestObject )
         flags &= ~CV_HAAR_SCALE_IMAGE;
+    
+    if( maxSize.height == 0 || maxSize.width == 0 )
+    {
+        maxSize.height = img->rows;
+        maxSize.width = img->cols;
+    }
 
     temp = cvCreateMat( img->rows, img->cols, CV_8UC1 );
     sum = cvCreateMat( img->rows + 1, img->cols + 1, CV_32SC1 );