Merge pull request #5942 from akarsakov:fix_memcpy_empty_vector

8a803865 · Alexander Alekhin · f91ada57 · 6e22020d · 8a803865
Commit 8a803865 authored Jan 11, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

solvepnp.cpp modules/calib3d/src/solvepnp.cpp +1 -1

No files found.
--- a/modules/calib3d/src/solvepnp.cpp
+++ b/modules/calib3d/src/solvepnp.cpp
@@ -197,7 +197,7 @@ namespace cv
            }
            resultsMutex.lock();
-            if ( (localInliers.size() > inliers.size()) || (localInliers.size() == inliers.size() && curIndex > bestIndex))
+            if ( (localInliers.size() > inliers.size()) || (localInliers.size() == inliers.size() && inliers.size() > 0 && curIndex > bestIndex))
            {
                inliers.clear();
                inliers.resize(localInliers.size());