Alexander Alekhin 8c591ebd77 Merge pull request #6060 from alalek:fix_opencl_opengl_sharing_6052

2016-02-16 07:10:02 +00:00

..

doc

Added example to the documentation for the NormTypes enum (L1, L2, INF)

2015-10-15 19:16:07 +02:00

include/opencv2

ocl: fix OpenGL sharing detection (6052)

2016-02-11 12:46:22 +03:00

misc/java

Revert of "Merge pull request #4014 from sgjava:opencv-sgjava" (reverted from commit 52fa55a770)

2015-05-19 13:30:18 +03:00

perf

UMat: add perf test for custom ptr

2015-09-03 10:48:07 +03:00

src

ocl: fix OpenGL sharing detection (6052)

2016-02-11 12:46:22 +03:00

test

test: initialize test data in test_umat.cpp (6102)

2016-02-12 13:15:15 +03:00

CMakeLists.txt

cmake: refactor OpenCL detection, allow custom configurations

2016-01-15 13:05:16 +03:00