Quiet logs in stitching module

modules/stitching/include/opencv2/stitching/detail/util.hpp

@@ -46,7 +46,7 @@
 #include <list>
 #include "opencv2/core/core.hpp"
 
-#define ENABLE_LOG 1
+#define ENABLE_LOG 0
 
 // TODO remove LOG macros, add logging class
 #if ENABLE_LOG

modules/stitching/src/exposure_compensate.cpp

@@ -74,7 +74,9 @@ void GainCompensator::feed(const vector<Point> &corners, const vector<Mat> &imag
                            const vector<pair<Mat,uchar> > &masks)
 {
     LOGLN("Exposure compensation...");
+#if ENABLE_LOG
     int64 t = getTickCount();
+#endif
 
     CV_Assert(corners.size() == images.size() && images.size() == masks.size());
 

modules/stitching/src/motion_estimators.cpp

@@ -105,7 +105,9 @@ void HomographyBasedEstimator::estimate(const vector<ImageFeatures> &features, c
                                         vector<CameraParams> &cameras)
 {
     LOGLN("Estimating rotations...");
+#if ENABLE_LOG
     int64 t = getTickCount();
+#endif
 
     const int num_images = static_cast<int>(features.size());
 
@@ -172,7 +174,9 @@ void BundleAdjusterBase::estimate(const vector<ImageFeatures> &features,
                                   vector<CameraParams> &cameras)
 {
     LOG_CHAT("Bundle adjustment");
+#if ENABLE_LOG
     int64 t = getTickCount();
+#endif
 
     num_images_ = static_cast<int>(features.size());
     features_ = &features[0];
@@ -582,7 +586,9 @@ void BundleAdjusterRay::calcJacobian(Mat &jac)
 void waveCorrect(vector<Mat> &rmats, WaveCorrectKind kind)
 {
     LOGLN("Wave correcting...");
+#if ENABLE_LOG
     int64 t = getTickCount();
+#endif
 
     Mat moment = Mat::zeros(3, 3, CV_32F);
     for (size_t i = 0; i < rmats.size(); ++i)

modules/stitching/src/seam_finders.cpp

@@ -55,7 +55,9 @@ void PairwiseSeamFinder::find(const vector<Mat> &src, const vector<Point> &corne
     if (src.size() == 0)
         return;
 
+#if ENABLE_LOG
     int64 t = getTickCount();
+#endif
 
     images_ = src;
     sizes_.resize(src.size());
@@ -90,7 +92,9 @@ void VoronoiSeamFinder::find(const vector<Size> &sizes, const vector<Point> &cor
     if (sizes.size() == 0)
         return;
 
+#if ENABLE_LOG
     int64 t = getTickCount();
+#endif
 
     sizes_ = sizes;
     corners_ = corners;
@@ -161,7 +165,9 @@ DpSeamFinder::DpSeamFinder(CostFunction costFunc) : costFunc_(costFunc) {}
 void DpSeamFinder::find(const vector<Mat> &src, const vector<Point> &corners, vector<Mat> &masks)
 {
     LOGLN("Finding seams...");
+#if ENABLE_LOG
     int64 t = getTickCount();
+#endif
 
     if (src.size() == 0)
         return;

modules/stitching/src/stitcher.cpp

@@ -152,7 +152,9 @@ Stitcher::Status Stitcher::composePanorama(InputArray images, OutputArray pano)
 
     Mat &pano_ = pano.getMatRef();
 
+#if ENABLE_LOG
     int64 t = getTickCount();
+#endif
 
     vector<Point> corners(imgs_.size());
     vector<Mat> masks_warped(imgs_.size());
@@ -201,7 +203,9 @@ Stitcher::Status Stitcher::composePanorama(InputArray images, OutputArray pano)
     masks.clear();
 
     LOGLN("Compositing...");
+#if ENABLE_LOG
     t = getTickCount();
+#endif
 
     Mat img_warped, img_warped_s;
     Mat dilated_mask, seam_mask, mask, mask_warped;
@@ -349,7 +353,9 @@ Stitcher::Status Stitcher::matchImages()
     full_img_sizes_.resize(imgs_.size());
 
     LOGLN("Finding features...");
+#if ENABLE_LOG
     int64 t = getTickCount();
+#endif
 
     for (size_t i = 0; i < imgs_.size(); ++i)
     {
@@ -406,7 +412,9 @@ Stitcher::Status Stitcher::matchImages()
     LOGLN("Finding features, time: " << ((getTickCount() - t) / getTickFrequency()) << " sec");
 
     LOG("Pairwise matching");
+#if ENABLE_LOG
     t = getTickCount();
+#endif
     (*features_matcher_)(features_, pairwise_matches_, matching_mask_);
     features_matcher_->collectGarbage();
     LOGLN("Pairwise matching, time: " << ((getTickCount() - t) / getTickFrequency()) << " sec");