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

moved SURF_GPU and VIBE to gpunonfree module

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-03-15 14:09:39 +04:00
parent abc9ef6809
commit fd7bf0b766
39 changed files with 1317 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/stitching/CMakeLists.txt
+1 -1
View File
@@ -1,3 +1,3 @@
set(the_description "Images stitching")
ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect OPTIONAL opencv_gpu opencv_nonfree)
ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect OPTIONAL opencv_gpu opencv_gpunonfree opencv_nonfree)
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
+3 -3
View File
@@ -47,8 +47,8 @@
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_GPU
#include "opencv2/gpu/gpu.hpp"
#ifdef HAVE_OPENCV_GPUNONFREE
#include "opencv2/gpunonfree/gpunonfree.hpp"
#endif
namespace cv {
@@ -103,7 +103,7 @@ private:
};
#ifdef HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPUNONFREE
class CV_EXPORTS SurfFeaturesFinderGpu : public FeaturesFinder
{
public:
modules/stitching/src/matchers.cpp
+1 -1
View File
@@ -429,7 +429,7 @@ void OrbFeaturesFinder::find(const Mat &image, ImageFeatures &features)
}
}
#ifdef HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPUNONFREE
SurfFeaturesFinderGpu::SurfFeaturesFinderGpu(double hess_thresh, int num_octaves, int num_layers,
int num_octaves_descr, int num_layers_descr)
{
modules/stitching/src/precomp.hpp
+3
View File
@@ -73,6 +73,9 @@
#ifdef HAVE_OPENCV_GPU
# include "opencv2/gpu/gpu.hpp"
#endif
#ifdef HAVE_OPENCV_GPUNONFREE
# include "opencv2/gpunonfree/gpunonfree.hpp"
#endif
#include "../../imgproc/src/gcgraph.hpp"
modules/stitching/src/stitcher.cpp
+1 -1
View File
@@ -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());