Merge pull request #227 from TheMetalMonkey/master

StereoCalibrate - Correct point type is Point3f not Point3d
shimat · Jun 21, 2016 · a19808f · a19808f
2 parents c143252 + ec9f0ca
commit a19808f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/OpenCvSharp/Cv2/Cv2_calib3d.cs b/src/OpenCvSharp/Cv2/Cv2_calib3d.cs
@@ -1456,9 +1456,9 @@ public static double StereoCalibrate(IEnumerable<InputArray> objectPoints,
         /// <param name="criteria">Termination criteria for the iterative optimization algorithm.</param>
         /// <param name="flags">Different flags that may be zero or a combination of the CalibrationFlag values</param>
         /// <returns></returns>
-        public static double StereoCalibrate(IEnumerable<IEnumerable<Point3d>> objectPoints,
-                                             IEnumerable<IEnumerable<Point2d>> imagePoints1,
-                                             IEnumerable<IEnumerable<Point2d>> imagePoints2,
+        public static double StereoCalibrate(IEnumerable<IEnumerable<Point3f>> objectPoints,
+                                             IEnumerable<IEnumerable<Point2f>> imagePoints1,
+                                             IEnumerable<IEnumerable<Point2f>> imagePoints2,
                                              double[,] cameraMatrix1, double[] distCoeffs1,
                                              double[,] cameraMatrix2, double[] distCoeffs2,
                                              Size imageSize, OutputArray R,
@@ -1484,9 +1484,9 @@ public static double StereoCalibrate(IEnumerable<IEnumerable<Point3d>> objectPoi
             TermCriteria criteria0 = criteria.GetValueOrDefault(
                 new TermCriteria(CriteriaType.Count | CriteriaType.Eps, 30, 1e-6));
 
-            using (var op = new ArrayAddress2<Point3d>(objectPoints))
-            using (var ip1 = new ArrayAddress2<Point2d>(imagePoints1))
-            using (var ip2 = new ArrayAddress2<Point2d>(imagePoints2))
+            using (var op = new ArrayAddress2<Point3f>(objectPoints))
+            using (var ip1 = new ArrayAddress2<Point2f>(imagePoints1))
+            using (var ip2 = new ArrayAddress2<Point2f>(imagePoints2))
             {
                 return NativeMethods.calib3d_stereoCalibrate_array(
                         op.Pointer, op.Dim1Length, op.Dim2Lengths,