some more fixes after Mat(vector<...>) constructor was made explicit

git-svn-id: https://code.ros.org/svn/opencv/trunk@2612 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/samples/c/calibration_artificial.cpp b/opencv/samples/c/calibration_artificial.cpp
index b6fd5726240427c47db12ac90b640e0ea9fa047b..71e7974a92039e3b64e1c6a3fd29ecfd27bc1c2b 100644 (file)
--- a/opencv/samples/c/calibration_artificial.cpp
+++ b/opencv/samples/c/calibration_artificial.cpp
@@ -212,10 +212,10 @@ Mat cv::ChessBoardGenerator::generageChessBoard(const Mat& bg, const Mat& camMat
                 generateEdge(p3, p4, pts_square3d);\r
                 generateEdge(p4, p1, pts_square3d);  \r
                 \r
-                projectPoints( pts_square3d, rvec, tvec, camMat, distCoeffs, pts_square2d);\r
+                projectPoints( Mat(pts_square3d), rvec, tvec, camMat, distCoeffs, pts_square2d);\r
                 squares_black.resize(squares_black.size() + 1);  \r
                 vector<Point2f> temp; \r
-                approxPolyDP(pts_square2d, temp, 1.0, true); \r
+                approxPolyDP(Mat(pts_square2d), temp, 1.0, true); \r
                 transform(temp.begin(), temp.end(), back_inserter(squares_black.back()), Mult(rendererResolutionMultiplier));             \r
             }  \r
 \r
@@ -225,7 +225,7 @@ Mat cv::ChessBoardGenerator::generageChessBoard(const Mat& bg, const Mat& camMat
         for(int i = 0; i < patternSize.width - 1; ++i)\r
             corners3d.push_back(zero + (i + 1) * sqWidth * pb1 + (j + 1) * sqHeight * pb2);\r
     corners.clear();\r
-    projectPoints( corners3d, rvec, tvec, camMat, distCoeffs, corners);\r
+    projectPoints( Mat(corners3d), rvec, tvec, camMat, distCoeffs, corners);\r
 \r
     vector<Point3f> whole3d;\r
     vector<Point2f> whole2d;\r
@@ -233,9 +233,9 @@ Mat cv::ChessBoardGenerator::generageChessBoard(const Mat& bg, const Mat& camMat
     generateEdge(whole[1], whole[2], whole3d);\r
     generateEdge(whole[2], whole[3], whole3d);\r
     generateEdge(whole[3], whole[0], whole3d);\r
-    projectPoints( whole3d, rvec, tvec, camMat, distCoeffs, whole2d);\r
+    projectPoints( Mat(whole3d), rvec, tvec, camMat, distCoeffs, whole2d);\r
     vector<Point2f> temp_whole2d; \r
-    approxPolyDP(whole2d, temp_whole2d, 1.0, true); \r
+    approxPolyDP(Mat(whole2d), temp_whole2d, 1.0, true); \r
 \r
     vector< vector<Point > > whole_contour(1);\r
     transform(temp_whole2d.begin(), temp_whole2d.end(), \r
@@ -295,7 +295,7 @@ Mat cv::ChessBoardGenerator::operator ()(const Mat& bg, const Mat& camMat, const
         pts3d[3] = p - pb1 * cbHalfWidth + cbHalfHeight * pb2;\r
         \r
         /* can remake with better perf */\r
-        projectPoints( pts3d, rvec, tvec, camMat, distCoeffs, pts2d);\r
+        projectPoints( Mat(pts3d), rvec, tvec, camMat, distCoeffs, pts2d);\r
 \r
         bool inrect1 = pts2d[0].x < bg.cols && pts2d[0].y < bg.rows && pts2d[0].x > 0 && pts2d[0].y > 0;\r
         bool inrect2 = pts2d[1].x < bg.cols && pts2d[1].y < bg.rows && pts2d[1].x > 0 && pts2d[1].y > 0;\r