fixed drawContours (ticket #131).

git-svn-id: https://code.ros.org/svn/opencv/trunk@2863 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/src/cv/cvcontours.cpp b/opencv/src/cv/cvcontours.cpp
index b710f5bfbc730105e386c9b792299df04f71045c..a7948efba17c0610d1a7cae6d1b60e389fb42644 100644 (file)
--- a/opencv/src/cv/cvcontours.cpp
+++ b/opencv/src/cv/cvcontours.cpp
@@ -1587,7 +1587,7 @@ void cv::drawContours( Mat& image, const vector<vector<Point> >& contours,
             !ci.empty() ? (void*)&ci[0] : 0, (int)ci.size(), &seq[i], &block[i] );
     }
 
-    if( hierarchy.empty() || maxLevel == 0 || maxLevel == INT_MAX )
+    if( hierarchy.empty() || maxLevel == 0 || contourIdx < 0 )
         for( i = first; i < last; i++ )
         {
             seq[i].h_next = i < last-1 ? &seq[i+1] : 0;

diff --git a/opencv/src/cxcore/cxdrawing.cpp b/opencv/src/cxcore/cxdrawing.cpp
index 72468016e28a66bdcdcc9a47fe94d729575d4cdc..362177acc57e400171a5518ffd38ded0e6b2c176 100644 (file)
--- a/opencv/src/cxcore/cxdrawing.cpp
+++ b/opencv/src/cxcore/cxdrawing.cpp
@@ -2034,6 +2034,7 @@ cvDrawContours( void* _img, CvSeq* contour,
         h_next = contour->h_next;
         contour->h_next = 0;
         maxLevel = -maxLevel+1;
+        maxLevel -= maxLevel < 0;
     }
 
     cvInitTreeNodeIterator( &iterator, contour, maxLevel );