From 964a8a9a9ddfd1f6032df6f881da1c86d69042ff Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 24 Aug 2017 18:53:57 +0300 Subject: [PATCH] ccalib: don't convert vector into Mat-like structures --- modules/ccalib/include/opencv2/ccalib.hpp | 2 +- modules/ccalib/src/ccalib.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ccalib/include/opencv2/ccalib.hpp b/modules/ccalib/include/opencv2/ccalib.hpp index 79df5989c..c9b9391cb 100644 --- a/modules/ccalib/include/opencv2/ccalib.hpp +++ b/modules/ccalib/include/opencv2/ccalib.hpp @@ -71,7 +71,7 @@ public: bool isInitialized(); - void getPatternPoints(OutputArray original_points); + void getPatternPoints(std::vector& original_points); /**< Returns a vector of the original points. */ diff --git a/modules/ccalib/src/ccalib.cpp b/modules/ccalib/src/ccalib.cpp index efb5bdf25..249d5b14a 100644 --- 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& original_points) { - return Mat(keypoints).copyTo(original_points); + original_points = keypoints; } double CustomPattern::getPixelSize()