Alexander Alekhin [Tue, 8 Dec 2015 07:24:54 +0000 (10:24 +0300)]
Merge 2.4 into master
PR #2968: cce2d99 8578f9c
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.
PR #3236: 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.
PR #3190
fix blobdetector
PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.
PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h
PR #3792: afdf319
Add -L for CUDA libs path to pkg-config
Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.
PR #3893: 122b9f8
Turn ocv_convert_to_lib_name into a function
PR #5490: ec5244a
fixed memory leak in findHomography tests
PR #5491: 0d5b739
delete video readers
PR #5574
PR #5202
Alexander Alekhin [Mon, 7 Dec 2015 09:40:01 +0000 (09:40 +0000)]
Merge pull request #5747 from Sethur:patch-1
Vadim Pisarevsky [Mon, 7 Dec 2015 09:37:46 +0000 (09:37 +0000)]
Merge pull request #5751 from mikanbako:fix-document
Keita Kita [Sun, 6 Dec 2015 04:52:43 +0000 (13:52 +0900)]
Add documentation about detail of image type
connectedComponents and connectedComponentsWithStats in
imgproc accept 8-bit single channel image only for input.
Sethur [Fri, 4 Dec 2015 14:07:41 +0000 (15:07 +0100)]
Fixed duplicate PATH in TBB_DEFAULT_INCLUDE_DIRS
Maksim Shabunin [Thu, 3 Dec 2015 12:00:20 +0000 (12:00 +0000)]
Merge pull request #5741 from PolarNick239:master
Alexander Alekhin [Thu, 3 Dec 2015 10:29:22 +0000 (10:29 +0000)]
Merge pull request #5742 from GabrieleDalmazzone:GabrieleDalmazzone-patch-1
Maksim Shabunin [Thu, 3 Dec 2015 07:41:22 +0000 (07:41 +0000)]
Merge pull request #5720 from asmorkalov:as/cuda_qnx
Nikolay Polyarniy [Wed, 2 Dec 2015 21:15:38 +0000 (00:15 +0300)]
ts module: includes moved out from cvtest namespace
Alexander Alekhin [Wed, 2 Dec 2015 16:49:59 +0000 (16:49 +0000)]
Merge pull request #5572 from paroj:nov4l1
Alexander Alekhin [Wed, 2 Dec 2015 14:22:29 +0000 (14:22 +0000)]
Merge pull request #5725 from alalek:ippicv_update_20151201
Alexander Alekhin [Tue, 1 Dec 2015 10:12:32 +0000 (13:12 +0300)]
ippicv: update
20151201 (9.0.1)
Alexander Alekhin [Tue, 1 Dec 2015 14:43:20 +0000 (14:43 +0000)]
Merge pull request #5727 from lupustr3:pvlasov/ipp_warnings_fix
Pavel Vlasov [Tue, 1 Dec 2015 13:10:29 +0000 (16:10 +0300)]
Fixed warnings for IPP9+ build;
GabrieleDalmazzone [Tue, 1 Dec 2015 08:19:31 +0000 (09:19 +0100)]
Race condition bug-fix in hog.cu
See https://github.com/Itseez/opencv/issues/5721
COMMENTS:
* The second __syncthreads() is necessary, I am sure of that.
* The code works without the first __syncthreads() too, but I have however added it for symmetry. Anyway it doesn't affect time performances, I have checked it with some profiling with nvvp
Alexander Alekhin [Mon, 30 Nov 2015 09:52:16 +0000 (09:52 +0000)]
Merge pull request #5708 from comdiv:#5707
Alexander Alekhin [Mon, 30 Nov 2015 09:48:39 +0000 (09:48 +0000)]
Merge pull request #5633 from mshabunin:doc-mser
Alexander Alekhin [Mon, 30 Nov 2015 09:44:37 +0000 (09:44 +0000)]
Merge pull request #5714 from ajbernal:OCL_HOG_Fix
Alexander Smorkalov [Mon, 30 Nov 2015 07:28:04 +0000 (10:28 +0300)]
Build fix for QNX 6.6 neitrino.
Alexander Smorkalov [Thu, 26 Nov 2015 08:20:12 +0000 (08:20 +0000)]
Merge pull request #5713 from ilya-lavrenov:lintian
Ariel Bernal [Thu, 26 Nov 2015 00:20:04 +0000 (16:20 -0800)]
Fix for #5710. OpenCL HOG Object detect assigns the wrong SIMD size.
In oder to guarantee SIMDness between the two compilation steps we choose the
highest SIMD size that is optimized in the kernel for the first step.
Ilya Lavrenov [Wed, 25 Nov 2015 20:38:33 +0000 (23:38 +0300)]
added suppression for python-script-but-no-python-dep
Alexander Alekhin [Tue, 24 Nov 2015 20:03:49 +0000 (20:03 +0000)]
Merge pull request #4110 from LaurentBerger:Bug4370
comdiv [Tue, 24 Nov 2015 19:03:35 +0000 (00:03 +0500)]
32bit BITFIELDS compresion codec support #5707 Fixed
wsfixed
LaurentBerger [Mon, 23 Nov 2015 20:55:59 +0000 (21:55 +0100)]
fixed #5005: stitching_detailed.cpp
Vadim Pisarevsky [Mon, 23 Nov 2015 18:36:41 +0000 (18:36 +0000)]
Merge pull request #5400 from dtmoodie:thrust_tutorial
Vadim Pisarevsky [Mon, 23 Nov 2015 18:35:25 +0000 (18:35 +0000)]
Merge pull request #5620 from paroj:calibratecpp
Vadim Pisarevsky [Mon, 23 Nov 2015 18:34:30 +0000 (18:34 +0000)]
Merge pull request #5661 from mbarann:fix_msmf_write_vertically_flipped_video
Alexander Alekhin [Mon, 23 Nov 2015 16:28:03 +0000 (16:28 +0000)]
Merge pull request #5698 from lupustr3:pvlasov/ipp9_fixes
Vadim Pisarevsky [Mon, 23 Nov 2015 13:43:38 +0000 (13:43 +0000)]
Merge pull request #5644 from hoangviet1985:splitError
Vadim Pisarevsky [Mon, 23 Nov 2015 13:40:00 +0000 (13:40 +0000)]
Merge pull request #5390 from StevenPuttemans:add_markers_2.4
Vadim Pisarevsky [Mon, 23 Nov 2015 13:38:38 +0000 (13:38 +0000)]
Merge pull request #5682 from ilya-lavrenov:lintian-overrides
Vadim Pisarevsky [Mon, 23 Nov 2015 13:34:23 +0000 (13:34 +0000)]
Merge pull request #5635 from mzajko:xi_update
Pavel Vlasov [Mon, 23 Nov 2015 11:31:22 +0000 (14:31 +0300)]
Canny IPP Sobel getBufferSize wrong func fix;
Maksim Shabunin [Mon, 23 Nov 2015 09:52:41 +0000 (09:52 +0000)]
Merge pull request #5571 from jas0n1ee:master
Maksim Shabunin [Mon, 23 Nov 2015 09:51:23 +0000 (09:51 +0000)]
Merge pull request #5658 from berak:akaze_fix
hoangviet1985 [Sun, 22 Nov 2015 19:32:18 +0000 (14:32 -0500)]
remove redundant code
Maksim Shabunin [Sun, 22 Nov 2015 18:30:15 +0000 (18:30 +0000)]
Merge pull request #5449 from rokm:stereo-fixes
Maksim Shabunin [Sun, 22 Nov 2015 18:08:21 +0000 (18:08 +0000)]
Merge pull request #5298 from slothspot:master
Maksim Shabunin [Sun, 22 Nov 2015 18:07:13 +0000 (18:07 +0000)]
Merge pull request #5448 from Milania1:doc_normalize
Maksim Shabunin [Sun, 22 Nov 2015 18:05:45 +0000 (18:05 +0000)]
Merge pull request #5525 from Milania1:doc_normTypes
Maksim Shabunin [Sun, 22 Nov 2015 18:02:40 +0000 (18:02 +0000)]
Merge pull request #5649 from hoangviet1985:solve_pow(x,3)=0_opencv300
hoangviet1985 [Fri, 20 Nov 2015 20:03:32 +0000 (15:03 -0500)]
squash
Maksim Shabunin [Fri, 20 Nov 2015 16:15:47 +0000 (16:15 +0000)]
Merge pull request #5650 from hoangviet1985:fix_bug_5623
Maksim Shabunin [Fri, 20 Nov 2015 15:53:48 +0000 (15:53 +0000)]
Merge pull request #5666 from mshabunin:vs-run-py
Maksim Shabunin [Fri, 20 Nov 2015 15:37:50 +0000 (15:37 +0000)]
Merge pull request #5653 from jia-kai:fix-jpeg-exif
Maksim Shabunin [Fri, 20 Nov 2015 15:28:26 +0000 (15:28 +0000)]
Merge pull request #5663 from bertmsk:patch-1
Maksim Shabunin [Fri, 20 Nov 2015 15:26:39 +0000 (15:26 +0000)]
Merge pull request #5665 from paroj:matx_norm
Maksim Shabunin [Fri, 20 Nov 2015 15:18:25 +0000 (15:18 +0000)]
Merge pull request #5681 from sturkmen72:patch-3
Alexander Alekhin [Fri, 20 Nov 2015 12:11:08 +0000 (12:11 +0000)]
Merge pull request #5685 from lupustr3:pvlasov/ipp9_fixes
Pavel Vlasov [Thu, 19 Nov 2015 15:38:47 +0000 (18:38 +0300)]
IPP Sobel getBufferSize wrong func fix;
Ilya Lavrenov [Thu, 19 Nov 2015 13:51:30 +0000 (16:51 +0300)]
added lintian overrides for debian packages
Maksim Shabunin [Thu, 19 Nov 2015 12:32:42 +0000 (15:32 +0300)]
fixup! run.py: issues with forced configuration fixed
Alexander Alekhin [Thu, 19 Nov 2015 10:10:13 +0000 (10:10 +0000)]
Merge pull request #5671 from PhilLab:patch-7
Rok Mandeljc [Tue, 24 Mar 2015 20:12:54 +0000 (21:12 +0100)]
cudastereo: document lack of fractional bits in 16-bit signed format for StereoBeliefPropagation
Rok Mandeljc [Tue, 24 Mar 2015 20:07:46 +0000 (21:07 +0100)]
cudastereo: updated documentation for reprojectImage3D and drawColorDisp
Updated the list of supported input formats, added note about 16-bit
signed format (no fractional bits).
Rok Mandeljc [Tue, 24 Mar 2015 20:06:31 +0000 (21:06 +0100)]
calib3d: improve documentation of reprojectImageTo3D
Make a note about 16-bit signed format - the function assumes that
values have no fractional bits (so 16-bit disparity from StereoBM
and StereoSGBM cannot be directly used!)
Rok Mandeljc [Tue, 24 Mar 2015 17:10:22 +0000 (18:10 +0100)]
cudastereo: drawColorDisp: enabled CV_32S and CV_32F disparity formats
Rok Mandeljc [Tue, 24 Mar 2015 16:23:21 +0000 (17:23 +0100)]
cudastereo: reprojectImageTo3D: enabled CV_32S and CV_32F disparity formats
This is to achieve parity with the CPU equivalent.
Maksim Shabunin [Thu, 19 Nov 2015 09:25:35 +0000 (09:25 +0000)]
Merge pull request #5659 from jet47:cuda-wrap-stream-2.4
Maksim Shabunin [Thu, 19 Nov 2015 09:18:23 +0000 (09:18 +0000)]
Merge pull request #5672 from ilya-lavrenov:npp-graphcut
Suleyman TURKMEN [Wed, 18 Nov 2015 22:25:36 +0000 (00:25 +0200)]
Update imgcodecs.hpp
Vadim Pisarevsky [Tue, 17 Nov 2015 17:55:23 +0000 (17:55 +0000)]
Merge pull request #5654 from mshabunin:ios-framework
Vadim Pisarevsky [Tue, 17 Nov 2015 17:30:07 +0000 (17:30 +0000)]
Merge pull request #5674 from mshabunin:mac-fix-2.4
Maksim Shabunin [Mon, 16 Nov 2015 15:07:24 +0000 (18:07 +0300)]
Fix compilation problems with XCode 7.1.1 and cmake 3.3.2
Maksim Shabunin [Wed, 11 Nov 2015 13:12:35 +0000 (16:12 +0300)]
New variant of iOS framework building, fixed some warnings for XCode 7.1.1 and cmake 3.3.2
Maksim Shabunin [Mon, 16 Nov 2015 11:02:26 +0000 (14:02 +0300)]
run.py: issues with forced configuration fixed
Philipp Hasper [Mon, 16 Nov 2015 07:40:09 +0000 (08:40 +0100)]
Fixed mjpeg frame size attribution
Ilya Lavrenov [Sat, 14 Nov 2015 21:56:56 +0000 (00:56 +0300)]
GraphCut deprecated in 7.5 and removed in 8.0
Maksim Shabunin [Fri, 13 Nov 2015 09:26:39 +0000 (12:26 +0300)]
Fix run.py test detection issues for debug VS configurations
Maksim Shabunin [Fri, 13 Nov 2015 15:47:17 +0000 (15:47 +0000)]
Merge pull request #5640 from mshabunin:restore-ts-gpu
Pavel Rojtberg [Fri, 13 Nov 2015 13:29:56 +0000 (14:29 +0100)]
support for NORM_L2SQR in norm(Matx<..>)
Bert [Fri, 13 Nov 2015 08:03:34 +0000 (11:03 +0300)]
Update system.cpp
FreeBSD compilation fix
mbarann [Thu, 12 Nov 2015 12:13:45 +0000 (13:13 +0100)]
MSMF expects a bottom-up video frame, so the buffer pointer must point to the end of the data and the stride needs to be negative
berak [Thu, 12 Nov 2015 05:26:42 +0000 (06:26 +0100)]
AKAZE: check channels instead of type in detectAndCompute
add same CV_32F and CV_16U support for KAZE
Vladislav Vinogradov [Thu, 12 Nov 2015 10:07:30 +0000 (13:07 +0300)]
add cv::gpu::StreamAccessor::wrapStream method
it allows to import existed CUDA stream to OpenCV
Alexander Alekhin [Thu, 12 Nov 2015 03:10:46 +0000 (03:10 +0000)]
Merge pull request #5652 from jet47:core-test-math-warning-fix
Alexander Alekhin [Thu, 12 Nov 2015 03:10:11 +0000 (03:10 +0000)]
Merge pull request #5655 from janstarzy:2.4-canny-fix
Pavel Rojtberg [Fri, 6 Nov 2015 11:02:31 +0000 (12:02 +0100)]
use cpp functions in CvLevMarq::step for better readability
Jan Starzynski [Wed, 11 Nov 2015 15:19:20 +0000 (16:19 +0100)]
fix potential buffer overflow as in 3.0
jiakai [Wed, 11 Nov 2015 12:17:24 +0000 (20:17 +0800)]
check offset in ExifReader::getString
Vladislav Vinogradov [Wed, 11 Nov 2015 08:53:39 +0000 (11:53 +0300)]
fix signed/unsigned comparison warning in core/test/test_math.cpp
hoangviet1985 [Tue, 10 Nov 2015 21:18:07 +0000 (16:18 -0500)]
The right signs give the right results
Dan [Tue, 10 Nov 2015 17:29:51 +0000 (12:29 -0500)]
Merge branch 'thrust_tutorial' of github.com/dtmoodie/opencv into thrust_tutorial
Dan [Tue, 10 Nov 2015 17:29:29 +0000 (12:29 -0500)]
Corrected the case where channel == -1
Vadim Pisarevsky [Tue, 10 Nov 2015 17:02:21 +0000 (17:02 +0000)]
Merge pull request #5480 from dtmoodie:vecgpumat
Vadim Pisarevsky [Tue, 10 Nov 2015 16:53:36 +0000 (16:53 +0000)]
Merge pull request #5340 from alalek:ocl_off
Marian Zajko [Tue, 10 Nov 2015 16:18:10 +0000 (17:18 +0100)]
Fixed downsampling parameter enumerator backward compatibility.
Vadim Pisarevsky [Tue, 10 Nov 2015 16:15:26 +0000 (16:15 +0000)]
Merge pull request #5597 from andy-held:cmakecudacross
Vadim Pisarevsky [Tue, 10 Nov 2015 16:14:43 +0000 (16:14 +0000)]
Merge pull request #5472 from StevenPuttemans:remove_unexisting_function
Vadim Pisarevsky [Tue, 10 Nov 2015 16:13:26 +0000 (16:13 +0000)]
Merge pull request #5605 from hoangviet1985:fix_bug_5599
Vadim Pisarevsky [Tue, 10 Nov 2015 16:03:48 +0000 (16:03 +0000)]
Merge pull request #5622 from LorenaGdL:hitAndMiss2.4
Vadim Pisarevsky [Tue, 10 Nov 2015 16:01:48 +0000 (16:01 +0000)]
Merge pull request #5638 from hoangviet1985:fix_bug_5623
Vadim Pisarevsky [Tue, 10 Nov 2015 15:56:23 +0000 (15:56 +0000)]
Merge pull request #5645 from jia-kai:master
Vadim Pisarevsky [Tue, 10 Nov 2015 15:56:05 +0000 (15:56 +0000)]
Merge pull request #5646 from brossetti:patch-1
Marian Zajko [Tue, 10 Nov 2015 11:25:57 +0000 (12:25 +0100)]
Removed trailing whitespace.
Marian Zajko [Tue, 10 Nov 2015 11:07:19 +0000 (12:07 +0100)]
Fixed parameter enumrators list order to retain binary compatibility.
Marian Zajko [Mon, 9 Nov 2015 12:30:08 +0000 (13:30 +0100)]
Removed whitespaces reported by buildbot.
Marian Zajko [Mon, 9 Nov 2015 11:07:53 +0000 (12:07 +0100)]
Fixed whitespace issue
Removed tabulators from enumerators and ximea adapter source as reported
by precommit docs test.
brossetti [Mon, 9 Nov 2015 09:37:59 +0000 (04:37 -0500)]
fixed bug on left mouse button click
Adding None as outImage in pos3 of cv2.drawKeypoints. Fixes bug that throws 'TypeError: Required argument 'outImage' (pos 3) not found' on left mouse button click
projects / platform / upstream / opencv.git / log