opencv/modules at 95a55453dffa5a92f65eb26b82723bf6521c4b39 - opencv - Atria-soft GIT

generic-library/opencv

History

Roman Donchenko 95a55453df Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/calib3d/perf/perf_pnp.cpp
	modules/contrib/src/imagelogpolprojection.cpp
	modules/contrib/src/templatebuffer.hpp
	modules/core/perf/opencl/perf_gemm.cpp
	modules/cudafeatures2d/doc/feature_detection_and_description.rst
	modules/cudafeatures2d/perf/perf_features2d.cpp
	modules/cudafeatures2d/src/fast.cpp
	modules/cudafeatures2d/test/test_features2d.cpp
	modules/features2d/doc/feature_detection_and_description.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/imgproc/perf/opencl/perf_blend.cpp
	modules/imgproc/perf/opencl/perf_color.cpp
	modules/imgproc/perf/opencl/perf_moments.cpp
	modules/imgproc/perf/opencl/perf_pyramid.cpp
	modules/objdetect/perf/opencl/perf_hogdetect.cpp
	modules/ocl/perf/perf_arithm.cpp
	modules/ocl/perf/perf_bgfg.cpp
	modules/ocl/perf/perf_blend.cpp
	modules/ocl/perf/perf_brute_force_matcher.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/perf/perf_gftt.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_imgwarp.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_matrix_operation.cpp
	modules/ocl/perf/perf_ml.cpp
	modules/ocl/perf/perf_moments.cpp
	modules/ocl/perf/perf_opticalflow.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/video/src/lkpyramid.cpp
	modules/video/src/precomp.hpp
	samples/gpu/morphology.cpp

2014-03-11 17:20:01 +04:00

..

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

2014-01-27 15:28:14 +04:00

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

2014-03-11 17:20:01 +04:00

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

2014-03-11 17:20:01 +04:00

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

2014-03-11 17:20:01 +04:00

fix bug #3544 :

2014-02-18 10:45:47 +04:00

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

2014-03-03 13:45:22 +04:00

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

2013-12-03 17:35:21 +04:00

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

2013-12-03 17:35:21 +04:00

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

2014-03-11 17:20:01 +04:00

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

2013-12-03 17:35:21 +04:00

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

2014-03-11 17:20:01 +04:00

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

2014-02-03 13:23:59 +04:00

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

2014-02-17 15:24:05 +04:00

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

2013-12-03 17:35:21 +04:00

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

2013-12-03 17:35:21 +04:00

Removed another usage of __func__, following #1763 .

2013-11-11 17:02:50 +04:00

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

2014-03-11 17:20:01 +04:00

Merge pull request #2354 from gleb-sternharz:Branch_2.4.8

2014-02-17 15:00:47 +04:00

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

2014-03-11 17:20:01 +04:00

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

2014-03-11 17:20:01 +04:00

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

2014-03-03 13:45:22 +04:00

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

2014-03-03 13:45:22 +04:00

Use CMAKE_CFG_INTDIR meta-variable to get the library output directory of the opencv_matlab.

2014-02-13 23:53:58 +08:00

fixed defects from coverity.com

2014-02-23 20:21:08 +04:00

disable SURF

2014-03-06 16:49:22 +04:00

Added Device:: isAMD,isIntel,isNvidia methods.

2014-03-05 14:43:11 +04:00

Merge pull request #1521 from nailbiter:optimCG

2013-10-29 16:14:32 +04:00

Merge pull request #2409 from juanmanpr:master

2014-03-04 15:32:13 +04:00

core/umat: usage flags (with proposals from PR #2195 )

2014-02-14 15:40:16 +04:00

fixed defects from Xcode

2014-02-25 17:33:12 +04:00

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

TAPI: fix perf test for warpers

2014-02-20 13:09:06 +04:00

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

2014-02-25 15:02:24 +04:00

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

2014-03-11 17:20:01 +04:00

Merge pull request #2373 from mlyashko:optflow_dualtvl1

2014-03-11 16:00:22 +04:00

Code review fixes.

2013-12-23 11:34:46 +04:00

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

2014-03-11 17:20:01 +04:00

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

2013-11-11 16:55:36 +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

…