generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed gpucodec -> cudacodec

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-07-23 14:29:21 +04:00
parent cfe4a71dc6
commit dbeb3e2968
39 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/superres/CMakeLists.txt
View File

@@ -6,4 +6,4 @@ set(the_description "Super Resolution")
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 -Wundef)
ocv_define_module(superres opencv_imgproc opencv_video
OPTIONAL opencv_highgui opencv_ocl
opencv_gpuarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc opencv_gpuoptflow opencv_gpucodec)
opencv_gpuarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc opencv_gpuoptflow opencv_cudacodec)

6
modules/superres/src/frame_source.cpp
View File

@@ -199,7 +199,7 @@ Ptr<FrameSource> cv::superres::createFrameSource_Camera(int deviceId)
//////////////////////////////////////////////////////
// VideoFrameSource_GPU
#ifndef HAVE_OPENCV_GPUCODEC
#ifndef HAVE_OPENCV_CUDACODEC
Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const String& fileName)
{
@@ -208,7 +208,7 @@ Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const String& fileNam
return Ptr<FrameSource>();
}
#else // HAVE_OPENCV_GPUCODEC
#else // HAVE_OPENCV_CUDACODEC
namespace
{
@@ -260,4 +260,4 @@ Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const String& fileNam
return new VideoFrameSource(fileName);
}
#endif // HAVE_OPENCV_GPUCODEC
#endif // HAVE_OPENCV_CUDACODEC

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

@@ -77,8 +77,8 @@
# include "opencv2/gpuoptflow.hpp"
#endif
#ifdef HAVE_OPENCV_GPUCODEC
# include "opencv2/gpucodec.hpp"
#ifdef HAVE_OPENCV_CUDACODEC
# include "opencv2/cudacodec.hpp"
#endif
#ifdef HAVE_OPENCV_OCL