change include files

modules/ccalib/include/opencv2/multiCameraCalibration.hpp

@@ -42,9 +42,8 @@
 #ifndef __OPENCV_MULTICAMERACALIBRATION_HPP__
 #define __OPENCV_MULTICAMERACALIBRATION_HPP__
 
-#include "precomp.hpp"
-#include "randomPatten.hpp"
-#include "omnidir.hpp"
+#include "opencv2/randomPatten.hpp"
+#include "opencv2/omnidir.hpp"
 #include <string>
 #include <iostream>
 using namespace cv;

modules/ccalib/include/opencv2/omnidir.hpp

@@ -40,8 +40,7 @@
 //M*/
 #ifndef __OPENCV_OMNIDIR_HPP__
 #define __OPENCV_OMNIDIR_HPP__
-#include "precomp.hpp"
-#include <iostream>
+
 namespace cv
 {
 namespace omnidir

modules/ccalib/include/opencv2/randomPatten.hpp

@@ -41,7 +41,7 @@
 
 #ifndef __OPENCV_RANDOMPATTERN_HPP__
 #define __OPENCV_RANDOMPATTERN_HPP__
-#include "precomp.hpp"
+
 #include "opencv2/features2d.hpp"
 #include "opencv2/highgui.hpp"
 

modules/ccalib/sample/multiCamCalib.cpp

@@ -5,8 +5,8 @@
 using namespace std;
 using namespace cv;
 
-const char * usage = 
-"\n example command line for multi-camera calibration by using random pattern \n"
+const char * usage =
+"\n example command line for multi-camera calibrsation by using random pattern \n"
 "   multiCamCalib -nc 5 -pw 800 -ph 600 -ct 1 -fe 0 -nm 10 multi_camera.xml \n"
 "\n"
 " the file multi_camera.xml is generated by imagelist_creator as \n"
@@ -101,11 +101,11 @@ int main(int argc, char** argv)
 
     // do multi-camera calibration
     multiCameraCalibration multiCalib(cameraType, nCamera, inputFilename, patternWidth, patternHeight, showFeatureExtraction, nMiniMatches);
-    
+
     multiCalib.loadImages();
     multiCalib.initialize();
     multiCalib.optimizeExtrinsics();
     // the above three lines can be replaced by multiCalib.run();
-    
+
     multiCalib.writeParameters(outputFilename);
 }

modules/ccalib/sample/omniStereoCalibration.cpp

@@ -274,7 +274,7 @@ int main(int argc, char** argv)
             return fprintf( stderr, "Unknown option %s\n", s ), -1;
         }
     }
-    
+
     // get image name list
     vector<string> image_list1, detec_list_1, image_list2, detec_list_2;
     if((!readStringList(inputFilename1, image_list1)) || (!readStringList(inputFilename2, image_list2)))
@@ -293,7 +293,7 @@ int main(int argc, char** argv)
     {
         objectPoints.push_back(object);
     }
-    
+
     // run calibration, some images are discarded in calibration process because they are failed
     // in initialization. Retained image indexes are in idx variable.
     Mat K1, K2, D1, D2, xi1, xi2, idx;

modules/ccalib/sample/randomPatternCalibration.cpp

@@ -8,7 +8,7 @@
 using namespace std;
 using namespace cv;
 
-const char * usage = 
+const char * usage =
     "\n example command line for calibrate a camera by random pattern. \n"
     "   randomPatternCalibration -pw 600 -ph 850 -mm 20 image_list.xml \n"
     "\n"
@@ -152,7 +152,7 @@ int main(int argc, char** argv)
     finder.computeObjectImagePoints(vecImg);
     vector<Mat> objectPoints = finder.getObjectPoints();
     vector<Mat> imagePoints = finder.getImagePoints();
-    
+
     Mat K;
     Mat D;
     vector<Mat> rvec, tvec;

modules/ccalib/sample/randomPatternGenerator.cpp

@@ -1,6 +1,6 @@
 #include "opencv2/randomPatten.hpp";
 
-const char * usage = 
+const char * usage =
     "\n example command line for generating a random pattern. \n"
     "   randomPatternGenerator -iw 600 -ih 850 pattern.png\n"
     "\n";

modules/ccalib/src/precomp.hpp

@@ -43,10 +43,10 @@
 #ifndef __OPENCV_PRECOMP_H__
 #define __OPENCV_PRECOMP_H__
 
-#include "opencv2/calib3d/calib3d.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/core/core.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include <opencv2/core.hpp>
+#include <opencv2/calib3d.hpp>
+#include <opencv2/features2d.hpp>
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
 #include <vector>
-
 #endif