Skip to content

O
opencv
Commit 9408a5ef authored by Jiri Horner's avatar Jiri Horner
Browse files
Options

fix conversion bug in estimateAffine2D* functions 

functions support points to have other datatypes than floats.

* fix bug in coversion that overwrites src points with dst points
parent 383559c2
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
modules/calib3d/src/ptsetreg.cpp
View file @ 9408a5ef
...@@ -802,11 +802,11 @@ Mat estimateAffine2D(InputArray _from, InputArray _to, OutputArray _inliers, ...@@ -802,11 +802,11 @@ Mat estimateAffine2D(InputArray _from, InputArray _to, OutputArray _inliers,
if (from.type() != CV_32FC2 || to.type() != CV_32FC2) if (from.type() != CV_32FC2 || to.type() != CV_32FC2)
{ {
Mat tmp; Mat tmp1, tmp2;
from.convertTo(tmp, CV_32FC2); from.convertTo(tmp1, CV_32FC2);
from = tmp; from = tmp1;
to.convertTo(tmp, CV_32FC2); to.convertTo(tmp2, CV_32FC2);
to = tmp; to = tmp2;
} }
// convert to N x 1 vectors // convert to N x 1 vectors
from = from.reshape(2, count); from = from.reshape(2, count);
...@@ -869,11 +869,11 @@ Mat estimateAffinePartial2D(InputArray _from, InputArray _to, OutputArray _inlie ...@@ -869,11 +869,11 @@ Mat estimateAffinePartial2D(InputArray _from, InputArray _to, OutputArray _inlie
if (from.type() != CV_32FC2 || to.type() != CV_32FC2) if (from.type() != CV_32FC2 || to.type() != CV_32FC2)
{ {
Mat tmp; Mat tmp1, tmp2;
from.convertTo(tmp, CV_32FC2); from.convertTo(tmp1, CV_32FC2);
from = tmp; from = tmp1;
to.convertTo(tmp, CV_32FC2); to.convertTo(tmp2, CV_32FC2);
to = tmp; to = tmp2;
} }
// convert to N x 1 vectors // convert to N x 1 vectors
from = from.reshape(2, count); from = from.reshape(2, count);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment