Commit ad58c084 authored by peng xiao's avatar peng xiao

Fix compiler errors

parent 8ffc1537
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "precomp.hpp"
#include <cstring> #include <cstdio>
#ifdef HAVE_OPENCV_OCL #ifdef HAVE_OPENCV_OCL
......
...@@ -147,7 +147,7 @@ PARAM_TEST_CASE(SURF, HessianThreshold, Octaves, OctaveLayers, Extended, Upright ...@@ -147,7 +147,7 @@ PARAM_TEST_CASE(SURF, HessianThreshold, Octaves, OctaveLayers, Extended, Upright
TEST_P(SURF, Detector) TEST_P(SURF, Detector)
{ {
// the data path should be opencv/samples // 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()); ASSERT_FALSE(image.empty());
cv::ocl::SURF_OCL surf; cv::ocl::SURF_OCL surf;
...@@ -180,7 +180,7 @@ TEST_P(SURF, Detector) ...@@ -180,7 +180,7 @@ TEST_P(SURF, Detector)
TEST_P(SURF, Descriptor) 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()); ASSERT_FALSE(image.empty());
cv::ocl::SURF_OCL surf; cv::ocl::SURF_OCL surf;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment