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
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.
Alexander Alekhin [Tue, 24 Nov 2015 20:03:49 +0000 (20:03 +0000)]
Merge pull request #4110 from LaurentBerger:Bug4370
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: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 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;
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.
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
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
Maksim Shabunin [Fri, 13 Nov 2015 09:26:39 +0000 (12:26 +0300)]
Fix run.py test detection issues for debug VS configurations
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
Pavel Rojtberg [Fri, 6 Nov 2015 11:02:31 +0000 (12:02 +0100)]
use cpp functions in CvLevMarq::step for better readability
jiakai [Wed, 11 Nov 2015 12:17:24 +0000 (20:17 +0800)]
check offset in ExifReader::getString
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 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
Pavel Rojtberg [Tue, 3 Nov 2015 11:30:29 +0000 (12:30 +0100)]
use cpp functions in cvCalibrateCamera2 to make it more readable
Marian Zajko [Thu, 5 Nov 2015 14:56:47 +0000 (15:56 +0100)]
XIMEA adapter update
- replaced m3api/m3apiX64 binaries with latest xiapi32/xiapi64 to
support latest camera models
- added new parameter definitions to videoio_c.h and
SetProperty/GetProperty calls
- added acquisition resetting for specific parmateters in SetProperty
call
- added new error return value evaluators
Maksim Shabunin [Thu, 5 Nov 2015 14:17:18 +0000 (17:17 +0300)]
Added some documentation for MSER
jiakai [Thu, 5 Nov 2015 10:32:51 +0000 (18:32 +0800)]
check for exifSize
jiakai [Thu, 5 Nov 2015 09:58:35 +0000 (17:58 +0800)]
check boundary in ExifReader
Andreas Franek [Fri, 30 Oct 2015 17:28:19 +0000 (18:28 +0100)]
Simplifies cross compilation with CUDA for ARM boards. CUDA arch is set for all ARM targets, --unresolved-symbols=ignore-in-shared-libs is set when cross-compiling for ARM and FindCUDA.cmake was adjusted to find shared library stubs within the CUDA toolkit.
Vadim Pisarevsky [Tue, 3 Nov 2015 10:59:45 +0000 (10:59 +0000)]
Merge pull request #5455 from michaelveth:matlab_cmake_unix_fix
Vadim Pisarevsky [Tue, 3 Nov 2015 10:58:57 +0000 (10:58 +0000)]
Merge pull request #5388 from alalek:disable_invalid_string_usage
Alexander Alekhin [Tue, 3 Nov 2015 10:18:44 +0000 (10:18 +0000)]
Merge pull request #5617 from lupustr3:pvlasov/ipp9_fixes
Vadim Pisarevsky [Mon, 2 Nov 2015 15:58:58 +0000 (15:58 +0000)]
Merge pull request #5518 from Bovaz:master
Vadim Pisarevsky [Mon, 2 Nov 2015 15:45:59 +0000 (15:45 +0000)]
Merge pull request #5484 from PolarNick239:master
Vadim Pisarevsky [Mon, 2 Nov 2015 15:45:38 +0000 (15:45 +0000)]
Merge pull request #5386 from StevenPuttemans:add_markers
Pavel Vlasov [Mon, 2 Nov 2015 15:00:22 +0000 (18:00 +0300)]
Fix for copy with mask 32s and 8u;
Vadim Pisarevsky [Mon, 2 Nov 2015 12:26:53 +0000 (12:26 +0000)]
Merge pull request #5487 from Wangyida:python
Vadim Pisarevsky [Mon, 2 Nov 2015 11:55:12 +0000 (11:55 +0000)]
Merge pull request #5607 from n3011:patch-1
Vadim Pisarevsky [Mon, 2 Nov 2015 11:53:08 +0000 (11:53 +0000)]
Merge pull request #5512 from edgarriba:gdal_lan
Vadim Pisarevsky [Mon, 2 Nov 2015 11:49:37 +0000 (11:49 +0000)]
Merge pull request #5515 from LorenaGdL:hitAndMiss
Vadim Pisarevsky [Mon, 2 Nov 2015 11:39:43 +0000 (11:39 +0000)]
Merge pull request #5582 from sizeofvoid:master
Vadim Pisarevsky [Mon, 2 Nov 2015 11:38:02 +0000 (11:38 +0000)]
Merge pull request #5587 from lupustr3:pvlasov/ipp_cond_update
Vadim Pisarevsky [Mon, 2 Nov 2015 11:37:34 +0000 (11:37 +0000)]
Merge pull request #5602 from ChrisKitching:clearerMatErrors
Vadim Pisarevsky [Mon, 2 Nov 2015 11:36:03 +0000 (11:36 +0000)]
Merge pull request #5592 from berak:python_rect2d
Vadim Pisarevsky [Mon, 2 Nov 2015 11:32:17 +0000 (11:32 +0000)]
Merge pull request #5595 from mshabunin:fix-bitonal-tif
Vadim Pisarevsky [Mon, 2 Nov 2015 11:22:25 +0000 (11:22 +0000)]
Merge pull request #5598 from ajbernal:ocl_bilateral_bugfix
Vadim Pisarevsky [Mon, 2 Nov 2015 11:15:08 +0000 (11:15 +0000)]
Merge pull request #5600 from grundman:patch-3
Vadim Pisarevsky [Mon, 2 Nov 2015 11:14:39 +0000 (11:14 +0000)]
Merge pull request #5608 from n3011:patch-2
Vadim Pisarevsky [Mon, 2 Nov 2015 11:14:24 +0000 (11:14 +0000)]
Merge pull request #5609 from n3011:patch-3
Vadim Pisarevsky [Mon, 2 Nov 2015 11:13:49 +0000 (11:13 +0000)]
Merge pull request #5610 from n3011:patch-4
Ishant Mrinal Haloi [Mon, 2 Nov 2015 07:08:27 +0000 (15:08 +0800)]
Update driver_api_stereo_multi.cpp
Ishant Mrinal Haloi [Mon, 2 Nov 2015 07:07:45 +0000 (15:07 +0800)]
Update cascadeclassifier_nvidia_api.cpp
Ishant Mrinal Haloi [Mon, 2 Nov 2015 07:06:38 +0000 (15:06 +0800)]
Update driver_api_multi.cpp
Ishant Mrinal Haloi [Mon, 2 Nov 2015 07:05:45 +0000 (15:05 +0800)]
Update multi.cpp
edgarriba [Sun, 1 Nov 2015 11:07:05 +0000 (12:07 +0100)]
set GA_ReadOnly flag again since test error
Chris Kitching [Sun, 1 Nov 2015 00:50:44 +0000 (00:50 +0000)]
Make Mat assertion failures more helpful
Instead of chaining a bunch of sanity checks together with "&&", let's just have several asserts. That way, when an assert fails, you don't get a monsterous "<huge evil expression>
failed" error, but only the bit you care about, making your life rather a lot easier.
edgarriba [Sat, 31 Oct 2015 19:18:41 +0000 (20:18 +0100)]
Merge branch 'master' of https://github.com/Itseez/opencv into gdal_lan
Conflicts:
modules/imgcodecs/include/opencv2/imgcodecs.hpp
edgarriba [Sat, 31 Oct 2015 19:11:05 +0000 (20:11 +0100)]
set GA_Update flag in order remove ERROR 8: band 1: Attempt to write to read only dataset inGDALRasterBand::Fill()
edgarriba [Sat, 31 Oct 2015 19:00:39 +0000 (20:00 +0100)]
add support for float32 and float 64
grundman [Sat, 31 Oct 2015 00:48:04 +0000 (17:48 -0700)]
Fix incorrect FPS value returned by cap.get(CV_CAP_PROP_FPS)
Current implementation returns NaN for some configs of FFMPEG, call default get_fps() instead (as also used by PROP_POS_MSEC)
Ariel Bernal [Fri, 30 Oct 2015 16:39:11 +0000 (09:39 -0700)]
Fix for #5590. OpenCL BilateralFilter implementation failes to
build for some OCL drivers.
Some OCL vendors treat implicit scalar-vector conversions for
operators as errors when type conversion is required.
Hajo Nils Krabbenhöft [Wed, 16 Sep 2015 20:04:42 +0000 (22:04 +0200)]
Fixed crash when reading b/w tif images (fixes #5579)