ccalib: don't convert vector<Keypoint> into Mat-like structures

alalek · alalek · commit 964a8a9a9ddf · 2017-08-25T19:07:05.000+03:00
diff --git a/modules/ccalib/include/opencv2/ccalib.hpp b/modules/ccalib/include/opencv2/ccalib.hpp
@@ -71,7 +71,7 @@ class CV_EXPORTS CustomPattern : public Algorithm
 
 	bool isInitialized();
 
-	void getPatternPoints(OutputArray original_points);
+	void getPatternPoints(std::vector<KeyPoint>& original_points);
     /**<
 		Returns a vector<Point> of the original points.
 	*/
diff --git a/modules/ccalib/src/ccalib.cpp b/modules/ccalib/src/ccalib.cpp
@@ -405,9 +405,9 @@ bool CustomPattern::findPattern(InputArray image, OutputArray matched_features,
     return (!m_ftrs.empty());
 }
 
-void CustomPattern::getPatternPoints(OutputArray original_points)
+void CustomPattern::getPatternPoints(std::vector<KeyPoint>& original_points)
 {
-    return Mat(keypoints).copyTo(original_points);
+    original_points = keypoints;
 }
 
 double CustomPattern::getPixelSize()

Original file line number	Diff line number	Diff line change
`@@ -405,9 +405,9 @@ bool CustomPattern::findPattern(InputArray image, OutputArray matched_features,`
`405`	`405`	`return (!m_ftrs.empty());`
`406`	`406`	`}`
`407`	`407`
`408`		`-void CustomPattern::getPatternPoints(OutputArray original_points)`
	`408`	`+void CustomPattern::getPatternPoints(std::vector<KeyPoint>& original_points)`
`409`	`409`	`{`
`410`		`- return Mat(keypoints).copyTo(original_points);`
	`410`	`+ original_points = keypoints;`
`411`	`411`	`}`
`412`	`412`
`413`	`413`	`double CustomPattern::getPixelSize()`