From: PhilLab <PhilLab@users.noreply.github.com>
Date: Mon, 5 May 2014 15:44:59 +0000 (+0200)
Subject: Update solvepnp.cpp
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~417^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ffeb01cfd75b46c83d05ba5aab3afdb5445003e;p=profile%2Fivi%2Fopencv.git

Update solvepnp.cpp

Clarified assert message for allowed PnP flags
---

diff --git a/modules/calib3d/src/solvepnp.cpp b/modules/calib3d/src/solvepnp.cpp
index 698302b..2b2d1bd 100644
--- a/modules/calib3d/src/solvepnp.cpp
+++ b/modules/calib3d/src/solvepnp.cpp
@@ -94,7 +94,7 @@ bool cv::solvePnP( InputArray _opoints, InputArray _ipoints,
         return true;
     }
     else
-        CV_Error(CV_StsBadArg, "The flags argument must be one of CV_ITERATIVE or CV_EPNP");
+        CV_Error(CV_StsBadArg, "The flags argument must be one of CV_ITERATIVE, CV_P3P or CV_EPNP");
     return false;
 }