1. 23 Dec, 2014 1 commit
  2. 29 Aug, 2014 1 commit
    • Rok Mandeljc's avatar
      samples: gpu: removed inclusion of non-existent opencv2/contrib/contrib.hpp… · e0c87218
      Rok Mandeljc authored
      samples: gpu: removed inclusion of non-existent opencv2/contrib/contrib.hpp header, re-introduced TickMeter class in a separate header
      
      This patch removes inclusion of opencv2/contrib/contrib.hpp header,
      which does not exist anymore due to removal of opencv_contrib module.
      
      The samples including this header appear to be doing so in order to
      use TickMeter class; therefore, the latter is now provided by tick_meter.hpp
      header file, located in samples/gpu folder.
      e0c87218
  3. 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
  4. 05 Sep, 2013 1 commit
  5. 02 Sep, 2013 4 commits
  6. 28 Aug, 2013 1 commit
  7. 24 Jun, 2013 1 commit
  8. 14 Jun, 2013 1 commit
  9. 10 Jun, 2013 1 commit
  10. 09 Apr, 2013 1 commit
  11. 01 Apr, 2013 1 commit
  12. 18 Mar, 2013 1 commit
  13. 23 Jan, 2013 1 commit
    • Vladislav Vinogradov's avatar
      fixes for gpu module: · ae6266e1
      Vladislav Vinogradov authored
      - fixed printCudaDeviceInfo for new CC
      - fixed some compilation errors and warnings
      - removed unset command from CMake script
      - removed unused std imports
      ae6266e1
  14. 30 Nov, 2012 1 commit
    • Vladislav Vinogradov's avatar
      refactored opengl functionality · 08fbf667
      Vladislav Vinogradov authored
      * removed OpenGLFuncTab, now extensions are loaded internally
      * renamed GlTexture -> GlTexture2D
      * added support of GlBuffer and GlTexture2D to InputArray/OutputArray
      * added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
      * added copyFrom/copyTo method for GlBuffer and GlTexture2D
      * removed GlFont
      * removed pointCloudShow
      * removed OpenGLCleanCallback
      08fbf667
  15. 17 Oct, 2012 2 commits
  16. 30 Jan, 2012 1 commit
  17. 24 Oct, 2011 1 commit
  18. 01 Jun, 2011 1 commit
  19. 21 May, 2011 1 commit
  20. 16 Feb, 2011 1 commit
  21. 15 Feb, 2011 3 commits
  22. 14 Feb, 2011 3 commits
  23. 10 Feb, 2011 1 commit
  24. 04 Feb, 2011 1 commit
  25. 03 Feb, 2011 2 commits