1 superres: Fix return value VideoFrameSource_GPU
3 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
5 From 2e393ab83362743ba1825ad4b31d4a2925c606b4 Mon Sep 17 00:00:00 2001
6 From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
7 Date: Mon, 27 Oct 2014 13:39:35 +0000
8 Subject: [PATCH] superres: Fix return value VideoFrameSource_GPU
10 superres module fails to compile with the following error messages:
12 [100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o
13 /opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)':
14 /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource'
15 /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>'
16 /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource'
17 /opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope
18 /opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type]
19 cc1plus: some warnings being treated as errors
20 make[3]: *** [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1
21 make[3]: *** Waiting for unfinished jobs....
23 This is caused because the return value of the createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.
25 modules/superres/src/frame_source.cpp | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
28 diff --git a/modules/superres/src/frame_source.cpp b/modules/superres/src/frame_source.cpp
29 index 5f59a98..c5b2e76 100644
30 --- a/modules/superres/src/frame_source.cpp
31 +++ b/modules/superres/src/frame_source.cpp
32 @@ -260,7 +260,7 @@ namespace
34 Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const string& fileName)
36 - return new VideoFrameSource(fileName);
37 + return new VideoFrameSource_GPU(fileName);
40 #endif // HAVE_OPENCV_GPU