From 6027f4d4f9ca8b46cea588c38b794aa5ba47c6c5 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Thu, 10 Jun 2010 20:06:07 +0000 Subject: [PATCH] removed keypoint_matching.cpp from samples/cpp/CMakeLists.txt, fixed some crashes in select3dobj.cpp --- samples/cpp/CMakeLists.txt | 1 - samples/cpp/select3dobj.cpp | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt index 1fbb4a0e7..63a27d17b 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt @@ -45,7 +45,6 @@ if (BUILD_EXAMPLES) MY_DEFINE_EXAMPLE(select3dobj select3dobj.cpp) MY_DEFINE_EXAMPLE(connected_components connected_components.cpp) MY_DEFINE_EXAMPLE(contours2 contours2.cpp) - MY_DEFINE_EXAMPLE(keypoints_matching keypoints_matching.cpp) MY_DEFINE_EXAMPLE(morphology2 morphology2.cpp) MY_DEFINE_EXAMPLE(segment_objects segment_objects.cpp) endif(BUILD_EXAMPLES) diff --git a/samples/cpp/select3dobj.cpp b/samples/cpp/select3dobj.cpp index 1b480849d..ab5c5eefb 100644 --- a/samples/cpp/select3dobj.cpp +++ b/samples/cpp/select3dobj.cpp @@ -341,7 +341,8 @@ int main(int argc, char** argv) tempobj[6] = tempobj[2] + Point3f(0,0,Z); tempobj[7] = tempobj[3] + Point3f(0,0,Z); - projectPoints(Mat(tempobj), rvec, tvec, calibrated.cameraMatrix, Mat(), tempimg); + projectPoints(Mat(tempobj), rvec, tvec, calibrated.cameraMatrix, + calibrated.distCoeffs, tempimg); if( npt == 0 && nobjpt == 0 ) nOutlinePt = 0;