Merge pull request #3519 from fvgoto:patch-1

199f1aec · Vadim Pisarevsky · 35d730bf · f87f0cc4 · 199f1aec
Commit 199f1aec authored Dec 22, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sc_dis.cpp modules/shape/src/sc_dis.cpp +1 -1

No files found.
--- a/modules/shape/src/sc_dis.cpp
+++ b/modules/shape/src/sc_dis.cpp
@@ -199,7 +199,7 @@ float ShapeContextDistanceExtractorImpl::computeDistance(InputArray contour1, In
    if (set2.type() != CV_32F)
        sset2.convertTo(set2, CV_32F);
    else
-        sset1.copyTo(set2);
+        sset2.copyTo(set2);

    CV_Assert((set1.channels()==2) && (set1.cols>0));
    CV_Assert((set2.channels()==2) && (set2.cols>0));