From: edgarriba <edgar.riba@gmail.com>
Date: Fri, 8 Aug 2014 11:52:15 +0000 (+0200)
Subject: updated ransanc model
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~165^2~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b732e086d8bdee5f760d6da0041ee68cb278c53;p=profile%2Fivi%2Fopencv.git

updated ransanc model
---

diff --git a/modules/calib3d/src/solvepnp.cpp b/modules/calib3d/src/solvepnp.cpp
index a457c84..00bfd54 100644
--- a/modules/calib3d/src/solvepnp.cpp
+++ b/modules/calib3d/src/solvepnp.cpp
@@ -203,7 +203,7 @@ bool cv::solvePnPRansac(InputArray _opoints, InputArray _ipoints,
     Ptr<PointSetRegistrator::Callback> cb; // pointer to callback
     cb = makePtr<PnPRansacCallback>( cameraMatrix, distCoeffs, flags, useExtrinsicGuess, rvec, tvec);
 
-    int model_points = 4;                             // minimum of number of model points
+    int model_points = flags == P3P ? 4 : 6;          // minimum of number of model points
     double param1 = reprojectionError;                // reprojection error
     double param2 = confidence;                       // confidence
     int param3 = iterationsCount;                     // number maximum iterations
diff --git a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/CMakeLists.txt b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/CMakeLists.txt
index dabd398..64405cd 100644
--- a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/CMakeLists.txt
+++ b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/CMakeLists.txt
@@ -1,11 +1,11 @@
 set(sample_dir ${CMAKE_CURRENT_SOURCE_DIR}/tutorial_code/calib3d/real_time_pose_estimation/src/)
+set(target cpp-tutorial-)
 
 if(HAVE_opencv_nonfree)
   ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/nonfree/include")
 endif()
 
 set(sample_pnplib
-        ${sample_dir}main_registration.cpp
         ${sample_dir}CsvReader.cpp
         ${sample_dir}CsvWriter.cpp
         ${sample_dir}ModelRegistration.cpp
@@ -16,12 +16,12 @@ set(sample_pnplib
         ${sample_dir}RobustMatcher.cpp
 )
 
-add_executable( pnp_registration ${sample_pnplib} )
-add_executable( pnp_verification ${sample_pnplib} )
-add_executable( pnp_detection ${sample_pnplib} )
-add_executable( pnp_test ${sample_pnplib} )
+add_executable( ${target}pnp_registration ${sample_dir}main_registration.cpp ${sample_pnplib} )
+add_executable( ${target}pnp_verification ${sample_dir}main_verification.cpp ${sample_pnplib} )
+add_executable( ${target}pnp_detection ${sample_dir}main_detection.cpp ${sample_pnplib} )
+add_executable( ${target}pnp_test ${sample_dir}test_pnp.cpp )
 
-ocv_target_link_libraries(pnp_registration ${OPENCV_LINKER_LIBS} ${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
-ocv_target_link_libraries(pnp_verification ${OPENCV_LINKER_LIBS} ${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
-ocv_target_link_libraries(pnp_detection ${OPENCV_LINKER_LIBS} ${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
-ocv_target_link_libraries(pnp_test ${OPENCV_LINKER_LIBS} ${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
+ocv_target_link_libraries( ${target}pnp_registration ${OPENCV_LINKER_LIBS} ${OPENCV_CPP_SAMPLES_REQUIRED_DEPS} )
+ocv_target_link_libraries( ${target}pnp_verification ${OPENCV_LINKER_LIBS} ${OPENCV_CPP_SAMPLES_REQUIRED_DEPS} )
+ocv_target_link_libraries( ${target}pnp_detection ${OPENCV_LINKER_LIBS} ${OPENCV_CPP_SAMPLES_REQUIRED_DEPS} )
+ocv_target_link_libraries(${target}pnp_test ${OPENCV_LINKER_LIBS} ${OPENCV_CPP_SAMPLES_REQUIRED_DEPS} )