potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-04-19 15:43:58 +03:00
parent 1f517b8a02 3abae3c511
commit c024edb9a8
40 changed files with 332 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/calib3d/CMakeLists.txt
+5 -1
View File
@@ -1,2 +1,6 @@
set(the_description "Camera Calibration and 3D Reconstruction")
ocv_define_module(calib3d opencv_imgproc opencv_features2d opencv_flann 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 opencv_flann ${debug_modules} WRAP java python)
modules/calib3d/src/calibinit.cpp
+1
View File
@@ -76,6 +76,7 @@
//#define ENABLE_TRIM_COL_ROW
// Requires CMake flag: DEBUG_opencv_calib3d=ON
//#define DEBUG_CHESSBOARD
#define DEBUG_CHESSBOARD_TIMEOUT 0 // 0 - wait for 'q'
modules/calib3d/src/circlesgrid.cpp
+2
View File
@@ -43,6 +43,8 @@
#include "precomp.hpp"
#include "circlesgrid.hpp"
#include <limits>
// Requires CMake flag: DEBUG_opencv_calib3d=ON
//#define DEBUG_CIRCLES
#ifdef DEBUG_CIRCLES