moved SURF_GPU and VIBE to gpunonfree module

2013-03-15 14:09:39 +04:00
parent abc9ef6809
commit fd7bf0b766
39 changed files with 1317 additions and 413 deletions
--- a/modules/stitching/src/stitcher.cpp
+++ b/modules/stitching/src/stitcher.cpp
@@ -61,7 +61,7 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
 #ifdef HAVE_OPENCV_GPU
    if (try_use_gpu && gpu::getCudaEnabledDeviceCount() > 0)
    {
-#ifdef HAVE_OPENCV_NONFREE
+#ifdef HAVE_OPENCV_GPUNONFREE
        stitcher.setFeaturesFinder(new detail::SurfFeaturesFinderGpu());
 #else
        stitcher.setFeaturesFinder(new detail::OrbFeaturesFinder());