opencv/modules at 78be4f66f736d579407e5159e2225187db67797e - opencv - Atria-soft GIT

generic-library/opencv

History

Roman Donchenko 78be4f66f7 Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	CMakeLists.txt
	modules/calib3d/src/calibration.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
	samples/ocl/bgfg_segm.cpp
	samples/ocl/clahe.cpp
	samples/ocl/facedetect.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/squares.cpp
	samples/ocl/surf_matcher.cpp
	samples/ocl/tvl1_optical_flow.cpp

2013-10-28 13:38:25 +04:00

..

Native camera libraries updated.

2013-08-29 18:46:45 +04:00

Suppressed -Wundef in bioinspired, because of OpenCL headers.

2013-10-22 15:16:22 +04:00

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-28 13:38:25 +04:00

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-22 14:28:00 +04:00

Merge pull request #1575 from jet47:gpu-buffer-pool

2013-10-21 16:35:14 +04:00

moved BufferPool management functions to public

2013-10-08 17:21:22 +04:00

used new device layer for cv::cuda::norm

2013-10-01 15:28:51 +04:00

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

switched to new device layer in gpucodec module

2013-09-23 12:16:57 +04:00

removed precomp.cpp files

2013-09-02 14:00:44 +04:00

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

Merge branch 'master' into gpu-cuda-rename

2013-09-04 09:58:32 +04:00

Fix a typo in kernel size

2013-10-11 23:31:31 -04:00

Small OpenCV-CUDA bugs are fixed.

2013-10-22 12:08:43 +05:30

Merge pull request #1540 from jet47:gpuarithm-cudev

2013-10-21 16:34:45 +04:00

Minimized the number of arguments required to workaround the MSVC2013 compiler bug.

2013-10-21 21:43:26 +02:00

Cherry-picked mariusmuja/flann@8c8b0e0cb8 .

2013-10-02 16:09:45 +04:00

Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.

2013-10-24 14:09:08 +04:00

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-22 14:28:00 +04:00

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-28 13:38:25 +04:00

Merge pull request #1536 from asmorkalov:android_ndk_r9_master

2013-10-04 16:36:44 +04:00

Replace $(Configuration) with $<CONFIGURATION>

2013-10-24 18:20:16 +01:00

Merge remote-tracking branch 'upstream/2.4' into merge-2.4

2013-10-15 20:08:52 +04:00

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-28 13:38:25 +04:00

fixed warnings

2013-10-08 12:46:43 +04:00

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-28 13:38:25 +04:00

fixed warnings

2013-10-08 12:46:43 +04:00

fixed warnings

2013-10-08 12:46:43 +04:00

Merge remote-tracking branch 'upstream/2.4' into merge-2.4

2013-10-15 20:08:52 +04:00

Merge pull request #1567 from ilya-lavrenov:warn_fix

2013-10-08 13:50:49 +04:00

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

Named GraphCutSeamFinderBase to allow its usage in makePtr.

2013-10-08 18:13:56 +04:00

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-28 13:38:25 +04:00

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-22 14:28:00 +04:00

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297)

2013-10-03 02:10:27 +02:00

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

CMakeLists.txt

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-06-10 18:18:01 +04:00

refman.rst.in

…