From ad58c084a95a5e8076f25f1bd9b16211f902b5d8 Mon Sep 17 00:00:00 2001 From: peng xiao Date: Wed, 27 Mar 2013 08:56:31 +0800 Subject: [PATCH] Fix compiler errors --- modules/nonfree/src/surf.ocl.cpp | 2 +- modules/nonfree/test/test_surf.ocl.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/nonfree/src/surf.ocl.cpp b/modules/nonfree/src/surf.ocl.cpp index 4acb4e36be..78864c6f96 100644 --- a/modules/nonfree/src/surf.ocl.cpp +++ b/modules/nonfree/src/surf.ocl.cpp @@ -43,7 +43,7 @@ // //M*/ #include "precomp.hpp" -#include +#include #ifdef HAVE_OPENCV_OCL diff --git a/modules/nonfree/test/test_surf.ocl.cpp b/modules/nonfree/test/test_surf.ocl.cpp index 9f1b3f170d..d5b06fcbec 100644 --- a/modules/nonfree/test/test_surf.ocl.cpp +++ b/modules/nonfree/test/test_surf.ocl.cpp @@ -147,7 +147,7 @@ PARAM_TEST_CASE(SURF, HessianThreshold, Octaves, OctaveLayers, Extended, Upright TEST_P(SURF, Detector) { // the data path should be opencv/samples - cv::Mat image = cv::imread(string(cvtest::TS::ptr()->get_data_path()) + "c/fruits.jpg", cv::IMREAD_GRAYSCALE); + cv::Mat image = cv::imread("../../../samples/c/fruits.jpg", cv::IMREAD_GRAYSCALE); ASSERT_FALSE(image.empty()); cv::ocl::SURF_OCL surf; @@ -180,7 +180,7 @@ TEST_P(SURF, Detector) TEST_P(SURF, Descriptor) { - cv::Mat image = cv::imread(string(cvtest::TS::ptr()->get_data_path()) + "c/fruits.jpg", cv::IMREAD_GRAYSCALE); + cv::Mat image = cv::imread("../../../samples/c/fruits.jpg", cv::IMREAD_GRAYSCALE); ASSERT_FALSE(image.empty()); cv::ocl::SURF_OCL surf;