1. 28 Aug, 2014 1 commit
    • StevenPuttemans's avatar
      continue fixing nonfree elements · d27e440b
      StevenPuttemans authored
      fixed dependency of stitching module on xfeatures2d module as optional
      fixed the initModule_xfeatures2d function that was called in module stitching since it is in another namespace than the standard cv one.
      d27e440b
  2. 05 Aug, 2014 1 commit
  3. 07 Jul, 2014 1 commit
  4. 30 Apr, 2014 1 commit
  5. 11 Apr, 2014 2 commits
  6. 20 Feb, 2014 1 commit
  7. 25 Jan, 2014 1 commit
  8. 19 Jan, 2014 1 commit
  9. 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
  10. 05 Sep, 2013 1 commit
  11. 08 Aug, 2013 1 commit
  12. 01 Apr, 2013 1 commit
  13. 13 Mar, 2013 1 commit
  14. 25 Feb, 2013 1 commit
  15. 31 Jan, 2013 1 commit
  16. 12 Dec, 2012 1 commit
  17. 11 Dec, 2012 1 commit
  18. 09 Nov, 2012 1 commit
  19. 01 Nov, 2012 1 commit
  20. 24 Oct, 2012 1 commit
  21. 09 Oct, 2012 1 commit
  22. 02 Oct, 2012 1 commit
  23. 10 Aug, 2012 3 commits
  24. 05 Jul, 2012 1 commit
  25. 28 Jun, 2012 1 commit
  26. 20 Jun, 2012 2 commits
  27. 15 Jun, 2012 1 commit
  28. 08 Jun, 2012 3 commits
  29. 07 Jun, 2012 1 commit
  30. 30 Apr, 2012 1 commit
  31. 18 Apr, 2012 1 commit
  32. 14 Feb, 2012 1 commit
  33. 29 Dec, 2011 1 commit
  34. 16 Dec, 2011 1 commit