1. 11 Dec, 2014 1 commit
  2. 06 Dec, 2014 2 commits
  3. 05 Dec, 2014 1 commit
  4. 03 Dec, 2014 1 commit
  5. 01 Dec, 2014 2 commits
  6. 25 Nov, 2014 2 commits
  7. 24 Nov, 2014 1 commit
  8. 19 Nov, 2014 1 commit
  9. 16 Nov, 2014 3 commits
  10. 14 Nov, 2014 1 commit
  11. 13 Nov, 2014 6 commits
  12. 12 Nov, 2014 6 commits
  13. 11 Nov, 2014 1 commit
  14. 10 Nov, 2014 2 commits
  15. 06 Nov, 2014 1 commit
  16. 05 Nov, 2014 3 commits
  17. 31 Oct, 2014 1 commit
  18. 30 Oct, 2014 1 commit
  19. 29 Oct, 2014 1 commit
  20. 28 Oct, 2014 1 commit
  21. 27 Oct, 2014 2 commits
    • Vicente Olivert Riera's avatar
      superres: Fix return value VideoFrameSource_GPU · 2e393ab8
      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.
      2e393ab8
    • Maksim Shabunin's avatar
      0c3722be