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
..
include/opencv2	Replaced CV_PURE_PROPERTY macros with corresponding code	2015-03-18 17:23:42 +03:00
perf	Remove deprecated methods from cv::Algorithm	2015-02-16 15:28:54 +03:00
src	superres: Fix return value VideoFrameSource_GPU	2015-05-26 16:54:35 +02:00
test	Turn off superres accuracy tests if video i/o is not supported.	2015-05-24 13:31:09 +02:00
CMakeLists.txt	Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib	2015-03-03 12:52:03 +00:00