third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,911 Commits 3 Branches 0 Tags 516 MiB
C++ 92.6%
C 6.8%
CMake 0.5%
Objective-C 0.1%
23bf3e337a
Go to file
Vicente Olivert Riera 23bf3e337a 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.
(cherry picked from commit 2e393ab833)
2015-04-19 13:25:16 +03:00
3rdparty Android native camera rebuilt after sources update. 2014-07-30 14:52:01 +04:00
apps Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples. 2014-09-18 16:54:22 +04:00
cmake fix installation layout for debian packages: 2015-04-19 13:23:47 +03:00
data fixed two models, adding xml identifier to correct position 2014-07-01 10:27:36 +02:00
doc OpenCV Manager version++. 2014-09-30 12:05:46 +04:00
include All installed files marked with component names for install customization. 2014-01-21 20:34:36 +04:00
modules superres: Fix return value VideoFrameSource_GPU 2015-04-19 13:25:16 +03:00
platforms Merge pull request #3285 from asmorkalov:android_servive_big.little_fix 2014-09-30 15:19:07 +00:00
samples Merge pull request #2965 from soulslicer:patch-2 2014-07-15 09:44:32 +00:00
.gitattributes Added more text/binary/whitespace attributes for files we have. 2013-08-21 18:59:24 +04:00
.gitignore updated .gitignore 2014-01-10 18:59:06 +04:00
.tgitconfig Add tgit.icon project config 2014-02-26 17:46:52 +08:00
CMakeLists.txt GStreamer 1.0 backport from master branch. 2014-09-30 12:30:09 +04:00
index.rst android -> plarforms/android 2013-05-27 11:10:38 +04:00
LICENSE Initial Linux packages build rools for CPack. 2014-01-21 20:34:36 +04:00
README.md Replaced Gittip button 2014-02-15 13:10:09 +04:00

README.md

OpenCV: Open Source Computer Vision Library

Gittip

Resources

Contributing

Please read before starting work on a pull request: http://code.opencv.org/projects/opencv/wiki/How_to_contribute

Summary of guidelines:

  • One pull request per issue;
  • Choose the right base branch;
  • Include tests and documentation;
  • Clean up "oops" commits before submitting;
  • Follow the coding style guide.