• Vicente Olivert Riera's avatar
    superres: Fix return value VideoFrameSource_GPU · 23bf3e33
    Vicente Olivert Riera authored
    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.
    (cherry picked from commit 2e393ab8)
    23bf3e33
Name
Last commit
Last update
..
androidcamera Loading commit data...
calib3d Loading commit data...
contrib Loading commit data...
core Loading commit data...
dynamicuda Loading commit data...
features2d Loading commit data...
flann Loading commit data...
gpu Loading commit data...
highgui Loading commit data...
imgproc Loading commit data...
java Loading commit data...
legacy Loading commit data...
ml Loading commit data...
nonfree Loading commit data...
objdetect Loading commit data...
ocl Loading commit data...
photo Loading commit data...
python Loading commit data...
stitching Loading commit data...
superres Loading commit data...
ts Loading commit data...
video Loading commit data...
videostab Loading commit data...
viz Loading commit data...
world Loading commit data...
CMakeLists.txt Loading commit data...
refman.rst.in Loading commit data...