generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated patch for tests; reenabled SURF & Denoising; removed fixes in ocl tests, since this is already fixed in another pull request

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-10-30 15:25:46 +04:00
parent 63bd6f9adf
commit adc1d94e95
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/nonfree/test/test_features2d.cpp
View File

@ -991,7 +991,7 @@ TEST( Features2d_DescriptorExtractor_SIFT, regression )
test.safe_run(); test.safe_run();
} }
TEST( Features2d_DescriptorExtractor_SURF, DISABLED_regression ) TEST( Features2d_DescriptorExtractor_SURF, regression )
{ {
CV_DescriptorExtractorTest<L2<float> > test( "descriptor-surf", 0.05f, CV_DescriptorExtractorTest<L2<float> > test( "descriptor-surf", 0.05f,
DescriptorExtractor::create("SURF") ); DescriptorExtractor::create("SURF") );
@ -1005,7 +1005,7 @@ TEST( Features2d_DescriptorExtractor_OpponentSIFT, regression )
test.safe_run(); test.safe_run();
} }
TEST( Features2d_DescriptorExtractor_OpponentSURF, DISABLED_regression ) TEST( Features2d_DescriptorExtractor_OpponentSURF, regression )
{ {
CV_DescriptorExtractorTest<L2<float> > test( "descriptor-opponent-surf", 0.3f, CV_DescriptorExtractorTest<L2<float> > test( "descriptor-opponent-surf", 0.3f,
DescriptorExtractor::create("OpponentSURF") ); DescriptorExtractor::create("OpponentSURF") );

4
modules/ocl/perf/precomp.hpp
View File

@ -55,13 +55,13 @@
#include "cvconfig.h" #include "cvconfig.h"
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
#include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui.hpp"
//#include "opencv2/calib3d/calib3d.hpp" #include "opencv2/calib3d/calib3d.hpp"
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/video/video.hpp" #include "opencv2/video/video.hpp"
#include "opencv2/ts/ts.hpp" #include "opencv2/ts/ts.hpp"
#include "opencv2/ts/ts_perf.hpp" #include "opencv2/ts/ts_perf.hpp"
#include "opencv2/ocl/ocl.hpp" #include "opencv2/ocl/ocl.hpp"
//#include "opencv2/nonfree/nonfree.hpp" #include "opencv2/nonfree/nonfree.hpp"
#include "utility.hpp" #include "utility.hpp"
#include "interpolation.hpp" #include "interpolation.hpp"

4
modules/ocl/test/precomp.hpp
View File

@ -55,13 +55,13 @@
#include "cvconfig.h" #include "cvconfig.h"
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
#include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui.hpp"
//#include "opencv2/calib3d/calib3d.hpp" #include "opencv2/calib3d/calib3d.hpp"
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/video/video.hpp" #include "opencv2/video/video.hpp"
#include "opencv2/ts/ts.hpp" #include "opencv2/ts/ts.hpp"
#include "opencv2/ts/ts_perf.hpp" #include "opencv2/ts/ts_perf.hpp"
#include "opencv2/ocl/ocl.hpp" #include "opencv2/ocl/ocl.hpp"
//#include "opencv2/nonfree/nonfree.hpp" #include "opencv2/nonfree/nonfree.hpp"
#include "utility.hpp" #include "utility.hpp"
#include "interpolation.hpp" #include "interpolation.hpp"

4
modules/photo/test/test_denoising.cpp
View File

@ -76,7 +76,7 @@ TEST(Imgproc_DenoisingGrayscale, regression)
ASSERT_EQ(0, norm(result != expected)); ASSERT_EQ(0, norm(result != expected));
} }
TEST(Imgproc_DenoisingColored, DISABLED_regression) TEST(Imgproc_DenoisingColored, regression)
{ {
string folder = string(cvtest::TS::ptr()->get_data_path()) + "denoising/"; string folder = string(cvtest::TS::ptr()->get_data_path()) + "denoising/";
string original_path = folder + "lena_noised_gaussian_sigma=10.png"; string original_path = folder + "lena_noised_gaussian_sigma=10.png";
@ -121,7 +121,7 @@ TEST(Imgproc_DenoisingGrayscaleMulti, regression)
ASSERT_EQ(0, norm(result != expected)); ASSERT_EQ(0, norm(result != expected));
} }
TEST(Imgproc_DenoisingColoredMulti, DISABLED_regression) TEST(Imgproc_DenoisingColoredMulti, regression)
{ {
const int imgs_count = 3; const int imgs_count = 3;
string folder = string(cvtest::TS::ptr()->get_data_path()) + "denoising/"; string folder = string(cvtest::TS::ptr()->get_data_path()) + "denoising/";