Delete useless code and clean up header files.

Author: nynyg

modules/photometric_calib/include/opencv2/photometric_calib.hpp

@@ -5,27 +5,13 @@
 #ifndef __OPENCV_PHOTOMETRIC_CALIB_HPP__
 #define __OPENCV_PHOTOMETRIC_CALIB_HPP__
 
-#include "opencv2/core.hpp"
-#include "opencv2/imgproc.hpp"
-
-#include <vector>
-
-/** @defgroup photometric_calib Photometric Calibration
-*/
+#include "opencv2/photometric_calib/Reader.hpp"
+#include "opencv2/photometric_calib/GammaRemover.hpp"
+#include "opencv2/photometric_calib/VignetteRemover.hpp"
+#include "opencv2/photometric_calib/ResponseCalib.hpp"
+#include "opencv2/photometric_calib/VignetteCalib.hpp"
 
 namespace cv { namespace photometric_calib{
-
-//! @addtogroup photometric_calib
-//! @{
-
-class CV_EXPORTS PhotometricCalibrator : public Algorithm
-{
-public:
-    bool validImgs(const std::vector <Mat> &inputImgs, const std::vector<double> &exposureTime);
-};
-
-//! @}
-
 }} // namespace photometric_calib, cv
 
 #endif

modules/photometric_calib/include/opencv2/photometric_calib/GammaRemover.hpp

@@ -5,7 +5,7 @@
 #ifndef _OPENCV_GAMMAREMOVER_HPP
 #define _OPENCV_GAMMAREMOVER_HPP
 
-#include "opencv2/photometric_calib.hpp"
+#include "opencv2/core.hpp"
 
 namespace cv { namespace photometric_calib {
 

modules/photometric_calib/include/opencv2/photometric_calib/Reader.hpp

@@ -5,7 +5,7 @@
 #ifndef _OPENCV_READER_HPP
 #define _OPENCV_READER_HPP
 
-#include "opencv2/photometric_calib.hpp"
+#include "opencv2/core.hpp"
 
 #include <vector>
 #include <string>

modules/photometric_calib/include/opencv2/photometric_calib/ResponseCalib.hpp

@@ -5,7 +5,6 @@
 #ifndef _OPENCV_RESPONSECALIB_HPP
 #define _OPENCV_RESPONSECALIB_HPP
 
-#include "opencv2/photometric_calib.hpp"
 #include "opencv2/photometric_calib/Reader.hpp"
 
 namespace cv { namespace photometric_calib {

modules/photometric_calib/include/opencv2/photometric_calib/VignetteCalib.hpp

@@ -5,7 +5,7 @@
 #ifndef _OPENCV_VIGNETTECALIB_HPP
 #define _OPENCV_VIGNETTECALIB_HPP
 
-#include "opencv2/photometric_calib.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/photometric_calib/Reader.hpp"
 #include "opencv2/photometric_calib/GammaRemover.hpp"
 

modules/photometric_calib/include/opencv2/photometric_calib/VignetteRemover.hpp

@@ -5,7 +5,7 @@
 #ifndef _OPENCV_VIGNETTEREMOVER_HPP
 #define _OPENCV_VIGNETTEREMOVER_HPP
 
-#include "opencv2/photometric_calib.hpp"
+#include "opencv2/core.hpp"
 
 namespace cv { namespace photometric_calib {
 

modules/photometric_calib/src/photometric_calib.cpp

@@ -3,42 +3,6 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "precomp.hpp"
-#include "opencv2/photometric_calib.hpp"
-#include <iostream>
 
 namespace cv{ namespace photometric_calib{
-
-using namespace std;
-
-bool PhotometricCalibrator::validImgs(const std::vector <Mat> &inputImgs, const std::vector<double> &exposureTime)
-{
-    if(inputImgs.empty() || exposureTime.empty() || inputImgs.size() != exposureTime.size())
-        return false;
-
-    int width = 0, height = 0;
-    for(size_t i = 0; i < inputImgs.size(); ++ i)
-    {
-        Mat img;
-        img = inputImgs[i];
-        if(img.type() != CV_8U)
-        {
-            cout<<"The type of the image should be CV_8U!"<<endl;
-            return false;
-        }
-        if((width!=0 && width != img.cols) || img.cols==0)
-        {
-            cout<<"Width mismatch!"<<endl;
-            return false;
-        };
-        if((height!=0 && height != img.rows) || img.rows==0)
-        {
-            cout<<"Height mismatch!"<<endl;
-            return false;
-        };
-        width = img.cols;
-        height = img.rows;
-    }
-    return true;
-}
-
 }} // namespace photometric_calib, cv

modules/photometric_calib/src/precomp.hpp

@@ -7,6 +7,7 @@
 
 #include "opencv2/core.hpp"
 #include "opencv2/highgui.hpp"
+#include "opencv2/imgproc.hpp"
 #include "opencv2/aruco.hpp"
 #include "opencv2/calib3d.hpp"
 #include <vector>