buildrootschalter/package/opencv
Vicente Olivert Riera 1034d9f0d8 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:
  2e393ab833

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>
2014-11-08 22:43:13 +01:00
..
0001-core-fix-x86-PIC-code-compilation.patch opencv: rename patches to follow the new name structure 2014-11-08 22:42:54 +01:00
0002-superres-Fix-return-type-value-VideoFrameSource_GPU.patch opencv: superres - Fix return value VideoFrameSource_GPU 2014-11-08 22:43:13 +01:00
Config.in opencv: highgui module is needed for ts module 2014-09-26 21:14:40 +02:00
opencv.hash opencv: Bump version to 2.4.10 2014-10-02 20:57:06 +02:00
opencv.mk package/opencv: cleanup configure options 2014-10-26 17:05:32 +01:00