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

Fixed Android build

Browse Source
This commit is contained in:
Andrey Kamaev
2012-06-08 08:11:17 +00:00
parent ec0ec69307
commit 2f40905548
22 changed files with 170 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/stitching/perf/perf_stich.cpp
+1 -1
View File
@@ -18,7 +18,7 @@ using std::tr1::get;
typedef TestBaseWithParam<String> stitch;
typedef TestBaseWithParam<String> match;
#if HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_NONFREE
#define TEST_DETECTORS testing::Values("surf", "orb")
#else
#define TEST_DETECTORS testing::Values<String>("orb")
modules/stitching/src/stitcher.cpp
+2 -2
View File
@@ -61,7 +61,7 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
#ifdef HAVE_OPENCV_GPU
if (try_use_gpu && gpu::getCudaEnabledDeviceCount() > 0)
{
#if HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_NONFREE
stitcher.setFeaturesFinder(new detail::SurfFeaturesFinderGpu());
#else
stitcher.setFeaturesFinder(new detail::OrbFeaturesFinder());
@@ -72,7 +72,7 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
else
#endif
{
#if HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_NONFREE
stitcher.setFeaturesFinder(new detail::SurfFeaturesFinder());
#else
stitcher.setFeaturesFinder(new detail::OrbFeaturesFinder());
modules/stitching/test/test_matchers.cpp
+2 -2
View File
@@ -42,7 +42,7 @@
#include "test_precomp.hpp"
#include "opencv2/opencv_modules.hpp"
#if HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_NONFREE
using namespace cv;
using namespace std;
@@ -57,7 +57,7 @@ TEST(SurfFeaturesFinder, CanFindInROIs)
rois.push_back(Rect(img.cols / 2, img.rows / 2, img.cols - img.cols / 2, img.rows - img.rows / 2));
detail::ImageFeatures roi_features;
(*finder)(img, roi_features, rois);
int tl_rect_count = 0, br_rect_count = 0, bad_count = 0;
for (size_t i = 0; i < roi_features.keypoints.size(); ++i)
{