From 1bc96e3ed0568412707cf9536f60a4d9e10b999a Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 31 May 2018 19:08:00 +0300 Subject: [PATCH] calib3d: cv::findContours() doesn't require to clone input --- modules/calib3d/src/calibinit.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/calib3d/src/calibinit.cpp b/modules/calib3d/src/calibinit.cpp index 4c2d9508d1..7eade39b40 100644 --- a/modules/calib3d/src/calibinit.cpp +++ b/modules/calib3d/src/calibinit.cpp @@ -538,7 +538,11 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size, int max_quad_buf_size = 0; cvFree(&quads); cvFree(&corners); +#ifdef USE_CV_FINDCONTOURS + Mat binarized_img = thresh_img_new; +#else Mat binarized_img = thresh_img_new.clone(); // make clone because cvFindContours modifies the source image +#endif int quad_count = icvGenerateQuads( &quads, &corners, storage, binarized_img, flags, &max_quad_buf_size ); PRINTF("Quad count: %d/%d\n", quad_count, (pattern_size.width/2+1)*(pattern_size.height/2+1)); SHOW_QUADS("New quads", thresh_img_new, quads, quad_count); @@ -604,7 +608,11 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size, int max_quad_buf_size = 0; cvFree(&quads); cvFree(&corners); +#ifdef USE_CV_FINDCONTOURS + Mat binarized_img = thresh_img; +#else Mat binarized_img = (useAdaptive) ? thresh_img : thresh_img.clone(); // make clone because cvFindContours modifies the source image +#endif int quad_count = icvGenerateQuads( &quads, &corners, storage, binarized_img, flags, &max_quad_buf_size); PRINTF("Quad count: %d/%d\n", quad_count, (pattern_size.width/2+1)*(pattern_size.height/2+1)); SHOW_QUADS("Old quads", thresh_img, quads, quad_count);