mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 13:13:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14338 from alalek:fix_13849

Browse Source
This commit is contained in:
Alexander Alekhin 2019-04-16 13:42:27 +00:00
commit 3ef046b6c9
5 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/calib3d/CMakeLists.txt
View File

@ -1,2 +1,6 @@
set(the_description "Camera Calibration and 3D Reconstruction") set(the_description "Camera Calibration and 3D Reconstruction")
ocv_define_module(calib3d opencv_imgproc opencv_features2d WRAP java python) set(debug_modules "")
if(DEBUG_opencv_calib3d)
list(APPEND debug_modules opencv_highgui)
endif()
ocv_define_module(calib3d opencv_imgproc opencv_features2d ${debug_modules} WRAP java python)

1
modules/calib3d/src/calibinit.cpp
View File

@ -76,6 +76,7 @@
//#define ENABLE_TRIM_COL_ROW //#define ENABLE_TRIM_COL_ROW
// Requires CMake flag: DEBUG_opencv_calib3d=ON
//#define DEBUG_CHESSBOARD //#define DEBUG_CHESSBOARD
#define DEBUG_CHESSBOARD_TIMEOUT 0 // 0 - wait for 'q' #define DEBUG_CHESSBOARD_TIMEOUT 0 // 0 - wait for 'q'

2
modules/calib3d/src/circlesgrid.cpp
View File

@ -43,6 +43,8 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "circlesgrid.hpp" #include "circlesgrid.hpp"
#include <limits> #include <limits>
// Requires CMake flag: DEBUG_opencv_calib3d=ON
//#define DEBUG_CIRCLES //#define DEBUG_CIRCLES
#ifdef DEBUG_CIRCLES #ifdef DEBUG_CIRCLES

6
modules/features2d/CMakeLists.txt
View File

@ -1,2 +1,6 @@
set(the_description "2D Features Framework") set(the_description "2D Features Framework")
ocv_define_module(features2d opencv_imgproc OPTIONAL opencv_flann opencv_highgui WRAP java python js) set(debug_modules "")
if(DEBUG_opencv_features2d)
list(APPEND debug_modules opencv_highgui)
endif()
ocv_define_module(features2d opencv_imgproc ${debug_modules} OPTIONAL opencv_flann WRAP java python js)

28
modules/features2d/src/blobdetector.cpp
View File

@ -44,15 +44,11 @@
#include <iterator> #include <iterator>
#include <limits> #include <limits>
// Requires CMake flag: DEBUG_opencv_features2d=ON
//#define DEBUG_BLOB_DETECTOR //#define DEBUG_BLOB_DETECTOR
#ifdef DEBUG_BLOB_DETECTOR #ifdef DEBUG_BLOB_DETECTOR
# include "opencv2/opencv_modules.hpp" #include "opencv2/highgui.hpp"
# ifdef HAVE_OPENCV_HIGHGUI
# include "opencv2/highgui.hpp"
# else
# undef DEBUG_BLOB_DETECTOR
# endif
#endif #endif
namespace cv namespace cv
@ -200,13 +196,13 @@ void SimpleBlobDetectorImpl::findBlobs(InputArray _image, InputArray _binaryImag
findContours(binaryImage, contours, RETR_LIST, CHAIN_APPROX_NONE); findContours(binaryImage, contours, RETR_LIST, CHAIN_APPROX_NONE);
#ifdef DEBUG_BLOB_DETECTOR #ifdef DEBUG_BLOB_DETECTOR
// Mat keypointsImage; Mat keypointsImage;
// cvtColor( binaryImage, keypointsImage, CV_GRAY2RGB ); cvtColor(binaryImage, keypointsImage, COLOR_GRAY2RGB);
//
// Mat contoursImage; Mat contoursImage;
// cvtColor( binaryImage, contoursImage, CV_GRAY2RGB ); cvtColor(binaryImage, contoursImage, COLOR_GRAY2RGB);
// drawContours( contoursImage, contours, -1, Scalar(0,255,0) ); drawContours( contoursImage, contours, -1, Scalar(0,255,0) );
// imshow("contours", contoursImage ); imshow("contours", contoursImage );
#endif #endif
for (size_t contourIdx = 0; contourIdx < contours.size(); contourIdx++) for (size_t contourIdx = 0; contourIdx < contours.size(); contourIdx++)
@ -296,12 +292,12 @@ void SimpleBlobDetectorImpl::findBlobs(InputArray _image, InputArray _binaryImag
#ifdef DEBUG_BLOB_DETECTOR #ifdef DEBUG_BLOB_DETECTOR
// circle( keypointsImage, center.location, 1, Scalar(0,0,255), 1 ); circle( keypointsImage, center.location, 1, Scalar(0,0,255), 1 );
#endif #endif
} }
#ifdef DEBUG_BLOB_DETECTOR #ifdef DEBUG_BLOB_DETECTOR
// imshow("bk", keypointsImage ); imshow("bk", keypointsImage );
// waitKey(); waitKey();
#endif #endif
} }