Merge pull request #2672 from a-wi:findContours

2014-06-26 17:35:07 +04:00
parent e89e3066e8 59250e8288
commit 1576e24c93
1 changed files with 4 additions and 0 deletions
--- a/modules/imgproc/src/contours.cpp
+++ b/modules/imgproc/src/contours.cpp
@@ -1703,6 +1703,10 @@ cvFindContours( void*  img,  CvMemStorage*  storage,
 void cv::findContours( InputOutputArray _image, OutputArrayOfArrays _contours,
                   OutputArray _hierarchy, int mode, int method, Point offset )
 {
+    // Sanity check: output must be of type vector<vector<Point>>
+    CV_Assert( _contours.kind() == _InputArray::STD_VECTOR_VECTOR &&
+               _contours.channels() == 2 && _contours.depth() == CV_32S );
+
    Mat image = _image.getMat();
    MemStorage storage(cvCreateMemStorage());
    CvMat _cimage = image;