1. 19 6月, 2015 8 次提交
  2. 18 6月, 2015 1 次提交
  3. 17 6月, 2015 1 次提交
  4. 12 6月, 2015 1 次提交
  5. 11 6月, 2015 3 次提交
  6. 10 6月, 2015 2 次提交
  7. 09 6月, 2015 2 次提交
  8. 04 6月, 2015 1 次提交
  9. 03 6月, 2015 2 次提交
  10. 02 6月, 2015 3 次提交
  11. 01 6月, 2015 1 次提交
  12. 29 5月, 2015 3 次提交
  13. 28 5月, 2015 3 次提交
  14. 27 5月, 2015 7 次提交
  15. 26 5月, 2015 2 次提交
    • S
      fixing SVM negative value rounding · 6aedd4f7
      StevenPuttemans 提交于
      Conflicts:
      	modules/objdetect/src/hog.cpp
      
      fix android build
      6aedd4f7
    • V
      superres: Fix return value VideoFrameSource_GPU · e96b8ce7
      Vicente Olivert Riera 提交于
      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.
      Conflicts:
      	modules/superres/src/frame_source.cpp
      e96b8ce7