generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests 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

4
modules/stitching/src/stitcher.cpp
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());