Merge pull request #2672 from a-wi:findContours

1576e24c · Roman Donchenko · OpenCV Buildbot · e89e3066 · 59250e82 · 1576e24c
Commit 1576e24c authored Jun 26, 2014 by Roman Donchenko Committed by OpenCV Buildbot Jun 26, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

contours.cpp modules/imgproc/src/contours.cpp +4 -0

No files found.
--- 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;