1. 24 Sep, 2018 1 commit
  2. 23 Sep, 2018 1 commit
  3. 21 Sep, 2018 1 commit
    • Hamdi Sahloul's avatar
      Merge pull request #12310 from cv3d:chunks/enum_interface · ef5579dc
      Hamdi Sahloul authored
      * Cleanup macros and enable expansion of `__VA_ARGS__` for Visual Studio
      
      * Macros for enum-arguments backwards compatibility
      
      * Convert struct Param to enum struct
      
      * Enabled ParamType.type for enum types
      
      * Enabled `cv.read` and `cv.write` for enum types
      
      * Rename unnamed enum to AAKAZE.DescriptorType
      
      * Rename unnamed enum to AccessFlag
      
      * Rename unnamed enum to AgastFeatureDetector.DetectorType
      
      * Convert struct DrawMatchesFlags to enum struct
      
      * Rename unnamed enum to FastFeatureDetector.DetectorType
      
      * Rename unnamed enum to Formatter.FormatType
      
      * Rename unnamed enum to HOGDescriptor.HistogramNormType
      
      * Rename unnamed enum to DescriptorMatcher.MatcherType
      
      * Rename unnamed enum to KAZE.DiffusivityType
      
      * Rename unnamed enum to ORB.ScoreType
      
      * Rename unnamed enum to UMatData.MemoryFlag
      
      * Rename unnamed enum to _InputArray.KindFlag
      
      * Rename unnamed enum to _OutputArray.DepthMask
      
      * Convert normType enums to static const NormTypes
      
      * Avoid conflicts with ElemType
      
      * Rename unnamed enum to DescriptorStorageFormat
      ef5579dc
  4. 12 Sep, 2018 1 commit
  5. 07 Sep, 2018 1 commit
  6. 08 Jul, 2018 1 commit
  7. 25 Apr, 2018 1 commit
  8. 24 Apr, 2018 2 commits
  9. 23 Apr, 2018 1 commit
  10. 12 Feb, 2018 2 commits
  11. 25 Jul, 2017 1 commit
  12. 10 Jul, 2017 1 commit
  13. 11 Feb, 2016 1 commit
  14. 21 Jul, 2015 1 commit
    • Alexey Ershov's avatar
      added convertToGLBuffer() & convertFromGLBuffer() functions; added OpenGL interop sample comment · 89392b2a
      Alexey Ershov authored
      rewrite & change convertFromGLBuffer() & convertToGLBuffer() into acquireGLBuffer() & releaseGLBuffer(), respectively
      
      opengl sample: added buffer support
      
      tested and fixed buffer support on Windows
      
      change glFlush() call to glFinish()
      
      added UMat::release() call; fixed functions' names
      
      adopted & implemented API suggestion(s) from Alexander
      
      fixed unreachable code warning
      
      added more info to the mapGLBuffer/unmapGLBuffer description
      89392b2a
  15. 30 Jun, 2015 1 commit
  16. 26 Jun, 2015 1 commit
    • Alexey Ershov's avatar
      OpenGL OpenCL sample · 3f687870
      Alexey Ershov authored
      057cd52 first versions: cv::ogl::convertFromGLTexture2D & cv::ogl::convertToGLTexture2D
      5656e94 added autogenerated stuff for cl_gl.h
      765f1fd resolved CL functions in opengl.cpp
      9f9fee3 implemented function cv::ogl::ocl::initializeContextFromGLTexture2D()
      a792adb cv::ogl::ocl::initializeContextFromGLTexture2D() - added linux support (glx.h)
      51c2869 added missing error message in function cv::ogl::ocl::initializeContextFromGLTexture2D()
      513b887 fixed extension call in function cv::ogl::ocl::initializeContextFromGLTexture2D()
      475a3e9 added CL-GL interop Windows sample (gpu/opengl_interop.cpp)
      07af28f added building of CL-GL interop sample - Windows only
      befe3a2 fixed whitespace errors & doxygen warnings (precommit_docs)
      551251a changed function name to cv::ogl::ocl::initializeContextFromGL(), removed unused argument
      4d5f009 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR
      9fc3055 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH
      6d31cee Revert "changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH"
      cc6a025 added texture format check in cv::ogl::convertFromGLTexture2D()
      063a2c1 CL-GL sample: added Linux implementation (Xlib/GLX)
      c392ae9 fixed trailing whitespace
      85a80d0 fixed include files
      ae23628 excluded samples/opengl from build case 2
      9870ea5 added android EGL support
      530b64c added doxygen documentation comments to CL-GL interop functions
      3f687870
  17. 23 Dec, 2014 1 commit
  18. 01 Feb, 2014 1 commit
  19. 09 Sep, 2013 1 commit
  20. 06 Sep, 2013 2 commits
    • Vladislav Vinogradov's avatar
      b7eff941
    • 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
  21. 05 Sep, 2013 1 commit
    • Roman Donchenko's avatar
      Boring changes - core. · 8200a95c
      Roman Donchenko authored
      This and several following commits contain the "boring" changes required
      to support the new Ptr. These are changes like:
      
      * new T -> makePtr<T> or .reset(new T) or Ptr<T>(new T)
        (depending on the situation)
      * p.empty() -> !p
      * delete_obj -> DefaultDeleter::operator()
      
      and similar changes that are numerous, but primitive.
      8200a95c
  22. 02 Sep, 2013 1 commit
  23. 10 Jun, 2013 2 commits
  24. 08 Apr, 2013 2 commits
  25. 01 Apr, 2013 1 commit
  26. 14 Mar, 2013 1 commit
  27. 13 Mar, 2013 1 commit
  28. 12 Mar, 2013 1 commit
  29. 25 Feb, 2013 1 commit
  30. 21 Feb, 2013 1 commit
  31. 19 Feb, 2013 1 commit
    • Vladislav Vinogradov's avatar
      updated OpenGL functionality: · e06c3ec7
      Vladislav Vinogradov authored
      * removed OpenGLFuncTab, now extensions are loaded internally
      * 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
      * added Access parameter to GlBuffer::mapHost
      * added autoRelease parameter to all create methods
      e06c3ec7
  32. 13 Dec, 2012 1 commit
  33. 07 Dec, 2012 1 commit
  34. 05 Dec, 2012 1 commit
  35. 03 Dec, 2012 1 commit