1. 11 Aug, 2014 4 commits
    • mshabunin's avatar
      Merge remote-tracking branch 'master' into stitch-fix · c54b8f9b
      mshabunin authored
      * 'master' of github.com:itseez/opencv: (82 commits)
        moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
        added some basic functionality needed by the new face module (moved from the old "contrib")
        moved to the new opencv_contrib/face module
        fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
        Fixed review comment from Vadim Pisarevsky
        modified farneback sample to use T-API
        ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
        small fix for GaussianBlur ocl test
        fix binary package build
        small fix for ocl_resize
        fix IOS framework
        fixed test ocl_MatchTemplate for sparse matrix
        Fixed typos
        fixing error, wrong template method param.
        fixing Mac build
        some formal changes (generally adding constness)
        Fixed choice of kercn and rowsPerWI for non-Intel device.
        fixed nDiffs for CalcBackProject
        fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
        Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
        ...
      
      Conflicts:
      	modules/core/include/opencv2/core/mat.inl.hpp
      c54b8f9b
    • Vadim Pisarevsky's avatar
      07744af7
    • Vadim Pisarevsky's avatar
      0f66e275
    • Vadim Pisarevsky's avatar
  2. 10 Aug, 2014 4 commits
  3. 09 Aug, 2014 5 commits
  4. 08 Aug, 2014 20 commits
  5. 07 Aug, 2014 7 commits