Alexander Alekhin [Wed, 4 Jun 2014 12:36:37 +0000 (16:36 +0400)]
Merge pull request #2794 from mletavin:pullreq/140516-median
Alexander Alekhin [Wed, 4 Jun 2014 11:22:06 +0000 (15:22 +0400)]
Merge pull request #2820 from ilya-lavrenov:tapi_flip
Ilya Lavrenov [Mon, 2 Jun 2014 10:21:03 +0000 (14:21 +0400)]
optimized cv::flip (CV_8UC1)
Alexander Alekhin [Wed, 4 Jun 2014 08:23:35 +0000 (12:23 +0400)]
Merge pull request #2810 from ilya-lavrenov:tapi_copytomask
Alexander Alekhin [Wed, 4 Jun 2014 08:22:51 +0000 (12:22 +0400)]
Merge pull request #2798 from ilya-lavrenov:tapi_copymakeborder
Alexander Alekhin [Wed, 4 Jun 2014 08:20:54 +0000 (12:20 +0400)]
Merge pull request #2812 from arkunze:pullreq/140520-filter2D
Alexander Alekhin [Wed, 4 Jun 2014 08:18:29 +0000 (12:18 +0400)]
Merge pull request #2821 from ilya-lavrenov:tapi_reduce
Alexander Alekhin [Wed, 4 Jun 2014 08:11:54 +0000 (12:11 +0400)]
Merge pull request #2826 from ilya-lavrenov:tapi_perf_warp
Roman Donchenko [Wed, 4 Jun 2014 08:07:17 +0000 (12:07 +0400)]
Merge pull request #1552 from Exocoder:gtk3
Tony [Tue, 3 Jun 2014 20:29:54 +0000 (21:29 +0100)]
On branch gtk3
Changes to be committed:
modified: CMakeLists.txt
Corrected merge error from last resync
Tony [Tue, 3 Jun 2014 19:55:49 +0000 (20:55 +0100)]
Merge branch 'gtk3' of https://github.com/Exocoder/opencv into gtk3
resyncing gtk3 with remote.
Ilya Lavrenov [Tue, 3 Jun 2014 09:35:49 +0000 (13:35 +0400)]
added missed INTER_CUBIC
Alexander Alekhin [Tue, 3 Jun 2014 12:36:48 +0000 (16:36 +0400)]
Merge pull request #2750 from ilya-lavrenov:tapi_convertto
Alexander Alekhin [Tue, 3 Jun 2014 09:21:05 +0000 (13:21 +0400)]
Merge pull request #2795 from ilya-lavrenov:tapi_setto
Alexander Alekhin [Tue, 3 Jun 2014 09:19:42 +0000 (13:19 +0400)]
Merge pull request #2757 from ElenaGvozdeva:ocl_flip
Ilya Lavrenov [Mon, 2 Jun 2014 14:27:40 +0000 (18:27 +0400)]
merged 2 kernels
Alexander Alekhin [Mon, 2 Jun 2014 16:37:17 +0000 (20:37 +0400)]
Merge pull request #2761 from ilya-lavrenov:tapi_warpers
Roman Donchenko [Mon, 2 Jun 2014 13:12:06 +0000 (17:12 +0400)]
Merge pull request #2819 from SpecLad:merge-2.4
mletavin [Mon, 2 Jun 2014 11:58:59 +0000 (15:58 +0400)]
Added condition to use optimized kernels for images of size that multiple of 4 only
Ilya Lavrenov [Tue, 27 May 2014 12:12:52 +0000 (16:12 +0400)]
optimized cv::copyMakeBorder
Ilya Lavrenov [Tue, 27 May 2014 08:07:26 +0000 (12:07 +0400)]
optimized UMat::setTo
Alexander Alekhin [Mon, 2 Jun 2014 09:57:56 +0000 (13:57 +0400)]
Merge pull request #2778 from vbystricky:oclopt_reduce
Alexander Alekhin [Mon, 2 Jun 2014 09:54:31 +0000 (13:54 +0400)]
Merge pull request #2751 from akarsakov:ocl_thresh_opt
Roman Donchenko [Mon, 2 Jun 2014 09:43:28 +0000 (13:43 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Alexander Alekhin [Sat, 31 May 2014 22:30:39 +0000 (02:30 +0400)]
Merge pull request #2811 from arkunze:pullreq/140516-erode
Alexander Alekhin [Sat, 31 May 2014 18:50:44 +0000 (22:50 +0400)]
Merge pull request #2781 from ilya-lavrenov:tapi_meanstddev
Alexander Alekhin [Sat, 31 May 2014 18:48:15 +0000 (22:48 +0400)]
Merge pull request #2809 from ilya-lavrenov:tapi_copy_perf
Alexander Alekhin [Sat, 31 May 2014 18:46:20 +0000 (22:46 +0400)]
Merge pull request #2787 from ilya-lavrenov:tapi_repeat
Alexander Alekhin [Fri, 30 May 2014 15:11:08 +0000 (19:11 +0400)]
Merge pull request #2807 from alalek:disable_tests_KAZE
Ilya Lavrenov [Fri, 30 May 2014 14:34:04 +0000 (18:34 +0400)]
added performance test
Ilya Lavrenov [Fri, 30 May 2014 14:01:49 +0000 (18:01 +0400)]
optimized UMat::copyTo with mask
Alexander Alekhin [Fri, 30 May 2014 12:35:23 +0000 (16:35 +0400)]
Merge pull request #2800 from krodyush:pullreq/140516-opticalflow-imgext-fix
krodyush [Fri, 30 May 2014 11:44:51 +0000 (15:44 +0400)]
fix according review
Alexander Alekhin [Thu, 29 May 2014 20:42:42 +0000 (00:42 +0400)]
Merge pull request #2638 from mlyashko:floodfill_perftest
Alexander Alekhin [Thu, 29 May 2014 20:38:11 +0000 (00:38 +0400)]
Merge pull request #2804 from ilya-lavrenov:tapi_perf
Alexander Alekhin [Thu, 22 May 2014 08:01:55 +0000 (12:01 +0400)]
KAZE: disable tests (too many crashes)
Ilya Lavrenov [Thu, 29 May 2014 10:09:22 +0000 (14:09 +0400)]
added missed tests for cv::norm, cv::normalize
Roman Donchenko [Thu, 29 May 2014 10:51:45 +0000 (14:51 +0400)]
Merge pull request #2773 from abidrahmank:pycascade
Roman Donchenko [Thu, 29 May 2014 10:50:42 +0000 (14:50 +0400)]
Merge pull request #2771 from SpecLad:pvs-checks-opencv
Roman Donchenko [Thu, 29 May 2014 10:43:30 +0000 (14:43 +0400)]
Merge pull request #2777 from alexstadnik:master
Roman Donchenko [Thu, 29 May 2014 10:40:38 +0000 (14:40 +0400)]
Merge pull request #2782 from HapeMask:py3_flann
mlyashko [Thu, 29 May 2014 09:36:13 +0000 (13:36 +0400)]
perftest for floodfill
Ilya Lavrenov [Wed, 21 May 2014 14:12:26 +0000 (18:12 +0400)]
optimized cv::meanStdDev
Elena Gvozdeva [Tue, 27 May 2014 13:27:24 +0000 (17:27 +0400)]
optimized index access
Alexander Alekhin [Wed, 28 May 2014 09:39:48 +0000 (13:39 +0400)]
Merge pull request #2797 from ElenaGvozdeva:ocl_MT
mletavin [Wed, 28 May 2014 09:30:50 +0000 (13:30 +0400)]
Adding explicit variable conversion in ocl_medianFilter() to suppress build errors on Linux & Mac
Alexander Alekhin [Wed, 28 May 2014 09:28:30 +0000 (13:28 +0400)]
Merge pull request #2796 from berak:b_3674_24
berak [Wed, 28 May 2014 08:37:16 +0000 (10:37 +0200)]
2 fixed unassigned reshapes in em (#3674)
krodyush [Wed, 28 May 2014 06:34:11 +0000 (10:34 +0400)]
opencl opticaflow fix that enables buffer2image extension
Alexander Alekhin [Tue, 27 May 2014 14:52:01 +0000 (18:52 +0400)]
Merge pull request #2788 from alalek:icv_public
mletavin [Tue, 27 May 2014 12:16:00 +0000 (16:16 +0400)]
Moved new kernels under conditional compilation to disable their build for 3-channel images; added condition to use new kernels only for images that are big enough
Elena Gvozdeva [Tue, 27 May 2014 10:31:11 +0000 (14:31 +0400)]
OCL: matchTemplate: changed perf test
Roman Donchenko [Tue, 27 May 2014 09:35:10 +0000 (13:35 +0400)]
Merge pull request #2793 from alalek:run_android_env
Roman Donchenko [Tue, 27 May 2014 08:44:23 +0000 (12:44 +0400)]
Merge pull request #2792 from SpecLad:merge-2.4
vbystricky [Mon, 26 May 2014 12:55:31 +0000 (16:55 +0400)]
Fix some errors
vbystricky [Fri, 23 May 2014 07:09:57 +0000 (11:09 +0400)]
fix code in the kernel
vbystricky [Thu, 22 May 2014 07:39:36 +0000 (11:39 +0400)]
Change buffer cols count from 64 to 32
vbystricky [Wed, 21 May 2014 09:22:44 +0000 (13:22 +0400)]
Optimize openCL version of reduce function
mletavin [Fri, 16 May 2014 07:27:22 +0000 (11:27 +0400)]
Added new Intel-optimized 3x3 and 5x5 kernels to medianFilter.cl file and corresponding code to host in smooth.cpp
Only Intel platform and 1 channel images are supported.
Alexander Alekhin [Mon, 26 May 2014 10:32:52 +0000 (14:32 +0400)]
run.py: propagate OPENCV* env variables only with --android_propagate_opencv_env flag
Ilya Lavrenov [Mon, 26 May 2014 10:20:16 +0000 (14:20 +0400)]
fixed cv::mixChannels
Alexander Alekhin [Sun, 25 May 2014 21:19:16 +0000 (01:19 +0400)]
run.py: added --android_env parameter
Ilya Lavrenov [Thu, 15 May 2014 07:58:03 +0000 (11:58 +0400)]
fix
Ilya Lavrenov [Wed, 14 May 2014 14:56:25 +0000 (18:56 +0400)]
other kernels now use row scheme
Ilya Lavrenov [Wed, 14 May 2014 11:42:30 +0000 (15:42 +0400)]
multiple rows in KF kernel
Ilya Lavrenov [Wed, 14 May 2014 09:55:39 +0000 (13:55 +0400)]
multiple rows per work-item
Roman Donchenko [Mon, 26 May 2014 08:32:14 +0000 (12:32 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Alexander Alekhin [Fri, 23 May 2014 11:09:43 +0000 (15:09 +0400)]
Merge pull request #2709 from alalek:icv_update_binary_pack
Alexander Alekhin [Fri, 23 May 2014 10:54:09 +0000 (14:54 +0400)]
icv: fix test eps on Mac for failed perf test
Ilya Lavrenov [Fri, 23 May 2014 09:45:24 +0000 (12:45 +0300)]
optimized cv::repeat
Alexander Alekhin [Fri, 23 May 2014 09:43:31 +0000 (13:43 +0400)]
icv: enable public IPPICV packages
Alexander Alekhin [Fri, 23 May 2014 09:35:44 +0000 (13:35 +0400)]
Merge pull request #2713 from alalek:icv_enable_fns
Roman Donchenko [Thu, 22 May 2014 14:03:56 +0000 (18:03 +0400)]
Merge pull request #2742 from StevenPuttemans:feature_3176
StevenPuttemans [Tue, 13 May 2014 12:35:08 +0000 (14:35 +0200)]
Added more info on the data input variable of kmeans
Alexander Alekhin [Thu, 22 May 2014 09:23:49 +0000 (13:23 +0400)]
Merge pull request #2772 from akarsakov:ocl_pyramids
Alexander Alekhin [Thu, 22 May 2014 08:30:53 +0000 (12:30 +0400)]
Merge pull request #2762 from ilya-lavrenov:ipp_sort
Gabe Schwartz [Wed, 21 May 2014 18:29:54 +0000 (14:29 -0400)]
Fixed pyopencv_to w/FLANN IndexParams in python3.
The keys() and values() functions on dictionaries in Python 3 no longer
return lists. pyopencv_to() for flann::IndexParams now iterates over
the dictionary in a way that is version-agnostic.
Alexander Alekhin [Wed, 21 May 2014 15:56:00 +0000 (19:56 +0400)]
Merge pull request #2723 from ilya-lavrenov:tapi_intel_vector_width
Alexander Alekhin [Wed, 21 May 2014 13:43:28 +0000 (17:43 +0400)]
Merge pull request #2776 from ilya-lavrenov:tapi_meanstddev
Alexander Karsakov [Wed, 21 May 2014 10:09:21 +0000 (14:09 +0400)]
Fixed cv::pyrUp performance test
Alexey Stadnik [Wed, 21 May 2014 08:51:15 +0000 (12:51 +0400)]
Added Haar cascade for russian cars licence plate detection, 16 stages cascade, pretty fast.
Ilya Lavrenov [Wed, 21 May 2014 07:50:31 +0000 (11:50 +0400)]
added performance test for cv::meanStdDev with mask
Alexander Alekhin [Wed, 21 May 2014 07:44:25 +0000 (11:44 +0400)]
Merge pull request #2763 from ilya-lavrenov:tapi_perf_norm_relative
Aaron Kunze [Wed, 21 May 2014 05:30:09 +0000 (22:30 -0700)]
Bug fixes for filter2D and associated tests.
abidrahmank [Wed, 21 May 2014 02:56:16 +0000 (08:26 +0530)]
Issue #2540 : Python bindings for various "detectMultiScale()"
Roman Donchenko [Tue, 20 May 2014 09:54:00 +0000 (13:54 +0400)]
Fixed several problems found by PVS-Studio.
This fixes all problems from the article "Checking OpenCV with PVS-Studio"
<http://www.viva64.com/en/b/0191/> that are not already fixed and are
not in 3rdparty or the legacy module.
The problems fixed are two instances of useless code and one instance
of unspecified behavior (right-shifting a negative number).
Roman Donchenko [Tue, 20 May 2014 07:50:49 +0000 (11:50 +0400)]
Merge pull request #2767 from SpecLad:merge-2.4
Roman Donchenko [Tue, 20 May 2014 07:50:29 +0000 (11:50 +0400)]
Merge pull request #2768 from SpecLad:useless-loop
Roman Donchenko [Mon, 19 May 2014 14:39:20 +0000 (18:39 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
Roman Donchenko [Mon, 19 May 2014 13:38:30 +0000 (17:38 +0400)]
Remove a useless loop that copies an array to itself
Vadim Pisarevsky [Mon, 19 May 2014 13:36:38 +0000 (17:36 +0400)]
Merge pull request #2509 from euphrat:mog2_bgimg_gray
Vadim Pisarevsky [Mon, 19 May 2014 13:36:19 +0000 (17:36 +0400)]
Merge pull request #2630 from isarandi:concat_corr
Vadim Pisarevsky [Mon, 19 May 2014 13:35:21 +0000 (17:35 +0400)]
Merge pull request #2673 from BloodAxe:kaze
Vadim Pisarevsky [Mon, 19 May 2014 13:35:03 +0000 (17:35 +0400)]
Merge pull request #2680 from adrians:remove_cv_err
Vadim Pisarevsky [Mon, 19 May 2014 13:34:45 +0000 (17:34 +0400)]
Merge pull request #2701 from thoinvil:BugfixFilterEngineApplyROI
Vadim Pisarevsky [Mon, 19 May 2014 13:33:36 +0000 (17:33 +0400)]
Merge pull request #2739 from StevenPuttemans:bug_1523
Vadim Pisarevsky [Mon, 19 May 2014 13:33:22 +0000 (17:33 +0400)]
Merge pull request #2738 from kevmitch:2.4
Vadim Pisarevsky [Mon, 19 May 2014 13:33:09 +0000 (17:33 +0400)]
Merge pull request #2744 from jet47:kmeans-fix
Vadim Pisarevsky [Mon, 19 May 2014 13:30:32 +0000 (17:30 +0400)]
Merge pull request #2752 from jet47:pr-2746
Vadim Pisarevsky [Mon, 19 May 2014 13:30:18 +0000 (17:30 +0400)]
Merge pull request #2764 from hbadino:Feature_3692