1. 13 Oct, 2016 1 commit
  2. 07 Oct, 2016 1 commit
  3. 07 Mar, 2016 1 commit
    • Jason von Nieda's avatar
      Adds supports for the majority of features2d to the Java wrappers: · f4b502dd
      Jason von Nieda authored
      * Adds the main features2d header to the parse list for the generator.
      * Removes the manual definition of drawKeypoints and drawMatches since these are now included in the main header.
      * Updates the generator to ignore SimpleBlobDetector, FlannBasedMatcher and DescriptorMatcher as these cause conflicts with the generator. This is okay since these were not previously included in the distribution anyway, so no harm is done.
      f4b502dd
  4. 02 Mar, 2015 1 commit
  5. 18 Oct, 2014 1 commit
  6. 17 Oct, 2014 3 commits
  7. 16 Oct, 2014 1 commit
  8. 11 Aug, 2014 1 commit
  9. 03 Jun, 2014 1 commit
  10. 06 Sep, 2013 1 commit
    • Vladislav Vinogradov's avatar
      Merge branch 'master' into gpu-cuda-rename · 0c7663eb
      Vladislav Vinogradov authored
      Conflicts:
      	modules/core/include/opencv2/core/cuda.hpp
      	modules/cudacodec/src/thread.cpp
      	modules/cudacodec/src/thread.hpp
      	modules/superres/perf/perf_superres.cpp
      	modules/superres/src/btv_l1_cuda.cpp
      	modules/superres/src/optical_flow.cpp
      	modules/videostab/src/global_motion.cpp
      	modules/videostab/src/inpainting.cpp
      	samples/cpp/stitching_detailed.cpp
      	samples/cpp/videostab.cpp
      	samples/gpu/stereo_multi.cpp
      0c7663eb
  11. 05 Sep, 2013 1 commit
  12. 01 Apr, 2013 1 commit
  13. 26 Mar, 2013 1 commit
  14. 22 Mar, 2013 2 commits
  15. 13 Mar, 2013 1 commit
  16. 25 Feb, 2013 1 commit
  17. 17 Oct, 2012 2 commits
  18. 16 Oct, 2012 1 commit
  19. 12 Oct, 2012 2 commits
  20. 17 Sep, 2012 1 commit
  21. 09 Jul, 2012 1 commit
  22. 28 Jun, 2012 1 commit
  23. 21 Jun, 2012 1 commit
  24. 20 Feb, 2012 1 commit
  25. 10 Aug, 2011 1 commit
  26. 09 Aug, 2011 1 commit
  27. 04 Aug, 2011 1 commit
  28. 03 Aug, 2011 3 commits
  29. 02 Aug, 2011 3 commits
  30. 01 Aug, 2011 2 commits