Aleksandr Petrikov [Wed, 18 Jun 2014 13:48:10 +0000 (17:48 +0400)]
fix bug 3733 for imgproc/filter.cpp
Vadim Pisarevsky [Mon, 11 Aug 2014 11:10:17 +0000 (11:10 +0000)]
Merge pull request #3058 from PhilLab:patch-2
PhilLab [Fri, 8 Aug 2014 15:39:12 +0000 (17:39 +0200)]
Fixed self-assignment in cv::Ptr::operator =
A self-assignment leads to a call of release() with refcount being 2. In the release() method, refcount is decremented and then successfully checked for being 1. As a consequence, the underlying data is released. To prevent this, we test for a self-assignment
Vadim Pisarevsky [Thu, 7 Aug 2014 06:40:37 +0000 (06:40 +0000)]
Merge pull request #3046 from StevenPuttemans:fix_Qt_locale
StevenPuttemans [Tue, 5 Aug 2014 14:05:10 +0000 (16:05 +0200)]
fixing setting the locale back to what should be expected
fix should be applyed for every window interface and generation
Vadim Pisarevsky [Sat, 2 Aug 2014 21:52:51 +0000 (21:52 +0000)]
Merge pull request #3026 from jet47:fix-gpu-resize-linear
Vladislav Vinogradov [Fri, 1 Aug 2014 07:33:29 +0000 (11:33 +0400)]
fix cv::gpu::resize for INTER_LINEAR, now it produces the same result as CPU version
Alexander Alekhin [Wed, 30 Jul 2014 13:02:44 +0000 (13:02 +0000)]
Merge pull request #3019 from alalek:ocl_fix_pyrUp_test
Alexander Smorkalov [Wed, 30 Jul 2014 10:52:01 +0000 (14:52 +0400)]
Android native camera rebuilt after sources update.
Alexander Smorkalov [Wed, 30 Jul 2014 10:35:00 +0000 (14:35 +0400)]
Merge branch 'fix_androidcamera_preview_usage_bits' into 2.4
Alexander Alekhin [Wed, 30 Jul 2014 08:26:34 +0000 (12:26 +0400)]
ocl: fix pyrUp perf test
Vadim Pisarevsky [Tue, 29 Jul 2014 13:48:19 +0000 (13:48 +0000)]
Merge pull request #2968 from LeonidBeynenson:bugfix_crash_gpu_feature_matcher_in_stitcher
Vadim Pisarevsky [Tue, 29 Jul 2014 11:54:36 +0000 (11:54 +0000)]
Merge pull request #3014 from vpisarev:fix_python_tests
Vadim Pisarevsky [Tue, 29 Jul 2014 08:27:31 +0000 (12:27 +0400)]
hopefully fixed Python tests
Vadim Pisarevsky [Fri, 25 Jul 2014 13:18:05 +0000 (13:18 +0000)]
Merge pull request #2816 from ehren:avcapturesession_leak
Vadim Pisarevsky [Fri, 25 Jul 2014 12:59:40 +0000 (12:59 +0000)]
Merge pull request #2836 from s98felix:2.4
Vadim Pisarevsky [Fri, 25 Jul 2014 12:39:30 +0000 (12:39 +0000)]
Merge pull request #2997 from mojoritty:bugfix_3767
Vadim Pisarevsky [Fri, 25 Jul 2014 11:25:36 +0000 (11:25 +0000)]
Merge pull request #3001 from asmorkalov:cuda_6.5_support
Alexander Smorkalov [Mon, 14 Jul 2014 19:58:05 +0000 (23:58 +0400)]
More accurate deb package build fix for CUDA 6.5 and newer.
(cherry picked from commit
b2790973a32eb662c165a921afe03dbfd2c65269)
(cherry picked from commit
f8758da289c092fcce10baa4723d6388c4e41cb3)
Alexander Smorkalov [Mon, 14 Jul 2014 17:27:23 +0000 (21:27 +0400)]
Deb package build fix for CUDA 6.5 and newer.
(cherry picked from commit
e650d87e470b2e6a8f87ad4dd81977748a136aee)
(cherry picked from commit
ca9c52ac9778d01eba933a786b4303c79d0162be)
Martijn Liem [Wed, 23 Jul 2014 10:33:51 +0000 (12:33 +0200)]
Bugfix for bug #3767
Fixed a memory leak in cap_dshow.cpp in videoInput::setVideoSettingCamera(). The leak was caused by not releasing an IBaseFilter object created in a call to getDevice(). Tho object is now properly released.
Richard Yoo [Mon, 21 Jul 2014 20:26:50 +0000 (13:26 -0700)]
Enable Intel AVX/AVX2 compilation on Windows.
Vadim Pisarevsky [Sat, 19 Jul 2014 18:02:20 +0000 (18:02 +0000)]
Merge pull request #2985 from StevenPuttemans:fix_3777_redo
StevenPuttemans [Fri, 18 Jul 2014 10:49:56 +0000 (12:49 +0200)]
fixing bug 3777
Vadim Pisarevsky [Fri, 18 Jul 2014 10:10:44 +0000 (10:10 +0000)]
Merge pull request #2948 from PhilLab:patch-1
Vadim Pisarevsky [Fri, 18 Jul 2014 10:05:22 +0000 (10:05 +0000)]
Merge pull request #2984 from cambyse:2.4
Vadim Pisarevsky [Fri, 18 Jul 2014 09:57:51 +0000 (09:57 +0000)]
Merge pull request #2980 from akarsakov:revert_dft_dst_fix
Vadim Pisarevsky [Fri, 18 Jul 2014 09:26:49 +0000 (09:26 +0000)]
Merge pull request #2898 from PhilLab:2.4
PhilLab [Thu, 3 Jul 2014 10:29:33 +0000 (12:29 +0200)]
Clarified DescriptorExtractor::compute
Camille [Thu, 17 Jul 2014 22:06:31 +0000 (00:06 +0200)]
bug fix 3381
Camille [Thu, 17 Jul 2014 20:57:31 +0000 (22:57 +0200)]
bug fix 3381
Alexander Karsakov [Thu, 17 Jul 2014 11:11:06 +0000 (15:11 +0400)]
Revert changes by PR#2930 since it breaks logic of inverse mode.
Vadim Pisarevsky [Wed, 16 Jul 2014 19:26:46 +0000 (19:26 +0000)]
Merge pull request #2970 from PhilLab:patch-3
unknown [Fri, 11 Jul 2014 17:43:04 +0000 (19:43 +0200)]
Function for drawing arrows
Vadim Pisarevsky [Tue, 15 Jul 2014 09:47:52 +0000 (09:47 +0000)]
Merge pull request #2909 from StevenPuttemans:bugfix_profileface_model
Vadim Pisarevsky [Tue, 15 Jul 2014 09:44:32 +0000 (09:44 +0000)]
Merge pull request #2965 from soulslicer:patch-2
LeonidBeynenson [Tue, 15 Jul 2014 09:26:32 +0000 (13:26 +0400)]
Added a TODO comment about changes which should be done in GpuMatcher::match
Vadim Pisarevsky [Tue, 15 Jul 2014 08:10:33 +0000 (08:10 +0000)]
Merge pull request #2966 from PhilLab:patch-2
Vadim Pisarevsky [Tue, 15 Jul 2014 08:10:04 +0000 (08:10 +0000)]
Merge pull request #2967 from LeonidBeynenson:bugfix_wave_correction_wrong_result
Vadim Pisarevsky [Mon, 14 Jul 2014 19:00:52 +0000 (19:00 +0000)]
Merge pull request #2780 from hbadino:Feature_3692_2.4
Vadim Pisarevsky [Mon, 14 Jul 2014 18:47:13 +0000 (18:47 +0000)]
Merge pull request #2959 from StevenPuttemans:add_notice_loaded_parameters
Vadim Pisarevsky [Mon, 14 Jul 2014 18:42:49 +0000 (18:42 +0000)]
Merge pull request #2957 from cambyse:2.4
Vadim Pisarevsky [Mon, 14 Jul 2014 18:40:38 +0000 (18:40 +0000)]
Merge pull request #2971 from ruslo:docfix
Vadim Pisarevsky [Mon, 14 Jul 2014 18:35:37 +0000 (18:35 +0000)]
Merge pull request #2972 from apavlenko:24_face_rec_sample
Roman Donchenko [Mon, 14 Jul 2014 12:19:31 +0000 (12:19 +0000)]
Merge pull request #2815 from Aletheios:Bugfix#3705
Roman Donchenko [Mon, 14 Jul 2014 12:11:49 +0000 (12:11 +0000)]
Merge pull request #2975 from asmorkalov:ocv_cuda_6.5_fix
Alexander Smorkalov [Mon, 14 Jul 2014 10:26:50 +0000 (14:26 +0400)]
Build fixes for CUDA 6.5
Roman Donchenko [Mon, 14 Jul 2014 08:21:24 +0000 (08:21 +0000)]
Merge pull request #2955 from SpecLad:find-libv4l2
Ruslan Baratov [Sat, 12 Jul 2014 15:35:22 +0000 (19:35 +0400)]
Doc: fix definition of macro CV_MAKETYPE
At least this is how it's defined in core/types_c.h
Andrey Pavlenko [Sat, 12 Jul 2014 15:28:43 +0000 (19:28 +0400)]
improving face-rec sample:
* CSV can contain dir-s and wildcards
* save trained model
Roman Donchenko [Fri, 11 Jul 2014 14:15:59 +0000 (14:15 +0000)]
Merge pull request #2903 from mmaraya:2.4
Leonid Beynenson [Fri, 11 Jul 2014 12:37:30 +0000 (16:37 +0400)]
Fixed bug which caused crash of GPU version of feature matcher in stitcher
The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.
Leonid Beynenson [Fri, 11 Jul 2014 11:47:41 +0000 (15:47 +0400)]
Fixed bug in cv::detail::waveCorrect
The function makes wave correction of a stitched panorama.
Earlier it gave wrong results for panorama made from 1 frame.
StevenPuttemans [Thu, 10 Jul 2014 11:28:32 +0000 (13:28 +0200)]
added extra warning about the automatic parameter loading for traincascade application when the param.xml file already exists
PhilLab [Fri, 11 Jul 2014 07:22:55 +0000 (09:22 +0200)]
Added publication reference
Raaj [Fri, 11 Jul 2014 00:44:40 +0000 (17:44 -0700)]
Update facedetect.cpp
Somebody forgot to add curly brackets
Richard Yoo [Wed, 9 Jul 2014 23:55:39 +0000 (16:55 -0700)]
Modifications to support dynamic vector dispatch.
Camille [Wed, 9 Jul 2014 20:35:56 +0000 (22:35 +0200)]
bug fix 3696
Alexander Alekhin [Wed, 9 Jul 2014 14:57:46 +0000 (14:57 +0000)]
Merge pull request #2954 from ilya-lavrenov:doc_fix
Ilya Lavrenov [Wed, 9 Jul 2014 13:46:22 +0000 (17:46 +0400)]
fixed docs
Roman Donchenko [Wed, 9 Jul 2014 12:55:40 +0000 (16:55 +0400)]
cap_libv4l.cpp depends on both libv4l 1 and 2, so search for both
How this worked before, I do not know.
unknown [Wed, 9 Jul 2014 12:19:15 +0000 (14:19 +0200)]
Fixed C++11 compatibility warning
Roman Donchenko [Wed, 9 Jul 2014 07:49:47 +0000 (07:49 +0000)]
Merge pull request #2883 from berak:b_3756_24
berak [Tue, 8 Jul 2014 15:26:23 +0000 (17:26 +0200)]
added missing impl for multi-dim Mat::ones, Mat::zeros (issue #3756)
Roman Donchenko [Tue, 8 Jul 2014 12:14:54 +0000 (12:14 +0000)]
Merge pull request #2558 from asmorkalov:ocv_matop_init_fix
PhilLab [Tue, 8 Jul 2014 11:24:35 +0000 (13:24 +0200)]
Added cast and removed formatting error
PhilLab [Tue, 8 Jul 2014 09:52:42 +0000 (11:52 +0200)]
Double precision for solvePnPRansac()
solvePnPRansac() and pnpTask() now accept object or image points with double precision.
Vadim Pisarevsky [Mon, 7 Jul 2014 13:29:38 +0000 (13:29 +0000)]
Merge pull request #2908 from mmaraya:bug_3737
Vadim Pisarevsky [Mon, 7 Jul 2014 11:21:11 +0000 (11:21 +0000)]
Merge pull request #2930 from akarsakov:dft_dst_size_fix
Alexander Karsakov [Thu, 3 Jul 2014 06:27:53 +0000 (10:27 +0400)]
Fixed dst size
Vadim Pisarevsky [Wed, 2 Jul 2014 14:25:52 +0000 (14:25 +0000)]
Merge pull request #2915 from SpecLad:core-useless-casts
Vadim Pisarevsky [Wed, 2 Jul 2014 14:24:09 +0000 (14:24 +0000)]
Merge pull request #2071 from pemmanuelviel:LshOrthogonalSubvectors
Alexander Alekhin [Wed, 2 Jul 2014 12:18:10 +0000 (12:18 +0000)]
Merge pull request #2922 from ilya-lavrenov:mac_fix
Alexander Alekhin [Tue, 1 Jul 2014 16:02:02 +0000 (20:02 +0400)]
ocl: fix mac and superres test
Ilya Lavrenov [Tue, 1 Jul 2014 10:53:39 +0000 (14:53 +0400)]
fix for fisheye
Vadim Pisarevsky [Tue, 1 Jul 2014 18:41:14 +0000 (18:41 +0000)]
Merge pull request #2905 from Jazmann:2.4
Vadim Pisarevsky [Tue, 1 Jul 2014 16:40:08 +0000 (16:40 +0000)]
Merge pull request #2917 from mmaraya:bug_3872
Vadim Pisarevsky [Tue, 1 Jul 2014 11:02:04 +0000 (11:02 +0000)]
Merge pull request #2914 from alalek:fix2.4
Ilya Lavrenov [Tue, 1 Jul 2014 10:31:25 +0000 (14:31 +0400)]
fixed warnings
StevenPuttemans [Fri, 27 Jun 2014 12:53:43 +0000 (14:53 +0200)]
fixed two models, adding xml identifier to correct position
Mike Maraya [Tue, 1 Jul 2014 02:17:52 +0000 (22:17 -0400)]
test.py: Check if camera_calibration.tar.gz file exists before downloading it, opencv bug #3782
Roman Donchenko [Mon, 30 Jun 2014 12:12:04 +0000 (16:12 +0400)]
Remove a couple of useless casts in core headers
This helps users who compile their code with -Wuseless-cast.
Alexander Alekhin [Mon, 30 Jun 2014 12:03:20 +0000 (16:03 +0400)]
fix bug with invalid signature size (should not be less than signatureLength())
Alexander Alekhin [Mon, 30 Jun 2014 12:03:07 +0000 (16:03 +0400)]
fix python tests
Mike Maraya [Fri, 27 Jun 2014 12:34:40 +0000 (08:34 -0400)]
Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737)
Mike Maraya [Fri, 27 Jun 2014 12:20:22 +0000 (08:20 -0400)]
Revert "Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737)"
This reverts commit
56683e6d112a808fbd51c74917f0c4d9d752f502.
Mike Maraya [Fri, 27 Jun 2014 12:02:01 +0000 (08:02 -0400)]
Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737)
Mike Maraya [Sat, 28 Jun 2014 03:26:09 +0000 (23:26 -0400)]
Fixes resizeWindow() on OS X (Bug #3200)
unknown [Thu, 26 Jun 2014 12:17:57 +0000 (14:17 +0200)]
Fixed typos in comments
Roman Donchenko [Thu, 26 Jun 2014 13:28:44 +0000 (17:28 +0400)]
Merge pull request #2766 from akarsakov:pyr_border_constant
Roman Donchenko [Wed, 25 Jun 2014 12:32:17 +0000 (16:32 +0400)]
Merge pull request #2880 from GravityJack:SparseMatIterator-build-fix
Roman Donchenko [Wed, 25 Jun 2014 12:27:33 +0000 (16:27 +0400)]
Merge pull request #2891 from nisargthakkar:dims_zero_on_release
Vadim Pisarevsky [Tue, 24 Jun 2014 12:06:19 +0000 (12:06 +0000)]
Merge pull request #2889 from Ilya-Krylov:fisheye
Jasper [Tue, 24 Jun 2014 10:52:56 +0000 (11:52 +0100)]
Fix for VTK6.2 issue.
Nisarg Thakkar [Mon, 23 Jun 2014 14:45:23 +0000 (20:15 +0530)]
Fix for Bug#3757: All dimension values are 0 after release is called
Ilya Krylov [Mon, 23 Jun 2014 13:06:40 +0000 (17:06 +0400)]
Fixed android and windows x64 build issues
Marc Rollins [Thu, 19 Jun 2014 21:14:10 +0000 (14:14 -0700)]
Fixing build error when using post-increment operator.
Roman Donchenko [Thu, 19 Jun 2014 12:52:00 +0000 (16:52 +0400)]
Merge pull request #2870 from 23pointsNorth:patch-5
Roman Donchenko [Thu, 19 Jun 2014 12:51:37 +0000 (16:51 +0400)]
Merge pull request #2868 from neo008:2.4
Andrey Pavlenko [Thu, 19 Jun 2014 09:08:32 +0000 (09:08 +0000)]
Merge pull request #2843 from berak:f_export_bow_24