mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 04:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3149 from StevenPuttemans:fix_nonfree_includes

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-08-26 16:03:53 +00:00
commit b5d073ad3f
12 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
View File

@ -48,8 +48,8 @@
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_NONFREE
# include "opencv2/nonfree/cuda.hpp"
#ifdef HAVE_OPENCV_XFEATURES2D
# include "opencv2/xfeatures2d/cuda.hpp"
#endif
namespace cv {
@ -104,7 +104,7 @@ private:
};
#ifdef HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_XFEATURES2D
class CV_EXPORTS SurfFeaturesFinderGpu : public FeaturesFinder
{
public:

8
modules/stitching/src/matchers.cpp
View File

@ -46,10 +46,10 @@ using namespace cv;
using namespace cv::detail;
using namespace cv::cuda;
#ifdef HAVE_OPENCV_NONFREE
#include "opencv2/nonfree.hpp"
#ifdef HAVE_OPENCV_XFEATURES2D
#include "opencv2/xfeatures2d.hpp"
static bool makeUseOfNonfree = initModule_nonfree();
static bool makeUseOfNonfree = initModule_xfeatures2d();
#endif
namespace {
@ -443,7 +443,7 @@ void OrbFeaturesFinder::find(InputArray image, ImageFeatures &features)
}
}
#ifdef HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_XFEATURES2D
SurfFeaturesFinderGpu::SurfFeaturesFinderGpu(double hess_thresh, int num_octaves, int num_layers,
int num_octaves_descr, int num_layers_descr)
{

4
modules/stitching/src/precomp.hpp
View File

@ -87,8 +87,8 @@
# include "opencv2/cuda.hpp"
#endif
#ifdef HAVE_OPENCV_NONFREE
# include "opencv2/nonfree/cuda.hpp"
#ifdef HAVE_OPENCV_XFEATURES2D
# include "opencv2/xfeatures2d/cuda.hpp"
#endif
#include "../../imgproc/src/gcgraph.hpp"

4
modules/stitching/src/stitcher.cpp
View File

@ -59,7 +59,7 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
#ifdef HAVE_OPENCV_CUDA
if (try_use_gpu && cuda::getCudaEnabledDeviceCount() > 0)
{
#ifdef HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_XFEATURES2D
stitcher.setFeaturesFinder(makePtr<detail::SurfFeaturesFinderGpu>());
#else
stitcher.setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());
@ -70,7 +70,7 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
else
#endif
{
#ifdef HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_XFEATURES2D
stitcher.setFeaturesFinder(makePtr<detail::SurfFeaturesFinder>());
#else
stitcher.setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());

2
modules/stitching/test/test_matchers.cpp
View File

@ -42,7 +42,7 @@
#include "test_precomp.hpp"
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_XFEATURES2D
using namespace cv;
using namespace std;

4
modules/world/src/precomp.hpp
View File

@ -53,8 +53,8 @@
#ifdef HAVE_OPENCV_FEATURES2D
#include "opencv2/features2d.hpp"
#endif
#ifdef HAVE_OPENCV_NONFREE
#include "opencv2/nonfree.hpp"
#ifdef HAVE_OPENCV_XFEATURES2D
#include "opencv2/xfeatures2d/nonfree.hpp"
#endif
#include "opencv2/world.hpp"

4
modules/world/src/world_init.cpp
View File

@ -51,8 +51,8 @@ bool cv::initAll()
#ifdef HAVE_OPENCV_FEATURES2D
&& initModule_features2d()
#endif
#ifdef HAVE_OPENCV_NONFREE
&& initModule_nonfree()
#ifdef HAVE_OPENCV_XFEATURES2D
&& initModule_xfeatures2d()
#endif
;
}

2
samples/cpp/stitching_detailed.cpp
View File

@ -384,7 +384,7 @@ int main(int argc, char* argv[])
Ptr<FeaturesFinder> finder;
if (features_type == "surf")
{
#ifdef HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_XFEATURES2D
if (try_cuda && cuda::getCudaEnabledDeviceCount() > 0)
finder = makePtr<SurfFeaturesFinderGpu>();
else

8
samples/gpu/CMakeLists.txt
View File

@ -19,8 +19,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
"${OpenCV_SOURCE_DIR}/modules/gpu/src/nvidia/core"
)
if(HAVE_opencv_nonfree)
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/nonfree/include")
if(HAVE_opencv_xfeatures2d)
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/xfeatures2d/include")
endif()
if(HAVE_opencv_cudacodec)
@ -52,8 +52,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
ocv_target_link_libraries(${the_target} ${CUDA_CUDA_LIBRARY})
endif()
if(HAVE_opencv_nonfree)
ocv_target_link_libraries(${the_target} opencv_nonfree)
if(HAVE_opencv_xfeatures2d)
ocv_target_link_libraries(${the_target} opencv_xfeatures2d)
endif()
if(HAVE_opencv_cudacodec)
ocv_target_link_libraries(${the_target} opencv_cudacodec)

8
samples/gpu/performance/CMakeLists.txt
View File

@ -3,15 +3,15 @@ set(the_target "example_gpu_performance")
file(GLOB sources "performance/*.cpp")
file(GLOB headers "performance/*.h")
if(HAVE_opencv_nonfree)
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/nonfree/include")
if(HAVE_opencv_xfeatures2d)
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/xfeatures2d/include")
endif()
add_executable(${the_target} ${sources} ${headers})
ocv_target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_CUDA_SAMPLES_REQUIRED_DEPS})
if(HAVE_opencv_nonfree)
ocv_target_link_libraries(${the_target} opencv_nonfree)
if(HAVE_opencv_xfeatures2d)
ocv_target_link_libraries(${the_target} opencv_xfeatures2d)
endif()
set_target_properties(${the_target} PROPERTIES

8
samples/gpu/performance/tests.cpp
View File

@ -17,9 +17,9 @@
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_NONFREE
#include "opencv2/nonfree/cuda.hpp"
#include "opencv2/nonfree/nonfree.hpp"
#ifdef HAVE_OPENCV_XFEATURES2D
#include "opencv2/xfeatures2d/cuda.hpp"
#include "opencv2/xfeatures2d/nonfree.hpp"
#endif
using namespace std;
@ -274,7 +274,7 @@ TEST(meanShift)
}
}
#ifdef HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_XFEATURES2D
TEST(SURF)
{

4
samples/gpu/surf_keypoint_matcher.cpp
View File

@ -2,13 +2,13 @@
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_XFEATURES2D
#include "opencv2/core/core.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/cudafeatures2d.hpp"
#include "opencv2/nonfree/cuda.hpp"
#include "opencv2/xfeatures2d/cuda.hpp"
using namespace std;
using namespace cv;