askourik [Thu, 19 Nov 2015 04:06:20 +0000 (07:06 +0300)]
Add treelookups for nonintel
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
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
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
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
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)
Maksim Shabunin [Fri, 30 Oct 2015 13:45:59 +0000 (13:45 +0000)]
Merge pull request #5384 from mshabunin:run-py-changes
berak [Fri, 30 Oct 2015 09:02:33 +0000 (10:02 +0100)]
add Rect2d to python bindings
Pavel Vlasov [Thu, 29 Oct 2015 10:21:13 +0000 (13:21 +0300)]
Condition update for 8u IPP in GaussianBlur. Bug was fixed in 9.0.1;
Maksim Shabunin [Tue, 15 Sep 2015 12:14:10 +0000 (15:14 +0300)]
ts: refactor run.py script
Wangyida [Sun, 11 Oct 2015 04:12:42 +0000 (12:12 +0800)]
python modification for Point3D
Rafael Sadowski [Wed, 28 Oct 2015 21:47:00 +0000 (22:47 +0100)]
fix cmake OpenBSD linker libs
OpenBSD needs m and pthread like Net- and FreeBSD.
Alexander Alekhin [Mon, 26 Oct 2015 10:47:28 +0000 (10:47 +0000)]
Merge pull request #5370 from berak:fix_svm_autoTrain
Alexander Alekhin [Sun, 25 Oct 2015 15:18:08 +0000 (15:18 +0000)]
Merge pull request #5538 from micalan:JpegExif
Alexander Alekhin [Sat, 24 Oct 2015 14:38:38 +0000 (14:38 +0000)]
Merge pull request #5570 from paroj:qsliderfix
Alexander Alekhin [Sat, 24 Oct 2015 14:38:02 +0000 (14:38 +0000)]
Merge pull request #5553 from pletessier:aspect-ratio
Pierre Letessier [Sat, 24 Oct 2015 09:22:18 +0000 (11:22 +0200)]
Changed CV_FFMPEG_CAP_PROP_SAR_* values
Lorena García [Fri, 23 Oct 2015 22:33:36 +0000 (00:33 +0200)]
Changed src matrix complement computation
Lorena García [Fri, 23 Oct 2015 22:22:50 +0000 (00:22 +0200)]
Fixed CV_Assert
Pavel Rojtberg [Fri, 23 Oct 2015 19:42:11 +0000 (21:42 +0200)]
fix compilation with qt
QSlider does not have getMinimum/Maximum getters. Probably was not
compile tested.
Pierre Letessier [Wed, 21 Oct 2015 08:32:38 +0000 (10:32 +0200)]
Added CV_CAP_PROP_SAR properties to videoio module
micalan [Sun, 11 Oct 2015 07:08:32 +0000 (10:08 +0300)]
Camera orientation handling is added for jpeg files
Alexander Alekhin [Fri, 23 Oct 2015 16:35:36 +0000 (16:35 +0000)]
Merge pull request #5489 from paroj:v4l2noconvert
Alexander Alekhin [Fri, 23 Oct 2015 16:28:26 +0000 (16:28 +0000)]
Merge pull request #5474 from paroj:v4l2ctrls
Maksim Shabunin [Fri, 23 Oct 2015 10:58:10 +0000 (10:58 +0000)]
Merge pull request #5562 from rodrigob:patch-2
Rodrigo Benenson [Thu, 22 Oct 2015 21:27:55 +0000 (23:27 +0200)]
mush -> must
fixed typo
Alexander Alekhin [Thu, 22 Oct 2015 16:28:41 +0000 (16:28 +0000)]
Merge pull request #5531 from mshabunin:fix-vs2015
Alexander Alekhin [Thu, 22 Oct 2015 12:37:40 +0000 (12:37 +0000)]
Merge pull request #5513 from jet47:ctest-extended-support
Maksim Shabunin [Thu, 22 Oct 2015 12:27:45 +0000 (12:27 +0000)]
Merge pull request #5499 from StevenPuttemans:fix_mask_notice_copyTo
Maksim Shabunin [Thu, 22 Oct 2015 12:25:47 +0000 (12:25 +0000)]
Merge pull request #5365 from sturkmen72:patch-2
Maksim Shabunin [Thu, 22 Oct 2015 12:24:47 +0000 (12:24 +0000)]
Merge pull request #5432 from sturkmen72:patch-11
Maksim Shabunin [Thu, 22 Oct 2015 09:44:03 +0000 (12:44 +0300)]
Enable temp objects destruction test for VS versions less than 2015
Vadim Pisarevsky [Wed, 21 Oct 2015 11:54:52 +0000 (11:54 +0000)]
Merge pull request #5539 from sturkmen72:patch-14
Vadim Pisarevsky [Wed, 21 Oct 2015 11:54:30 +0000 (11:54 +0000)]
Merge pull request #5532 from grundman:patch-2
Vadim Pisarevsky [Wed, 21 Oct 2015 11:46:27 +0000 (11:46 +0000)]
Merge pull request #5542 from renatoGarcia:matx_constructors
Vadim Pisarevsky [Wed, 21 Oct 2015 11:44:35 +0000 (11:44 +0000)]
Merge pull request #5543 from aman11dhanpat:master
Vadim Pisarevsky [Wed, 21 Oct 2015 11:41:25 +0000 (11:41 +0000)]
Merge pull request #5548 from berak:patch-2
berak [Tue, 20 Oct 2015 09:57:29 +0000 (11:57 +0200)]
update python features2d tutorials
Suleyman TURKMEN [Fri, 18 Sep 2015 08:39:39 +0000 (11:39 +0300)]
Update face detection samples
Maksim Shabunin [Tue, 20 Oct 2015 14:43:33 +0000 (14:43 +0000)]
Merge pull request #5519 from hyunkim9123:camshift_py
Maksim Shabunin [Fri, 16 Oct 2015 14:10:00 +0000 (17:10 +0300)]
Visual Studio 2015 warning and test fixes
Alexander Alekhin [Mon, 19 Oct 2015 15:27:35 +0000 (15:27 +0000)]
Merge pull request #5431 from MiguelAlgaba:em_one_cluster
Aman Verma [Mon, 19 Oct 2015 10:58:43 +0000 (10:58 +0000)]
Fixing compilation errors in windows and mac
Aman Verma [Mon, 19 Oct 2015 08:44:06 +0000 (08:44 +0000)]
Fix for #5495 : add setTrackbarMin
Renato Florentino Garcia [Mon, 19 Oct 2015 01:16:21 +0000 (23:16 -0200)]
Fix behavior of Matx 12 and 16 args constructors.
The 12 and 16 arguments Matx constructors differs from all others,
leaving values initialized and requiring the argument number to be equal
to the channels number.
Suleyman TURKMEN [Sun, 18 Oct 2015 11:50:39 +0000 (14:50 +0300)]
Update imgproc.hpp
Pavel Rojtberg [Sun, 11 Oct 2015 13:23:47 +0000 (15:23 +0200)]
cap_v4l: implement PROP_CONVERT_RGB
allows disabling automatic conversion to RGB for certain formats. If
conversion is disabled the returned image just points to the underlying
buffer, so no memcpy is performed.
Note that we do not check image size in retrieve frame any more as it
can not possibly while the device is streaming.
Furthermore this code was disabled altogether by the wrong ifdef in the
previous commit.
Pavel Rojtberg [Sun, 11 Oct 2015 14:28:01 +0000 (16:28 +0200)]
fix wrong ifdef bracketing
in the case of HAVE_CAMV4L2 && !HAVE_CAMV4L there was no body for the if
statement.
Pavel Rojtberg [Sun, 11 Oct 2015 16:06:02 +0000 (18:06 +0200)]
add python sample to test/ showcase new cap_v4l2 features
Pavel Rojtberg [Sat, 10 Oct 2015 11:42:26 +0000 (13:42 +0200)]
replace custom yuyv_to_rgb24 implementation by cvtColor
Pavel Rojtberg [Sat, 10 Oct 2015 11:14:57 +0000 (13:14 +0200)]
avoid needless copies during mjpeg decoding
Pavel Rojtberg [Sun, 18 Oct 2015 11:37:31 +0000 (13:37 +0200)]
remove additional V4L2 pixelformat defines
they are upstream since at least linux 2.6.8 (10 Years)
http://lxr.oss.org.cn/ident?v=2.6.8&i=V4L2_PIX_FMT_SBGGR8
Pavel Rojtberg [Sat, 10 Oct 2015 10:39:37 +0000 (12:39 +0200)]
simplify autosetup_capture_mode_v4l2 by using a for loop
Pavel Rojtberg [Sat, 10 Oct 2015 10:26:08 +0000 (12:26 +0200)]
implement CAP_PROP_MODE, CAP_PROP_FOURCC and CAP_PROP_FORMAT
do not use a custom enum instead of the V4L2 fourcc defines for palette.
This way we can easily implement CAP_PROP_FOURCC and CAP_PROP_MODE.
Pavel Rojtberg [Fri, 9 Oct 2015 14:01:14 +0000 (16:01 +0200)]
allow changing FPS and Image Size using V4L2
use logic similar to cap_libv4l: replace icvSetVideoSize by v4l2_reset
as it was not used for V4L1, the actual frame format is negotiated in
try_palette_v4l2 and the stream has to restarted anyway.
Pavel Rojtberg [Fri, 9 Oct 2015 10:05:29 +0000 (12:05 +0200)]
allow icvGetPropertyCAM_V4L to return zero
now icvGetPropertyCAM_V4L behaves the same as in cap_libv4l. This also
fixes passing boolean values.
Pavel Rojtberg [Thu, 8 Oct 2015 14:56:18 +0000 (16:56 +0200)]
support setting focus and autofocus with V4L2
also refactor property range handling and opencv property to V4L2
translation.
grundman [Fri, 16 Oct 2015 18:19:27 +0000 (11:19 -0700)]
Fix racy modification of ForThread::m_state during invocation of stop()
paul.kim [Thu, 15 Oct 2015 02:03:46 +0000 (11:03 +0900)]
Fix the issue in mouse click event
Bovaz [Thu, 15 Oct 2015 02:02:41 +0000 (19:02 -0700)]
Merge pull request #1 from Bovaz/Bovaz-patch-1
sqrtf to std::sqrt