opencv/modules at 4cf9990d4efc080dc898e1ecaa8861eb85c574fe - opencv - Atria-soft GIT

generic-library/opencv

History

Roman Donchenko 4cf9990d4e Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	doc/tutorials/definitions/noContent.rst
	doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
	doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
	doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/gpu/CMakeLists.txt
	modules/highgui/perf/perf_output.cpp
	modules/highgui/test/test_video_io.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/opencl/moments.cl
	modules/ocl/test/main.cpp
	modules/ocl/test/test_moments.cpp
	modules/python/test/test.py
	modules/ts/include/opencv2/ts/ts_perf.hpp
	modules/ts/src/precomp.hpp
	modules/ts/src/ts_perf.cpp

2013-07-03 19:53:21 +04:00

..

Merge remote-tracking branch 'origin/2.4'

2013-06-05 15:42:07 +04:00

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

2013-06-25 15:55:52 +04:00

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

2013-07-03 19:53:21 +04:00

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

2013-07-03 19:53:21 +04:00

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +04:00

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

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

2013-07-03 19:53:21 +04:00

Merge pull request #1024 from jet47:fix-gpuarithm-compilation

2013-06-25 14:38:18 +04:00

refactored Morphology Filters

2013-06-14 17:25:57 +04:00

refactored VideoReader (convert it to abstract interface)

2013-06-11 17:57:40 +04:00

refactored Separable Linear Filters

2013-06-14 17:25:56 +04:00

fix gpu::DeviceInfo compilation under linux

2013-06-24 10:11:44 +04:00

refactored Separable Linear Filters

2013-06-14 17:25:56 +04:00

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

2013-06-25 15:55:52 +04:00

fix gpu::DeviceInfo compilation under linux

2013-06-24 10:11:44 +04:00

updated documentation

2013-06-18 08:36:49 +04:00

renamed gpu_private.hpp to private.gpu.hpp

2013-06-10 12:40:32 +04:00

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

2013-07-03 19:53:21 +04:00

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

2013-07-03 19:53:21 +04:00

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

2013-07-03 19:53:21 +04:00

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +04:00

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

2013-07-03 19:53:21 +04:00

Add a new variant of detectMultiScale with output arguments 'objects' and 'numDetections'; factor most of detectMultiScale's code into 2 protected methods

2013-06-14 04:25:17 +04:00

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

2013-07-03 19:53:21 +04:00

renamed gpu_private.hpp to private.gpu.hpp

2013-06-10 12:40:32 +04:00

Removed references to opencv.itseez.com

2013-06-28 12:48:12 +04:00

added missing <iostream> header

2013-06-10 17:47:55 +04:00

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +04:00

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

2013-07-03 19:53:21 +04:00

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

2013-07-03 19:53:21 +04:00

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +04:00

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +04:00

Make core/internal.hpp a private header

2013-04-01 17:29:10 +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

Made reference manual table of contents autogenerated

2012-05-30 14:06:47 +00:00