fix Point2f to Point explicit cast error

shimat · shimat · commit 2c1941bb6eac · 2018-11-18T13:54:12.000+09:00
diff --git a/SamplesCS/Samples/BRISKSample.cs b/SamplesCS/Samples/BRISKSample.cs
@@ -22,14 +22,14 @@ public void Run()
                 foreach (KeyPoint kpt in keypoints)
                 {
                     float r = kpt.Size / 2;
-                    Cv2.Circle(dst, kpt.Pt, (int)r, color);
-                    Cv2.Line(dst, 
-                        new Point2f(kpt.Pt.X + r, kpt.Pt.Y + r), 
-                        new Point2f(kpt.Pt.X - r, kpt.Pt.Y - r), 
+                    Cv2.Circle(dst, (Point)kpt.Pt, (int)r, color);
+                    Cv2.Line(dst,
+                        (Point)new Point2f(kpt.Pt.X + r, kpt.Pt.Y + r),
+                        (Point)new Point2f(kpt.Pt.X - r, kpt.Pt.Y - r), 
                         color);
-                    Cv2.Line(dst, 
-                        new Point2f(kpt.Pt.X - r, kpt.Pt.Y + r), 
-                        new Point2f(kpt.Pt.X + r, kpt.Pt.Y - r), 
+                    Cv2.Line(dst,
+                        (Point)new Point2f(kpt.Pt.X - r, kpt.Pt.Y + r),
+                        (Point)new Point2f(kpt.Pt.X + r, kpt.Pt.Y - r), 
                         color);
                 }
             }
diff --git a/SamplesCS/Samples/FASTSample.cs b/SamplesCS/Samples/FASTSample.cs
@@ -20,7 +20,7 @@ public void Run()
 
                 foreach (KeyPoint kp in keypoints)
                 {
-                    imgDst.Circle(kp.Pt, 3, Scalar.Red, -1, LineTypes.AntiAlias, 0);
+                    imgDst.Circle((Point)kp.Pt, 3, Scalar.Red, -1, LineTypes.AntiAlias, 0);
                 }
 
                 Cv2.ImShow("FAST", imgDst);
diff --git a/SamplesCS/Samples/FREAKSample.cs b/SamplesCS/Samples/FREAKSample.cs
@@ -29,14 +29,14 @@ public void Run()
                 foreach (KeyPoint kpt in keypoints)
                 {
                     float r = kpt.Size / 2;
-                    Cv2.Circle(dst, kpt.Pt, (int)r, color);
-                    Cv2.Line(dst, 
-                        new Point2f(kpt.Pt.X + r, kpt.Pt.Y + r), 
-                        new Point2f(kpt.Pt.X - r, kpt.Pt.Y - r), 
+                    Cv2.Circle(dst, (Point)kpt.Pt, (int)r, color);
+                    Cv2.Line(dst,
+                        (Point)new Point2f(kpt.Pt.X + r, kpt.Pt.Y + r),
+                        (Point)new Point2f(kpt.Pt.X - r, kpt.Pt.Y - r), 
                         color);
-                    Cv2.Line(dst, 
-                        new Point2f(kpt.Pt.X - r, kpt.Pt.Y + r), 
-                        new Point2f(kpt.Pt.X + r, kpt.Pt.Y - r), 
+                    Cv2.Line(dst,
+                        (Point)new Point2f(kpt.Pt.X - r, kpt.Pt.Y + r),
+                        (Point)new Point2f(kpt.Pt.X + r, kpt.Pt.Y - r), 
                         color);
                 }
             }
diff --git a/SamplesCS/Samples/StarDetectorSample.cs b/SamplesCS/Samples/StarDetectorSample.cs
@@ -23,14 +23,14 @@ public void Run()
                 foreach (KeyPoint kpt in keypoints)
                 {
                     float r = kpt.Size / 2;
-                    Cv2.Circle(dst, kpt.Pt, (int)r, color);
-                    Cv2.Line(dst, 
-                        new Point2f(kpt.Pt.X + r, kpt.Pt.Y + r), 
-                        new Point2f(kpt.Pt.X - r, kpt.Pt.Y - r), 
+                    Cv2.Circle(dst, (Point)kpt.Pt, (int)r, color);
+                    Cv2.Line(dst,
+                        (Point)new Point2f(kpt.Pt.X + r, kpt.Pt.Y + r),
+                        (Point)new Point2f(kpt.Pt.X - r, kpt.Pt.Y - r), 
                         color);
-                    Cv2.Line(dst, 
-                        new Point2f(kpt.Pt.X - r, kpt.Pt.Y + r), 
-                        new Point2f(kpt.Pt.X + r, kpt.Pt.Y - r), 
+                    Cv2.Line(dst,
+                        (Point)new Point2f(kpt.Pt.X - r, kpt.Pt.Y + r),
+                        (Point)new Point2f(kpt.Pt.X + r, kpt.Pt.Y - r), 
                         color);
                 }
             }
diff --git a/SamplesCS/Samples/Subdiv2DSample.cs b/SamplesCS/Samples/Subdiv2DSample.cs
@@ -22,7 +22,7 @@ public void Run()
             Mat img = Mat.Zeros(Size, Size, MatType.CV_8UC3);
             foreach (var p in points)
             {
-                img.Circle(p, 4, Scalar.Red, -1);
+                img.Circle((Point)p, 4, Scalar.Red, -1);
             }
 
             // Initializes Subdiv2D
@@ -41,7 +41,7 @@ public void Run()
                 var before = list.Last();
                 foreach (var p in list)
                 {
-                    vonoroi.Line(before, p, new Scalar(64, 255, 128), 1);
+                    vonoroi.Line((Point)before, (Point)p, new Scalar(64, 255, 128), 1);
                     before = p;
                 }
             }
diff --git a/SamplesCore/Samples/Subdiv2DSample.cs b/SamplesCore/Samples/Subdiv2DSample.cs
@@ -22,7 +22,7 @@ public void Run()
             Mat img = Mat.Zeros(Size, Size, MatType.CV_8UC3);
             foreach (var p in points)
             {
-                img.Circle(p, 4, Scalar.Red, -1);
+                img.Circle((Point)p, 4, Scalar.Red, -1);
             }
 
             // Initializes Subdiv2D
@@ -41,7 +41,7 @@ public void Run()
                 var before = list.Last();
                 foreach (var p in list)
                 {
-                    vonoroi.Line(before, p, new Scalar(64, 255, 128), 1);
+                    vonoroi.Line((Point)before, (Point)p, new Scalar(64, 255, 128), 1);
                     before = p;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public void Run()`
`20`	`20`
`21`	`21`	`foreach (KeyPoint kp in keypoints)`
`22`	`22`	`{`
`23`		`- imgDst.Circle(kp.Pt, 3, Scalar.Red, -1, LineTypes.AntiAlias, 0);`
	`23`	`+ imgDst.Circle((Point)kp.Pt, 3, Scalar.Red, -1, LineTypes.AntiAlias, 0);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`Cv2.ImShow("FAST", imgDst);`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public void Run()`
`22`	`22`	`Mat img = Mat.Zeros(Size, Size, MatType.CV_8UC3);`
`23`	`23`	`foreach (var p in points)`
`24`	`24`	`{`
`25`		`- img.Circle(p, 4, Scalar.Red, -1);`
	`25`	`+ img.Circle((Point)p, 4, Scalar.Red, -1);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// Initializes Subdiv2D`
`@@ -41,7 +41,7 @@ public void Run()`
`41`	`41`	`var before = list.Last();`
`42`	`42`	`foreach (var p in list)`
`43`	`43`	`{`
`44`		`- vonoroi.Line(before, p, new Scalar(64, 255, 128), 1);`
	`44`	`+ vonoroi.Line((Point)before, (Point)p, new Scalar(64, 255, 128), 1);`
`45`	`45`	`before = p;`
`46`	`46`	`}`
`47`	`47`	`}`