third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21c0acff24
opencv/modules/superres/src
History
Vicente Olivert Riera e96b8ce781 superres: Fix return value VideoFrameSource_GPU 
superres module fails to compile with the following error messages:

[100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o
/opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)':
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: could not convert '(int*)operator new(4ul)' from 'int*' to 'cv::Ptr<cv::superres::FrameSource>'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope
/opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type]
cc1plus: some warnings being treated as errors
make[3]: *** [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1
make[3]: *** Waiting for unfinished jobs....

This is caused because the return value of the createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.
Conflicts:
	modules/superres/src/frame_source.cpp
2015-05-26 16:54:35 +02:00
..
cuda renamed gpufilters -> cudafilters 2013-09-02 14:00:43 +04:00
opencl ported superres to T-API 2014-02-01 17:20:18 +04:00
btv_l1_cuda.cpp Remove deprecated methods from cv::Algorithm 2015-02-16 15:28:54 +03:00
btv_l1.cpp Remove deprecated methods from cv::Algorithm 2015-02-16 15:28:54 +03:00
frame_source.cpp superres: Fix return value VideoFrameSource_GPU 2015-05-26 16:54:35 +02:00
input_array_utility.cpp rename CudaMem -> HostMem to better reflect its purpose 2014-12-23 17:42:49 +03:00
input_array_utility.hpp ported superres to T-API 2014-02-01 17:20:18 +04:00
optical_flow.cpp 1. Input/OutputArray optimizations; 2015-04-07 16:44:26 +03:00
precomp.hpp Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
ring_buffer.hpp updated license header in whole gpu module 2013-03-22 14:03:15 +04:00
super_resolution.cpp Remove deprecated methods from cv::Algorithm 2015-02-16 15:28:54 +03:00