1. 19 Apr, 2015 2 commits
    • 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
    • Vladislav Vinogradov's avatar
      fix installation layout for debian packages: · 3cf26599
      Vladislav Vinogradov authored
      Install symlinks to shared libraries as a part of development package,
      not runtime package.
      
      It is default behavior for debian packages.
      (cherry picked from commit f55c1cc0)
      3cf26599
  2. 05 Nov, 2014 1 commit
  3. 04 Nov, 2014 3 commits
  4. 01 Oct, 2014 5 commits
  5. 30 Sep, 2014 10 commits
  6. 29 Sep, 2014 5 commits
  7. 27 Sep, 2014 2 commits
  8. 26 Sep, 2014 1 commit
  9. 25 Sep, 2014 1 commit
  10. 24 Sep, 2014 4 commits
  11. 23 Sep, 2014 6 commits