Add imageFormat parameter for response and vignetting calibration constructor class.

Author: nynyg

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

@@ -12,8 +12,8 @@ namespace cv { namespace photometric_calib {
 class CV_EXPORTS ResponseCalib
 {
 public:
-    ResponseCalib(std::string folderPath, std::string timePath);
-    ResponseCalib(std::string folderPath, std::string timePath, int leakPadding, int nIts, int skipFrames);
+    ResponseCalib(std::string folderPath, std::string timePath, std::string imageFormat);
+    ResponseCalib(std::string folderPath, std::string timePath, int leakPadding, int nIts, int skipFrames, std::string imageFormat);
 
     void plotE(const double* E, int w, int h, const std::string &saveTo);
 

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

@@ -15,9 +15,9 @@ namespace cv { namespace photometric_calib {
 class CV_EXPORTS VignetteCalib
 {
 public:
-    VignetteCalib(std::string folderPath, std::string timePath, std::string cameraFile, std::string gammaFile);
+    VignetteCalib(std::string folderPath, std::string timePath, std::string cameraFile, std::string gammaFile, std::string imageFormat);
     VignetteCalib(std::string folderPath, std::string timePath, std::string cameraFile, std::string gammaFile, int imageSkip, int maxIterations, int outlierTh,
-                  int gridWidth, int gridHeight, float facW, float facH, int maxAbsGrad);
+                  int gridWidth, int gridHeight, float facW, float facH, int maxAbsGrad, std::string imageFormat);
 
     virtual ~VignetteCalib();
 

modules/photometric_calib/src/ResponseCalib.cpp

@@ -11,15 +11,15 @@
 
 namespace cv { namespace photometric_calib{
 
-ResponseCalib::ResponseCalib(std::string folderPath, std::string timePath) : _leakPadding(2), _nIts(10), _skipFrames(1)
+ResponseCalib::ResponseCalib(std::string folderPath, std::string timePath, std::string imageFormat) : _leakPadding(2), _nIts(10), _skipFrames(1)
 {
-    imageReader = new Reader(folderPath, "png", timePath);
+    imageReader = new Reader(folderPath, imageFormat, timePath);
 }
 
-ResponseCalib::ResponseCalib(std::string folderPath, std::string timePath, int leakPadding, int nIts, int skipFrames) :
+ResponseCalib::ResponseCalib(std::string folderPath, std::string timePath, int leakPadding, int nIts, int skipFrames, std::string imageFormat) :
         _leakPadding(leakPadding), _nIts(nIts), _skipFrames(skipFrames)
 {
-    imageReader = new Reader(folderPath, "png", timePath);
+    imageReader = new Reader(folderPath, imageFormat, timePath);
 }
 
 Vec2d ResponseCalib::rmse(const double *G, const double *E, const std::vector<double> &exposureVec, const std::vector<uchar *> &dataVec,

modules/photometric_calib/src/VignetteCalib.cpp

@@ -11,11 +11,11 @@
 namespace cv { namespace photometric_calib{
 
 
-VignetteCalib::VignetteCalib(std::string folderPath, std::string timePath, std::string cameraFile, std::string gammaFile) :
+VignetteCalib::VignetteCalib(std::string folderPath, std::string timePath, std::string cameraFile, std::string gammaFile, std::string imageFormat) :
         _imageSkip(1), _maxIterations(20), _outlierTh(15), _gridWidth(1000), _gridHeight(1000), _facW(5), _facH(5),
         _maxAbsGrad(255)
 {
-    imageReader = new Reader(folderPath, "png", timePath);
+    imageReader = new Reader(folderPath, imageFormat, timePath);
     // check the extension of the camera file.
     CV_Assert(cameraFile.substr(cameraFile.find_last_of(".") + 1) == "yaml" || cameraFile.substr(cameraFile.find_last_of(".") + 1) == "yml");
     FileStorage cameraStorage(cameraFile, FileStorage::READ);
@@ -25,11 +25,11 @@ VignetteCalib::VignetteCalib(std::string folderPath, std::string timePath, std::
 }
 
 VignetteCalib::VignetteCalib(std::string folderPath, std::string timePath, std::string cameraFile, std::string gammaFile, int imageSkip, int maxIterations,
-                             int outlierTh, int gridWidth, int gridHeight, float facW, float facH, int maxAbsGrad) :
+                             int outlierTh, int gridWidth, int gridHeight, float facW, float facH, int maxAbsGrad, std::string imageFormat) :
         _imageSkip(imageSkip), _maxIterations(maxIterations), _outlierTh(outlierTh), _gridWidth(gridWidth), _gridHeight(gridHeight),
         _facW(facW), _facH(facH), _maxAbsGrad(maxAbsGrad)
 {
-    imageReader = new Reader(folderPath, "png", timePath);
+    imageReader = new Reader(folderPath, imageFormat, timePath);
     // check the extension of the camera file.
     CV_Assert(cameraFile.substr(cameraFile.find_last_of(".") + 1) == "yaml" || cameraFile.substr(cameraFile.find_last_of(".") + 1) == "yml");
     FileStorage cameraStorage(cameraFile, FileStorage::READ);