Roman Donchenko [Mon, 24 Feb 2014 10:35:34 +0000 (14:35 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
Roman Donchenko [Mon, 24 Feb 2014 08:44:36 +0000 (12:44 +0400)]
Merge pull request #2389 from SpecLad:ios-big-endian
Roman Donchenko [Fri, 21 Feb 2014 12:08:49 +0000 (16:08 +0400)]
Hardcode iOS's endianness, since the TestBigEndian module doesn't work there
Roman Donchenko [Fri, 21 Feb 2014 15:11:57 +0000 (19:11 +0400)]
Merge pull request #2266 from vpisarev:ipp_norm_fix
Vadim Pisarevsky [Fri, 21 Feb 2014 14:07:01 +0000 (18:07 +0400)]
fixed hint type declaration
Roman Donchenko [Fri, 21 Feb 2014 13:57:36 +0000 (17:57 +0400)]
Merge pull request #2201 from mattip:2.4
Matti Picus [Fri, 21 Feb 2014 11:54:58 +0000 (13:54 +0200)]
fix merge
Andrey Pavlenko [Fri, 21 Feb 2014 11:14:11 +0000 (15:14 +0400)]
Merge pull request #2384 from ilya-lavrenov:perf_match
Matti Picus [Fri, 21 Feb 2014 09:59:49 +0000 (11:59 +0200)]
merge with origin
Matti Picus [Thu, 20 Feb 2014 20:12:22 +0000 (22:12 +0200)]
fix code, it turns out only TIFFReadRGBATile needs buffer pointer mangling
Matti Picus [Thu, 20 Feb 2014 20:10:22 +0000 (22:10 +0200)]
add test (needs updated opencv_extra repo)
Andrey Pavlenko [Thu, 20 Feb 2014 17:41:43 +0000 (21:41 +0400)]
Merge pull request #2375 from akarsakov:fix_getGradient
Andrey Pavlenko [Thu, 20 Feb 2014 17:40:27 +0000 (21:40 +0400)]
Merge pull request #2377 from alalek:tapi_warpers_perf_test
Andrey Pavlenko [Thu, 20 Feb 2014 17:36:30 +0000 (21:36 +0400)]
Merge pull request #2383 from ilya-lavrenov:perf_match_template
Ilya Lavrenov [Thu, 20 Feb 2014 14:55:08 +0000 (18:55 +0400)]
backport of master-based perf tests for matchTemplate to 2.4
Ilya Lavrenov [Thu, 20 Feb 2014 14:11:56 +0000 (18:11 +0400)]
ported 2.4 perf tests for matchTemplate
Alexander Karsakov [Wed, 19 Feb 2014 12:32:17 +0000 (16:32 +0400)]
Fixed typo with indexes in getGradient(x/y) functions.
Roman Donchenko [Thu, 20 Feb 2014 09:43:22 +0000 (13:43 +0400)]
Merge pull request #2376 from GrinIara:master
Roman Donchenko [Thu, 20 Feb 2014 09:41:45 +0000 (13:41 +0400)]
Merge pull request #2380 from jet47:fix-3562
Roman Donchenko [Thu, 20 Feb 2014 09:39:54 +0000 (13:39 +0400)]
Merge pull request #2325 from alalek:perf_fix
Alexander Alekhin [Wed, 12 Feb 2014 14:12:22 +0000 (18:12 +0400)]
some fixes in perf tests
Alexander Alekhin [Wed, 19 Feb 2014 16:30:27 +0000 (20:30 +0400)]
TAPI: fix perf test for warpers
Vladislav Vinogradov [Thu, 20 Feb 2014 06:24:52 +0000 (10:24 +0400)]
fix bug #3562:
add missing __syncthreads to edgesHysteresisLocalKernel
GrinIara [Wed, 19 Feb 2014 16:06:33 +0000 (17:06 +0100)]
Fixed compilation error due to missing std::.
Alexander Alekhin [Wed, 19 Feb 2014 10:00:39 +0000 (14:00 +0400)]
TAPI: fix OpenCL warpers and test
Roman Donchenko [Wed, 19 Feb 2014 10:48:56 +0000 (14:48 +0400)]
Merge pull request #2144 from nickdademo:pvapi_framestarttriggermode
Roman Donchenko [Wed, 19 Feb 2014 10:33:57 +0000 (14:33 +0400)]
Merge pull request #2291 from xgvargas:extra-note-for-waitKey
Roman Donchenko [Wed, 19 Feb 2014 08:03:06 +0000 (12:03 +0400)]
Merge pull request #2368 from asmorkalov:ocv_gcc48_warning_fix
Roman Donchenko [Wed, 19 Feb 2014 08:02:40 +0000 (12:02 +0400)]
Merge pull request #2357 from akarsakov:fix_ipp_compilation_linux
Alexander Smorkalov [Tue, 18 Feb 2014 08:01:01 +0000 (12:01 +0400)]
Warning fixes for GCC 4.8.
Roman Donchenko [Tue, 18 Feb 2014 14:00:13 +0000 (18:00 +0400)]
Merge pull request #2371 from ilya-lavrenov:typo
Roman Donchenko [Tue, 18 Feb 2014 13:00:53 +0000 (17:00 +0400)]
Merge pull request #2370 from ilya-lavrenov:cuda_nlm_typo
Roman Donchenko [Tue, 18 Feb 2014 13:00:32 +0000 (17:00 +0400)]
Merge pull request #2359 from SpecLad:moments-no-vectorize
Roman Donchenko [Tue, 18 Feb 2014 11:49:18 +0000 (15:49 +0400)]
Merge pull request #2098 from pxli168:patch-1
Roman Donchenko [Tue, 18 Feb 2014 11:44:56 +0000 (15:44 +0400)]
Merge pull request #2361 from alekcac:ios_camera_changes
Roman Donchenko [Tue, 18 Feb 2014 10:25:16 +0000 (14:25 +0400)]
Merge pull request #2338 from asmorkalov:ocv_gcov
Ilya Lavrenov [Tue, 18 Feb 2014 10:24:17 +0000 (14:24 +0400)]
typo
Ilya Lavrenov [Tue, 18 Feb 2014 10:16:54 +0000 (14:16 +0400)]
fixes typo and unused variables
Alexander Shishkov [Tue, 18 Feb 2014 09:56:26 +0000 (13:56 +0400)]
removed trailing spaces
Roman Donchenko [Mon, 17 Feb 2014 12:08:28 +0000 (16:08 +0400)]
Worked around an apparent GCC bug in moments.
Roman Donchenko [Tue, 18 Feb 2014 09:47:45 +0000 (13:47 +0400)]
Merge pull request #2366 from yashdv:mat_copyto_doc_bug
Roman Donchenko [Tue, 18 Feb 2014 09:36:33 +0000 (13:36 +0400)]
Merge pull request #2355 from alekcac:hough_circles_fix
yash [Tue, 18 Feb 2014 09:34:27 +0000 (15:04 +0530)]
edited the doc for mat::copyto and clarified the part regarding reallocation by .create
Andrey Pavlenko [Tue, 18 Feb 2014 09:33:15 +0000 (13:33 +0400)]
Merge pull request #2235 from alalek:ocl_svm_perf_test
Andrey Pavlenko [Tue, 18 Feb 2014 09:27:38 +0000 (13:27 +0400)]
Merge pull request #2341 from alalek:ocl_fix_error_processing
Andrey Pavlenko [Tue, 18 Feb 2014 09:24:40 +0000 (13:24 +0400)]
Merge pull request #2352 from ilya-lavrenov:flann
Alexander Smorkalov [Fri, 14 Feb 2014 13:43:33 +0000 (17:43 +0400)]
gcov tool support added.
Roman Donchenko [Tue, 18 Feb 2014 08:57:25 +0000 (12:57 +0400)]
Merge pull request #2347 from Chechli:master
Roman Donchenko [Tue, 18 Feb 2014 08:15:48 +0000 (12:15 +0400)]
Merge pull request #2367 from jet47:fix-3544
Roman Donchenko [Tue, 18 Feb 2014 08:14:57 +0000 (12:14 +0400)]
Merge pull request #2356 from SpecLad:merge-2.4
Roman Donchenko [Tue, 18 Feb 2014 07:58:10 +0000 (11:58 +0400)]
Merge pull request #2365 from yashdv:image_tutorial_doc_bug
Roman Donchenko [Tue, 18 Feb 2014 07:57:35 +0000 (11:57 +0400)]
Merge pull request #2364 from ilya-lavrenov:unused_field
Roman Donchenko [Tue, 18 Feb 2014 07:56:57 +0000 (11:56 +0400)]
Merge pull request #2363 from alekcac:introduction_tut_fix
Roman Donchenko [Tue, 18 Feb 2014 07:56:36 +0000 (11:56 +0400)]
Merge pull request #2362 from alekcac:docs_style_change
Roman Donchenko [Tue, 18 Feb 2014 07:56:20 +0000 (11:56 +0400)]
Merge pull request #2360 from Evgenij-Gr:XLSreport
Chechli [Tue, 18 Feb 2014 07:50:33 +0000 (08:50 +0100)]
Update hough_circles.cpp
Vladislav Vinogradov [Tue, 18 Feb 2014 06:45:47 +0000 (10:45 +0400)]
fix bug #3544:
add "opencv2/core/utility.hpp" header to precomp.hpp
yash [Tue, 18 Feb 2014 05:21:05 +0000 (10:51 +0530)]
Made a sentence in the doc for Mat::copyTo more clearer
yash [Tue, 18 Feb 2014 05:04:58 +0000 (10:34 +0530)]
Minor error in the documentation Load and Save Image
Gustavo Vargas [Tue, 18 Feb 2014 02:22:18 +0000 (23:22 -0300)]
Update py_image_display.rst
pxli168 [Tue, 18 Feb 2014 02:13:30 +0000 (10:13 +0800)]
Change again.
Opps.
Ilya Lavrenov [Sun, 16 Feb 2014 23:00:20 +0000 (03:00 +0400)]
some more changes
Ilya Lavrenov [Mon, 17 Feb 2014 17:50:00 +0000 (21:50 +0400)]
removed unused field
Alexander Shishkov [Mon, 17 Feb 2014 14:10:08 +0000 (18:10 +0400)]
fixed incorrect code in introduction tutorial
Alexander Shishkov [Mon, 17 Feb 2014 13:56:12 +0000 (17:56 +0400)]
fixed year in copyright
Andrey Pavlenko [Mon, 17 Feb 2014 13:53:05 +0000 (17:53 +0400)]
Merge pull request #2346 from ilya-lavrenov:umat_tests_cleanup
Andrey Pavlenko [Mon, 17 Feb 2014 13:38:26 +0000 (17:38 +0400)]
Merge pull request #2345 from ilya-lavrenov:tapi_3cn_perf
Alexander Shishkov [Mon, 17 Feb 2014 13:37:02 +0000 (17:37 +0400)]
removed tabs
Andrey Pavlenko [Mon, 17 Feb 2014 13:34:19 +0000 (17:34 +0400)]
Merge pull request #2334 from alalek:umat_usage_flags_2
Evgeniy [Mon, 17 Feb 2014 13:01:23 +0000 (17:01 +0400)]
Added more colorizing options to XLS generating script
Alexander Karsakov [Mon, 17 Feb 2014 11:28:21 +0000 (15:28 +0400)]
Fixed compilation with IPP on Linux. Added linking with Intel compiler runtime libraries.
Andrey Pavlenko [Mon, 17 Feb 2014 12:45:40 +0000 (16:45 +0400)]
Merge pull request #2340 from ilya-lavrenov:tapi_lab
Roman Donchenko [Mon, 17 Feb 2014 11:24:05 +0000 (15:24 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
Roman Donchenko [Mon, 17 Feb 2014 11:00:42 +0000 (15:00 +0400)]
Merge pull request #2354 from gleb-sternharz:Branch_2.4.8
Roman Donchenko [Mon, 17 Feb 2014 09:35:15 +0000 (13:35 +0400)]
Merge pull request #2339 from jet47:gpu-warnings
Roman Donchenko [Mon, 17 Feb 2014 09:33:28 +0000 (13:33 +0400)]
Merge pull request #2343 from yashdv:template_matching_doc_fix
Marijan Vukcevich [Tue, 4 Feb 2014 18:10:50 +0000 (10:10 -0800)]
Update cap_ios_abstract_camera.mm
AVCaptureVideoPreviewLayer setOrientation is depricated. This fixes the warning and provides backward compatibility.
Alexander Shishkov [Mon, 17 Feb 2014 08:55:19 +0000 (12:55 +0400)]
small changes in hough circles tutorial
Chechli [Mon, 17 Feb 2014 08:50:32 +0000 (09:50 +0100)]
Update hough_circles.cpp
Chechli [Mon, 17 Feb 2014 08:48:51 +0000 (09:48 +0100)]
Update precomp.hpp
Roman Donchenko [Mon, 17 Feb 2014 08:24:48 +0000 (12:24 +0400)]
Merge pull request #2337 from pmoulon:master
Roman Donchenko [Mon, 17 Feb 2014 08:23:59 +0000 (12:23 +0400)]
Merge pull request #2328 from rohitgirdhar:bugfix_blobdetector_kpt_radius
Roman Donchenko [Mon, 17 Feb 2014 08:22:11 +0000 (12:22 +0400)]
Merge pull request #2330 from rohitgirdhar:linux_tutorial_make_j8
Roman Donchenko [Mon, 17 Feb 2014 08:21:19 +0000 (12:21 +0400)]
Merge pull request #2342 from yashdv:android_doc_fix
Roman Donchenko [Mon, 17 Feb 2014 08:02:58 +0000 (12:02 +0400)]
Merge pull request #2348 from ilya-lavrenov:typo
Roman Donchenko [Mon, 17 Feb 2014 07:58:02 +0000 (11:58 +0400)]
Merge pull request #2351 from yashdv:BOW_assert_error
Roman Donchenko [Mon, 17 Feb 2014 07:52:00 +0000 (11:52 +0400)]
Merge pull request #2349 from jet47:fix-bug-3552
Roman Donchenko [Mon, 17 Feb 2014 07:48:03 +0000 (11:48 +0400)]
Merge pull request #2344 from kirill-kornyakov:replace-gittip-button
gleb.sternharz [Mon, 17 Feb 2014 03:08:30 +0000 (04:08 +0100)]
fix dev by 0 in KL-Divergence
pxli168 [Mon, 17 Feb 2014 02:21:18 +0000 (10:21 +0800)]
Simplify the code
Simplify the code as @SpecLad suggested.
Ilya Lavrenov [Sun, 16 Feb 2014 21:37:32 +0000 (01:37 +0400)]
changed the signature of add method according to the base class
yash [Sun, 16 Feb 2014 17:03:30 +0000 (22:33 +0530)]
Fixed CV_ASSERT condition in the code for bag of words
Chechli [Sun, 16 Feb 2014 12:26:00 +0000 (13:26 +0100)]
Update hough_circles.cpp
Ilya Lavrenov [Fri, 14 Feb 2014 14:55:11 +0000 (18:55 +0400)]
extended performance test
Vladislav Vinogradov [Sun, 16 Feb 2014 08:17:17 +0000 (12:17 +0400)]
fix bug #3552:
replace std::swap with own code
Ilya Lavrenov [Sat, 15 Feb 2014 21:42:02 +0000 (01:42 +0400)]
typo
Ilya Lavrenov [Sat, 15 Feb 2014 11:27:27 +0000 (15:27 +0400)]
extended performance tests to test 3 channels
Chechli [Sat, 15 Feb 2014 16:31:14 +0000 (17:31 +0100)]
Update hough_circles.cpp
Ilya Lavrenov [Sat, 15 Feb 2014 12:29:40 +0000 (16:29 +0400)]
disabled 'reshape', 'copyTo' test
Ilya Lavrenov [Sat, 15 Feb 2014 12:04:57 +0000 (16:04 +0400)]
restored lost in PR #1735 umat tests
projects / platform / upstream / opencv.git / log