Vadim Pisarevsky [Wed, 17 Sep 2014 09:50:08 +0000 (09:50 +0000)]
Merge pull request #3228 from PhilLab:patch-4
Philipp Hasper [Wed, 17 Sep 2014 07:30:19 +0000 (09:30 +0200)]
Doc: Fixing indentation
Andrey Pavlenko [Mon, 15 Sep 2014 13:54:19 +0000 (13:54 +0000)]
Merge pull request #3219 from mshabunin:png_iccp_strip_24
Alexander Alekhin [Mon, 15 Sep 2014 11:12:02 +0000 (11:12 +0000)]
Merge pull request #3221 from asmorkalov:ocv_2.4.10_version_inc
Alexander Smorkalov [Mon, 15 Sep 2014 10:55:25 +0000 (14:55 +0400)]
OpenCV version++.
Maksim Shabunin [Mon, 15 Sep 2014 08:48:28 +0000 (12:48 +0400)]
Stripped iCCP chunk from png files
Vadim Pisarevsky [Sun, 14 Sep 2014 18:44:23 +0000 (18:44 +0000)]
Merge pull request #3204 from parafin:ximea_unix-2.4
Vadim Pisarevsky [Sun, 14 Sep 2014 18:43:48 +0000 (18:43 +0000)]
Merge pull request #3202 from parafin:bug_3858-2.4
Igor Kuzmin [Tue, 9 Sep 2014 15:17:13 +0000 (19:17 +0400)]
XIMEA cam support: allow on OS X too
Igor Kuzmin [Tue, 9 Sep 2014 15:15:03 +0000 (19:15 +0400)]
XIMEA cam support: use correct library for 64 bit Linux
Igor Kuzmin [Tue, 9 Sep 2014 15:10:05 +0000 (19:10 +0400)]
fix for issue 3858 (remove unneeded #include's)
also use correct include path on Linux
Vadim Pisarevsky [Tue, 9 Sep 2014 06:33:15 +0000 (06:33 +0000)]
Merge pull request #3194 from stonier:2.4
Vadim Pisarevsky [Tue, 9 Sep 2014 06:31:17 +0000 (06:31 +0000)]
Merge pull request #3197 from asmorkalov:python_tests_package
Alexander Smorkalov [Mon, 8 Sep 2014 14:11:12 +0000 (18:11 +0400)]
Python tests added to -tests deb package.
Daniel Stonier [Sun, 7 Sep 2014 19:31:37 +0000 (04:31 +0900)]
make sure children are included in the moveToThread
Daniel Stonier [Sun, 7 Sep 2014 18:19:56 +0000 (03:19 +0900)]
support invokation of cv windows from parallel threads to an external qt application.
Roman Donchenko [Fri, 5 Sep 2014 09:49:54 +0000 (09:49 +0000)]
Merge pull request #3156 from sergregory:CreateSamplesMod
Grigory Serebryakov [Fri, 5 Sep 2014 07:27:43 +0000 (11:27 +0400)]
Warning on converting int to bool fixed
Grigory Serebryakov [Fri, 5 Sep 2014 06:45:54 +0000 (10:45 +0400)]
Include for cvSameImage corrected
Grigory Serebryakov [Tue, 2 Sep 2014 06:55:45 +0000 (10:55 +0400)]
Documentation update: createsamples usage
Grigory Serebryakov [Mon, 1 Sep 2014 09:02:27 +0000 (13:02 +0400)]
No output image resize in case of PNG dataset
Vadim Pisarevsky [Mon, 1 Sep 2014 06:15:36 +0000 (06:15 +0000)]
Merge pull request #3178 from jimcamel:freak_sse_bugfix
Adrian Clark [Sun, 31 Aug 2014 21:37:33 +0000 (09:37 +1200)]
Fixed crash in SSE implementation of FREAK descriptor when number of pairs is set to something other than 512.
See http://code.opencv.org/issues/3889 for more details
Vadim Pisarevsky [Fri, 29 Aug 2014 08:11:28 +0000 (08:11 +0000)]
Merge pull request #3164 from jet47:fix-cuda-lut
Vladislav Vinogradov [Thu, 28 Aug 2014 10:47:26 +0000 (14:47 +0400)]
fix CUDA LUT implementation
In CUDA 6.0 there was a bug in NPP LUT implementation (invalid results when
src == 255). In CUDA 6.5 the bug was fixed.
Replaced NPP LUT call with own implementation (ported from master branch)
to be independant from CUDA Toolkit version.
Grigory Serebryakov [Wed, 27 Aug 2014 08:41:18 +0000 (12:41 +0400)]
Naming fixes and code beautification
Grigory Serebryakov [Tue, 26 Aug 2014 04:55:59 +0000 (08:55 +0400)]
Class naming update
Documentation improvement
Bug in output format for JPG set fixed
Grigory Serebryakov [Mon, 25 Aug 2014 14:46:23 +0000 (18:46 +0400)]
Typo in string fixed
Grigory Serebryakov [Tue, 29 Jul 2014 10:12:17 +0000 (14:12 +0400)]
Can create training set in PNG format
The format of the training set can be changed with the `-pngoutput` key.
Output image will be resized to a 640x480 size if greater.
Vadim Pisarevsky [Fri, 22 Aug 2014 11:49:52 +0000 (11:49 +0000)]
Merge pull request #3147 from asmorkalov:ocv_deb_lintian_fixes
Vadim Pisarevsky [Fri, 22 Aug 2014 07:22:23 +0000 (07:22 +0000)]
Merge pull request #3109 from jet47:gpu-test-fixes
Vadim Pisarevsky [Fri, 22 Aug 2014 07:21:46 +0000 (07:21 +0000)]
Merge pull request #3143 from jet47:cuda-cvt-color-fix
Alexander Smorkalov [Fri, 22 Aug 2014 06:51:52 +0000 (10:51 +0400)]
Several fixes for lintian varnings
Vladislav Vinogradov [Thu, 21 Aug 2014 10:14:06 +0000 (14:14 +0400)]
fix CUDA cvtColor after corresponding change in CPU version
see https://github.com/Itseez/opencv/pull/3137
Vadim Pisarevsky [Thu, 21 Aug 2014 05:39:18 +0000 (05:39 +0000)]
Merge pull request #3137 from akarsakov:fix_cvtcolor_luv_rgb
Alexander Karsakov [Wed, 20 Aug 2014 07:09:21 +0000 (11:09 +0400)]
Fixed range for 'v' channel for 8U images.
Vadim Pisarevsky [Mon, 18 Aug 2014 15:39:30 +0000 (15:39 +0000)]
Merge pull request #3120 from StevenPuttemans:fix_bug3863
Vadim Pisarevsky [Mon, 18 Aug 2014 12:45:35 +0000 (12:45 +0000)]
Merge pull request #3118 from akarsakov:fix_cvtcolor_perf
StevenPuttemans [Mon, 18 Aug 2014 11:33:40 +0000 (13:33 +0200)]
fixing GT and GE comparison symbol
Alexander Karsakov [Mon, 18 Aug 2014 09:01:19 +0000 (13:01 +0400)]
Fixed getConversionInfo() for YUV2RGBA_* conversions
Vadim Pisarevsky [Sat, 16 Aug 2014 06:03:28 +0000 (06:03 +0000)]
Merge pull request #3108 from LeszekSwirski:fix-gemm-buf-allocate-2.4
Vladislav Vinogradov [Fri, 15 Aug 2014 10:10:15 +0000 (14:10 +0400)]
fix BGR->BGR5x5 color convertion
Vladislav Vinogradov [Fri, 15 Aug 2014 09:42:25 +0000 (13:42 +0400)]
use downscaled frames in FGDStatModel test
Vladislav Vinogradov [Fri, 15 Aug 2014 09:42:06 +0000 (13:42 +0400)]
increase epsilon for ResizeSameAsHost test
Vladislav Vinogradov [Fri, 15 Aug 2014 09:41:47 +0000 (13:41 +0400)]
increase epsilon for TVL1 sanity test
Leszek Swirski [Thu, 14 Aug 2014 14:05:30 +0000 (15:05 +0100)]
Fix reallocation of D buffer in gemm
Conflicts:
modules/core/src/matmul.cpp
Vadim Pisarevsky [Wed, 13 Aug 2014 14:08:50 +0000 (14:08 +0000)]
Merge pull request #3093 from asmorkalov:ocv_array_bound_fix
Alexander Smorkalov [Wed, 13 Aug 2014 09:46:43 +0000 (13:46 +0400)]
GCC 4.8 warning array subscript is above array bounds fixed.
Vadim Pisarevsky [Wed, 13 Aug 2014 13:04:02 +0000 (13:04 +0000)]
Merge pull request #2827 from Alexander-Petrikov-ELVEES-NEOTEK:neon-stereobm
Vadim Pisarevsky [Mon, 11 Aug 2014 16:10:15 +0000 (16:10 +0000)]
Merge pull request #3076 from vpisarev:fix_small_filters
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
projects / platform / upstream / opencv.git / log