opencv: superres - Fix return value VideoFrameSource_GPU
authorVicente Olivert Riera <Vincent.Riera@imgtec.com>
Wed, 5 Nov 2014 12:59:19 +0000 (12:59 +0000)
committerPeter Korsgaard <peter@korsgaard.com>
Sat, 8 Nov 2014 21:43:13 +0000 (22:43 +0100)
commit1034d9f0d8e10b150a0c2ea311a95ae95fb12f77
treefa94bc8519c905d1e5bf0aa47c2c9f09023c1ae4
parent204f343a6a71e0376648ddd3a02a9d6badecd4af
opencv: 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.

Backporting an upstream patch to fix this problem in Buildroot:
  https://github.com/Itseez/opencv/commit/2e393ab83362743ba1825ad4b31d4a2925c606b4

Fixes:
  http://autobuild.buildroot.net/results/b09/b0996267197a9016d29d6070804ebc0cb7853548/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/opencv/0002-superres-Fix-return-type-value-VideoFrameSource_GPU.patch [new file with mode: 0644]