Fix bug with header files of sample codes

Author: nynyg

modules/photometric_calib/samples/response_calibration.cpp

@@ -1,13 +1,6 @@
-#include <string>
-#include <iostream>
-#include <iomanip>
-#include <vector>
-
-#include "opencv2/opencv.hpp"
 #include "opencv2/core.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/photometric_calib.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
 
 using namespace std;
 using namespace cv;
@@ -38,13 +31,13 @@ int main(int argc, char **argv)
     // The result and some intermediate data are stored in the folder ./photoCalibResult in which
     // pcalib.yaml is the camera response function file
     // Since we are using debug mode, we can visualize the response function:
-    Mat invRes = imread("./photoCalibResult/G-10.png", CV_LOAD_IMAGE_UNCHANGED);
+    Mat invRes = imread("./photoCalibResult/G-10.png", IMREAD_UNCHANGED);
     // As shown as Fig.3 in the paper from J.Engel, et al. in the paper A Photometrically Calibrated Benchmark For Monocular Visual Odometry
     namedWindow( "Inverse Response Function", WINDOW_AUTOSIZE );
     imshow("Inverse Response Function", invRes);
 
     // To see the response-calibrated image, we can use GammaRemover
-    Mat oriImg = imread(imageFolderPath + "/00480.jpg", CV_LOAD_IMAGE_UNCHANGED);
+    Mat oriImg = imread(imageFolderPath + "/00480.jpg", IMREAD_UNCHANGED);
     photometric_calib::GammaRemover gammaRemover("./photoCalibResult/pcalib.yaml", oriImg.cols, oriImg.rows);
     Mat caliImg = gammaRemover.getUnGammaImageMat(oriImg);
 

modules/photometric_calib/samples/vignette_calibration.cpp

@@ -1,13 +1,6 @@
-#include <string>
-#include <iostream>
-#include <iomanip>
-#include <vector>
-
-#include "opencv2/opencv.hpp"
 #include "opencv2/core.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/photometric_calib.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
 
 using namespace std;
 using namespace cv;
@@ -48,13 +41,13 @@ int main(int argc, char** argv)
     // The result and some intermediate data are stored in the folder ./vignetteCalibResult in which
     // vignette.png and vignetteSmoothed.png are the vignette images.
     // In practice, vignetteSomoothed.png is used, since it doesn't have the black boarders.
-    Mat vigSmoothed = imread("./vignetteCalibResult/vignetteSmoothed.png", CV_LOAD_IMAGE_UNCHANGED);
+    Mat vigSmoothed = imread("./vignetteCalibResult/vignetteSmoothed.png", IMREAD_UNCHANGED);
     // As shown as Fig.4 in the paper from J.Engel, et al. in the paper A Photometrically Calibrated Benchmark For Monocular Visual Odometry
     namedWindow( "Vignette Smoothed", WINDOW_AUTOSIZE );
     imshow("Vignette Smoothed", vigSmoothed);
 
     // To see the vignette-calibrated image, we can use VignetteRemover
-    Mat oriImg = imread(imageFolderPath + "/00480.jpg", CV_LOAD_IMAGE_UNCHANGED);
+    Mat oriImg = imread(imageFolderPath + "/00480.jpg", IMREAD_UNCHANGED);
     photometric_calib::GammaRemover gammaRemover(gammaPath, oriImg.cols, oriImg.rows);
     photometric_calib::VignetteRemover vignetteRemover("./vignetteCalibResult/vignetteSmoothed.png", gammaPath, oriImg.cols, oriImg.rows);
     Mat resCaliImg = gammaRemover.getUnGammaImageMat(oriImg);