potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #9130 from alalek:android_define

Browse Source
This commit is contained in:
Alexander Alekhin
2017-07-14 17:17:24 +00:00
parent e5fbb4f5d2 a4a47b538c
commit 5a54acef4e
25 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/features2d/test/ocl/test_brute_force_matcher.cpp
+3 -3
View File
@@ -111,7 +111,7 @@ PARAM_TEST_CASE(BruteForceMatcher, int, int)
}
};
#ifdef ANDROID
#ifdef __ANDROID__
OCL_TEST_P(BruteForceMatcher, DISABLED_Match_Single)
#else
OCL_TEST_P(BruteForceMatcher, Match_Single)
@@ -135,7 +135,7 @@ OCL_TEST_P(BruteForceMatcher, Match_Single)
ASSERT_EQ(0, badCount);
}
#ifdef ANDROID
#ifdef __ANDROID__
OCL_TEST_P(BruteForceMatcher, DISABLED_KnnMatch_2_Single)
#else
OCL_TEST_P(BruteForceMatcher, KnnMatch_2_Single)
@@ -171,7 +171,7 @@ OCL_TEST_P(BruteForceMatcher, KnnMatch_2_Single)
ASSERT_EQ(0, badCount);
}
#ifdef ANDROID
#ifdef __ANDROID__
OCL_TEST_P(BruteForceMatcher, DISABLED_RadiusMatch_Single)
#else
OCL_TEST_P(BruteForceMatcher, RadiusMatch_Single)