diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2017-06-24 12:03:41 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-06-24 12:03:41 +0200 |
commit | 70832cc3b198998fa506211bd2d90f1a9c3e3458 (patch) | |
tree | 5798e1b8ec82ebea4e1fff87f51638b673c5a064 /tracker-aruco/ftnoir_tracker_aruco.cpp | |
parent | 442fd797087834cb691cf18f4a808eee6d740353 (diff) |
tracker/aruco: add experimental canny threshold ifdef
Diffstat (limited to 'tracker-aruco/ftnoir_tracker_aruco.cpp')
-rw-r--r-- | tracker-aruco/ftnoir_tracker_aruco.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tracker-aruco/ftnoir_tracker_aruco.cpp b/tracker-aruco/ftnoir_tracker_aruco.cpp index f2a2e3b8..171e3f26 100644 --- a/tracker-aruco/ftnoir_tracker_aruco.cpp +++ b/tracker-aruco/ftnoir_tracker_aruco.cpp @@ -328,17 +328,23 @@ void aruco_tracker::set_detector_params() { detector.setDesiredSpeed(3); detector.setThresholdParams(adaptive_sizes[adaptive_size_pos], adaptive_thres); +#if !defined USE_EXPERIMENTAL_CANNY if (use_otsu) detector._thresMethod = aruco::MarkerDetector::FIXED_THRES; else detector._thresMethod = aruco::MarkerDetector::ADPT_THRES; +#else + detector._thresMethod = aruco::MarkerDetector::CANNY; +#endif } void aruco_tracker::cycle_detection_params() { +#if !defined USE_EXPERIMENTAL_CANNY if (!use_otsu) use_otsu = true; else +#endif { use_otsu = false; @@ -349,7 +355,9 @@ void aruco_tracker::cycle_detection_params() set_detector_params(); qDebug() << "aruco: switched thresholding params" +#if !defined USE_EXPERIMENTAL_CANNY << "otsu:" << use_otsu +#endif << "size:" << adaptive_sizes[adaptive_size_pos]; } |