renamed gpucodec -> cudacodec
This commit is contained in:
@@ -23,8 +23,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
|
||||
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/nonfree/include")
|
||||
endif()
|
||||
|
||||
if(HAVE_opencv_gpucodec)
|
||||
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpucodec/include")
|
||||
if(HAVE_opencv_cudacodec)
|
||||
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/cudacodec/include")
|
||||
endif()
|
||||
|
||||
if(HAVE_CUDA)
|
||||
@@ -55,8 +55,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
|
||||
if(HAVE_opencv_nonfree)
|
||||
target_link_libraries(${the_target} opencv_nonfree)
|
||||
endif()
|
||||
if(HAVE_opencv_gpucodec)
|
||||
target_link_libraries(${the_target} opencv_gpucodec)
|
||||
if(HAVE_opencv_cudacodec)
|
||||
target_link_libraries(${the_target} opencv_cudacodec)
|
||||
endif()
|
||||
|
||||
if(HAVE_OPENCL)
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "opencv2/opencv_modules.hpp"
|
||||
|
||||
#if defined(HAVE_OPENCV_GPUCODEC)
|
||||
#if defined(HAVE_OPENCV_CUDACODEC)
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <opencv2/core.hpp>
|
||||
#include <opencv2/core/opengl.hpp>
|
||||
#include <opencv2/gpucodec.hpp>
|
||||
#include <opencv2/cudacodec.hpp>
|
||||
#include <opencv2/highgui.hpp>
|
||||
#include <opencv2/contrib.hpp>
|
||||
|
||||
|
@@ -2,13 +2,13 @@
|
||||
|
||||
#include "opencv2/opencv_modules.hpp"
|
||||
|
||||
#if defined(HAVE_OPENCV_GPUCODEC) && defined(WIN32)
|
||||
#if defined(HAVE_OPENCV_CUDACODEC) && defined(WIN32)
|
||||
|
||||
#include <vector>
|
||||
#include <numeric>
|
||||
|
||||
#include "opencv2/core.hpp"
|
||||
#include "opencv2/gpucodec.hpp"
|
||||
#include "opencv2/cudacodec.hpp"
|
||||
#include "opencv2/highgui.hpp"
|
||||
#include "opencv2/contrib.hpp"
|
||||
|
||||
|
Reference in New Issue
Block a user