Hilton Bristow [Tue, 4 Mar 2014 01:14:03 +0000 (11:14 +1000)]
Merged upstream master
Roman Donchenko [Mon, 3 Mar 2014 11:41:06 +0000 (15:41 +0400)]
Merge pull request #2435 from SpecLad:merge-2.4
Roman Donchenko [Mon, 3 Mar 2014 09:45:22 +0000 (13:45 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
Roman Donchenko [Mon, 3 Mar 2014 08:20:34 +0000 (12:20 +0400)]
Merge pull request #2433 from ilya-lavrenov:typos
Ilya Lavrenov [Sun, 2 Mar 2014 17:04:17 +0000 (21:04 +0400)]
typos
Andrey Pavlenko [Fri, 28 Feb 2014 14:22:03 +0000 (18:22 +0400)]
Merge pull request #2421 from akarsakov:fix_ocl_haar_intel
Andrey Pavlenko [Fri, 28 Feb 2014 14:21:37 +0000 (18:21 +0400)]
Merge pull request #2427 from alalek:ocl_build_log
Alexander Alekhin [Thu, 27 Feb 2014 08:51:40 +0000 (12:51 +0400)]
core/ocl: OpenCL build log improvements
Andrey Pavlenko [Thu, 27 Feb 2014 05:37:04 +0000 (09:37 +0400)]
Merge pull request #2415 from vpisarev:fix_stereobm_sse
Alexander Karsakov [Wed, 26 Feb 2014 14:11:11 +0000 (18:11 +0400)]
OCL: Fix for Haar classifier (thanks to Konstantin Rodyushkin).
Roman Donchenko [Wed, 26 Feb 2014 13:34:49 +0000 (17:34 +0400)]
Merge pull request #2419 from linquize:tgit.icon
Linquize [Tue, 25 Feb 2014 15:34:41 +0000 (23:34 +0800)]
Add tgit.icon project config
Roman Donchenko [Wed, 26 Feb 2014 08:16:35 +0000 (12:16 +0400)]
Merge pull request #2393 from ilya-lavrenov:coverity
Roman Donchenko [Tue, 25 Feb 2014 15:42:53 +0000 (19:42 +0400)]
Merge pull request #2399 from SpecLad:merge-2.4
Vadim Pisarevsky [Tue, 25 Feb 2014 14:13:51 +0000 (18:13 +0400)]
fixed difference between SSE2 and C branches of StereoBM; they should now produce absolutely the same results
Roman Donchenko [Tue, 25 Feb 2014 13:43:48 +0000 (17:43 +0400)]
Merge pull request #2358 from rohitgirdhar:rotatedRect
Ilya Lavrenov [Sun, 23 Feb 2014 17:07:20 +0000 (21:07 +0400)]
fixed defects from Xcode
Roman Donchenko [Tue, 25 Feb 2014 11:04:23 +0000 (15:04 +0400)]
Merge pull request #2410 from asmorkalov:android_tiff_lowmem_fix
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 [Tue, 25 Feb 2014 10:21:12 +0000 (14:21 +0400)]
Merge pull request #2412 from arunjvs:master
Arun JVS [Tue, 25 Feb 2014 09:04:32 +0000 (14:34 +0530)]
Fixed Bug #3568: Build fails with WITH_OPENGL=ON
Roman Donchenko [Tue, 25 Feb 2014 08:37:01 +0000 (12:37 +0400)]
Merge pull request #2411 from asmorkalov:android_mat_leak_fix
Alexander Smorkalov [Tue, 25 Feb 2014 07:50:55 +0000 (11:50 +0400)]
Bug #3391 org.opencv.android.NativeCameraView crashes after latest OpenCV Manager update fixed.
The crash was cased by massive Mat objects leak in NativeCameraView class.
Alexander Smorkalov [Tue, 25 Feb 2014 06:36:20 +0000 (10:36 +0400)]
Highgui_Tiff.decode_tile16384x16384 disabled for Android.
Last changes in test leads to SIGKILL on Android.
SIGKILL is called by out of memory killer.
Andrey Pavlenko [Tue, 25 Feb 2014 05:12:32 +0000 (09:12 +0400)]
Merge pull request #2406 from ilya-lavrenov:abf
Ilya Lavrenov [Mon, 24 Feb 2014 19:26:01 +0000 (23:26 +0400)]
disabled ABF tests
Andrey Pavlenko [Mon, 24 Feb 2014 12:56:40 +0000 (16:56 +0400)]
Merge pull request #2402 from ilya-lavrenov:amd_libs
Andrey Pavlenko [Mon, 24 Feb 2014 12:54:44 +0000 (16:54 +0400)]
Merge pull request #2388 from alalek:coverity_bug_fix
Andrey Pavlenko [Mon, 24 Feb 2014 12:22:28 +0000 (16:22 +0400)]
Merge pull request #2401 from akarsakov:fix_elem_size
Andrey Pavlenko [Mon, 24 Feb 2014 12:21:41 +0000 (16:21 +0400)]
Merge pull request #2394 from ilya-lavrenov:tapi_memop_fix
Ilya Lavrenov [Mon, 24 Feb 2014 11:12:42 +0000 (15:12 +0400)]
dump AMD Blas/Fft
Alexander Karsakov [Mon, 24 Feb 2014 11:10:00 +0000 (15:10 +0400)]
Fixed incorrect calculation of element size in OCL.(Mul/Div).Mat_Scalar_Scale.
Roman Donchenko [Mon, 24 Feb 2014 10:26:41 +0000 (14:26 +0400)]
Merge pull request #2398 from nghiaho12:integral_doc
Nghia Ho [Mon, 24 Feb 2014 09:06:20 +0000 (20:06 +1100)]
Typo
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
Ilya Lavrenov [Sun, 23 Feb 2014 10:59:06 +0000 (14:59 +0400)]
fixed defects from coverity.com
Ilya Lavrenov [Sun, 23 Feb 2014 11:12:38 +0000 (15:12 +0400)]
int2 -> ulong; to work properly with 3 channels
Rohit Girdhar [Fri, 21 Feb 2014 18:56:10 +0000 (00:26 +0530)]
addressed issues
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
Alexander Alekhin [Fri, 21 Feb 2014 10:04:01 +0000 (14:04 +0400)]
TAPI: coverity bug fix
Matti Picus [Fri, 21 Feb 2014 09:59:49 +0000 (11:59 +0200)]
merge with origin
Rohit Girdhar [Thu, 20 Feb 2014 21:30:03 +0000 (03:00 +0530)]
added randomized test
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
Rohit Girdhar [Thu, 20 Feb 2014 12:21:48 +0000 (17:51 +0530)]
added test, doc
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::.
Rohit Girdhar [Wed, 19 Feb 2014 15:28:40 +0000 (20:58 +0530)]
removed inline, changed interface
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
projects / platform / upstream / opencv.git / log