From 36030891d82c8936e1fbfcdc13e0a46211d0faf8 Mon Sep 17 00:00:00 2001 From: Caroline Pantofaru Date: Thu, 10 Feb 2011 01:00:27 +0000 Subject: [PATCH] Fixed test bags git-svn-id: https://code.ros.org/svn/wg-ros-pkg/stacks/people/trunk@48943 7275ad9f-c29b-430a-bdc5-66f4b3af1622 --- face_detector/CMakeLists.txt | 4 ++-- face_detector/src/face_detection.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/face_detector/CMakeLists.txt b/face_detector/CMakeLists.txt index eaf51024..a1b5cf97 100644 --- a/face_detector/CMakeLists.txt +++ b/face_detector/CMakeLists.txt @@ -37,7 +37,7 @@ rosbuild_add_executable(face_detector src/faces.cpp) rosbuild_link_boost(face_detector thread) -rosbuild_download_test_data(http://pr.willowgarage.com/data/face_detector/face_detector_noface_test_diamondback.bag face_detector_noface_test.bag 45243baf951fe32c600bf1c379a3ee1e) -rosbuild_download_test_data(http://pr.willowgarage.com/data/face_detector/face_detector_withface_test_diamondback.bag face_detector_withface_test.bag b37cdc75d922ab3689d989ebb70fa072) +rosbuild_download_test_data(http://pr.willowgarage.com/data/face_detector/face_detector_noface_test_diamondback.bag face_detector_noface_test.bag 37f043be780a4511c853379defdd9855) +rosbuild_download_test_data(http://pr.willowgarage.com/data/face_detector/face_detector_withface_test_diamondback.bag face_detector_withface_test.bag 59126117e049e69d577b7ee27251a6f8) rosbuild_add_rostest(test/face_detector_true_rtest.xml) rosbuild_add_rostest(test/face_detector_false_rtest.xml) diff --git a/face_detector/src/face_detection.cpp b/face_detector/src/face_detection.cpp index 90f1df89..c6e8c5e6 100644 --- a/face_detector/src/face_detection.cpp +++ b/face_detector/src/face_detection.cpp @@ -294,21 +294,21 @@ class FaceDetector { } // ROS --> OpenCV - cv::Mat cv_image_left_(lbridge_.imgMsgToCv(limage,"bgr8")); + cv::Mat cv_image_left(lbridge_.imgMsgToCv(limage,"bgr8")); sensor_msgs::ImageConstPtr boost_dimage(const_cast(&dimage->image), NullDeleter()); - cv::Mat cv_image_disp_(dbridge_.imgMsgToCv(boost_dimage)); + cv::Mat cv_image_disp(dbridge_.imgMsgToCv(boost_dimage)); cam_model_.fromCameraInfo(lcinfo,rcinfo); // For display, keep a copy of the image that we can draw on. if (do_display_ == "local") { - cv_image_out_ = cv_image_left_.clone(); + cv_image_out_ = cv_image_left.clone(); } struct timeval timeofday; gettimeofday(&timeofday,NULL); ros::Time starttdetect = ros::Time().fromNSec(1e9*timeofday.tv_sec + 1e3*timeofday.tv_usec); - vector faces_vector = faces_->detectAllFaces(cv_image_left_, 1.0, cv_image_disp_, &cam_model_); + vector faces_vector = faces_->detectAllFaces(cv_image_left, 1.0, cv_image_disp, &cam_model_); gettimeofday(&timeofday,NULL); ros::Time endtdetect = ros::Time().fromNSec(1e9*timeofday.tv_sec + 1e3*timeofday.tv_usec); ros::Duration diffdetect = endtdetect - starttdetect;