platform/upstream/opencv.git
8 years agoMerge pull request #5388 from alalek:disable_invalid_string_usage
Vadim Pisarevsky [Tue, 3 Nov 2015 10:58:57 +0000 (10:58 +0000)]
Merge pull request #5388 from alalek:disable_invalid_string_usage

8 years agoMerge pull request #5617 from lupustr3:pvlasov/ipp9_fixes
Alexander Alekhin [Tue, 3 Nov 2015 10:18:44 +0000 (10:18 +0000)]
Merge pull request #5617 from lupustr3:pvlasov/ipp9_fixes

8 years agoMerge pull request #5518 from Bovaz:master
Vadim Pisarevsky [Mon, 2 Nov 2015 15:58:58 +0000 (15:58 +0000)]
Merge pull request #5518 from Bovaz:master

8 years agoMerge pull request #5484 from PolarNick239:master
Vadim Pisarevsky [Mon, 2 Nov 2015 15:45:59 +0000 (15:45 +0000)]
Merge pull request #5484 from PolarNick239:master

8 years agoMerge pull request #5386 from StevenPuttemans:add_markers
Vadim Pisarevsky [Mon, 2 Nov 2015 15:45:38 +0000 (15:45 +0000)]
Merge pull request #5386 from StevenPuttemans:add_markers

8 years agoFix for copy with mask 32s and 8u;
Pavel Vlasov [Mon, 2 Nov 2015 15:00:22 +0000 (18:00 +0300)]
Fix for copy with mask 32s and 8u;

8 years agoMerge pull request #5487 from Wangyida:python
Vadim Pisarevsky [Mon, 2 Nov 2015 12:26:53 +0000 (12:26 +0000)]
Merge pull request #5487 from Wangyida:python

8 years agoMerge pull request #5607 from n3011:patch-1
Vadim Pisarevsky [Mon, 2 Nov 2015 11:55:12 +0000 (11:55 +0000)]
Merge pull request #5607 from n3011:patch-1

8 years agoMerge pull request #5512 from edgarriba:gdal_lan
Vadim Pisarevsky [Mon, 2 Nov 2015 11:53:08 +0000 (11:53 +0000)]
Merge pull request #5512 from edgarriba:gdal_lan

8 years agoMerge pull request #5515 from LorenaGdL:hitAndMiss
Vadim Pisarevsky [Mon, 2 Nov 2015 11:49:37 +0000 (11:49 +0000)]
Merge pull request #5515 from LorenaGdL:hitAndMiss

8 years agoMerge pull request #5582 from sizeofvoid:master
Vadim Pisarevsky [Mon, 2 Nov 2015 11:39:43 +0000 (11:39 +0000)]
Merge pull request #5582 from sizeofvoid:master

8 years agoMerge pull request #5587 from lupustr3:pvlasov/ipp_cond_update
Vadim Pisarevsky [Mon, 2 Nov 2015 11:38:02 +0000 (11:38 +0000)]
Merge pull request #5587 from lupustr3:pvlasov/ipp_cond_update

8 years agoMerge pull request #5602 from ChrisKitching:clearerMatErrors
Vadim Pisarevsky [Mon, 2 Nov 2015 11:37:34 +0000 (11:37 +0000)]
Merge pull request #5602 from ChrisKitching:clearerMatErrors

8 years agoMerge pull request #5592 from berak:python_rect2d
Vadim Pisarevsky [Mon, 2 Nov 2015 11:36:03 +0000 (11:36 +0000)]
Merge pull request #5592 from berak:python_rect2d

8 years agoMerge pull request #5595 from mshabunin:fix-bitonal-tif
Vadim Pisarevsky [Mon, 2 Nov 2015 11:32:17 +0000 (11:32 +0000)]
Merge pull request #5595 from mshabunin:fix-bitonal-tif

8 years agoMerge pull request #5598 from ajbernal:ocl_bilateral_bugfix
Vadim Pisarevsky [Mon, 2 Nov 2015 11:22:25 +0000 (11:22 +0000)]
Merge pull request #5598 from ajbernal:ocl_bilateral_bugfix

8 years agoMerge pull request #5600 from grundman:patch-3
Vadim Pisarevsky [Mon, 2 Nov 2015 11:15:08 +0000 (11:15 +0000)]
Merge pull request #5600 from grundman:patch-3

8 years agoMerge pull request #5608 from n3011:patch-2
Vadim Pisarevsky [Mon, 2 Nov 2015 11:14:39 +0000 (11:14 +0000)]
Merge pull request #5608 from n3011:patch-2

8 years agoMerge pull request #5609 from n3011:patch-3
Vadim Pisarevsky [Mon, 2 Nov 2015 11:14:24 +0000 (11:14 +0000)]
Merge pull request #5609 from n3011:patch-3

8 years agoMerge pull request #5610 from n3011:patch-4
Vadim Pisarevsky [Mon, 2 Nov 2015 11:13:49 +0000 (11:13 +0000)]
Merge pull request #5610 from n3011:patch-4

8 years agoUpdate driver_api_stereo_multi.cpp
Ishant Mrinal Haloi [Mon, 2 Nov 2015 07:08:27 +0000 (15:08 +0800)]
Update driver_api_stereo_multi.cpp

8 years agoUpdate cascadeclassifier_nvidia_api.cpp
Ishant Mrinal Haloi [Mon, 2 Nov 2015 07:07:45 +0000 (15:07 +0800)]
Update cascadeclassifier_nvidia_api.cpp

8 years agoUpdate driver_api_multi.cpp
Ishant Mrinal Haloi [Mon, 2 Nov 2015 07:06:38 +0000 (15:06 +0800)]
Update driver_api_multi.cpp

8 years agoUpdate multi.cpp
Ishant Mrinal Haloi [Mon, 2 Nov 2015 07:05:45 +0000 (15:05 +0800)]
Update multi.cpp

8 years agoset GA_ReadOnly flag again since test error
edgarriba [Sun, 1 Nov 2015 11:07:05 +0000 (12:07 +0100)]
set GA_ReadOnly flag again since test error

8 years agoMake Mat assertion failures more helpful
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.

8 years agoMerge branch 'master' of https://github.com/Itseez/opencv into gdal_lan
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

8 years agoset GA_Update flag in order remove ERROR 8: band 1: Attempt to write to read only...
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()

8 years agoadd support for float32 and float 64
edgarriba [Sat, 31 Oct 2015 19:00:39 +0000 (20:00 +0100)]
add support for float32 and float 64

8 years agoFix incorrect FPS value returned by cap.get(CV_CAP_PROP_FPS)
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)

8 years agoFix for #5590. OpenCL BilateralFilter implementation failes to
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.

8 years agoFixed crash when reading b/w tif images (fixes #5579)
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)

8 years agoMerge pull request #5384 from mshabunin:run-py-changes
Maksim Shabunin [Fri, 30 Oct 2015 13:45:59 +0000 (13:45 +0000)]
Merge pull request #5384 from mshabunin:run-py-changes

8 years agoadd Rect2d to python bindings
berak [Fri, 30 Oct 2015 09:02:33 +0000 (10:02 +0100)]
add Rect2d to python bindings

8 years agoCondition update for 8u IPP in GaussianBlur. Bug was fixed in 9.0.1;
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;

8 years agots: refactor run.py script
Maksim Shabunin [Tue, 15 Sep 2015 12:14:10 +0000 (15:14 +0300)]
ts: refactor run.py script

8 years agopython modification for Point3D
Wangyida [Sun, 11 Oct 2015 04:12:42 +0000 (12:12 +0800)]
python modification for Point3D

8 years agofix cmake OpenBSD linker libs
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.

8 years agoMerge pull request #5370 from berak:fix_svm_autoTrain
Alexander Alekhin [Mon, 26 Oct 2015 10:47:28 +0000 (10:47 +0000)]
Merge pull request #5370 from berak:fix_svm_autoTrain

8 years agoMerge pull request #5538 from micalan:JpegExif
Alexander Alekhin [Sun, 25 Oct 2015 15:18:08 +0000 (15:18 +0000)]
Merge pull request #5538 from micalan:JpegExif

8 years agoMerge pull request #5570 from paroj:qsliderfix
Alexander Alekhin [Sat, 24 Oct 2015 14:38:38 +0000 (14:38 +0000)]
Merge pull request #5570 from paroj:qsliderfix

8 years agoMerge pull request #5553 from pletessier:aspect-ratio
Alexander Alekhin [Sat, 24 Oct 2015 14:38:02 +0000 (14:38 +0000)]
Merge pull request #5553 from pletessier:aspect-ratio

8 years agoChanged CV_FFMPEG_CAP_PROP_SAR_* values
Pierre Letessier [Sat, 24 Oct 2015 09:22:18 +0000 (11:22 +0200)]
Changed CV_FFMPEG_CAP_PROP_SAR_* values

8 years agoChanged src matrix complement computation
Lorena García [Fri, 23 Oct 2015 22:33:36 +0000 (00:33 +0200)]
Changed src matrix complement computation

8 years agoFixed CV_Assert
Lorena García [Fri, 23 Oct 2015 22:22:50 +0000 (00:22 +0200)]
Fixed CV_Assert

8 years agofix compilation with qt
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.

8 years agoAdded CV_CAP_PROP_SAR properties to videoio module
Pierre Letessier [Wed, 21 Oct 2015 08:32:38 +0000 (10:32 +0200)]
Added CV_CAP_PROP_SAR properties to videoio module

8 years agoCamera orientation handling is added for jpeg files
micalan [Sun, 11 Oct 2015 07:08:32 +0000 (10:08 +0300)]
Camera orientation handling is added for jpeg files

8 years agoMerge pull request #5489 from paroj:v4l2noconvert
Alexander Alekhin [Fri, 23 Oct 2015 16:35:36 +0000 (16:35 +0000)]
Merge pull request #5489 from paroj:v4l2noconvert

8 years agoMerge pull request #5474 from paroj:v4l2ctrls
Alexander Alekhin [Fri, 23 Oct 2015 16:28:26 +0000 (16:28 +0000)]
Merge pull request #5474 from paroj:v4l2ctrls

8 years agoMerge pull request #5562 from rodrigob:patch-2
Maksim Shabunin [Fri, 23 Oct 2015 10:58:10 +0000 (10:58 +0000)]
Merge pull request #5562 from rodrigob:patch-2

8 years agomush -> must
Rodrigo Benenson [Thu, 22 Oct 2015 21:27:55 +0000 (23:27 +0200)]
mush -> must

fixed typo

8 years agoMerge pull request #5531 from mshabunin:fix-vs2015
Alexander Alekhin [Thu, 22 Oct 2015 16:28:41 +0000 (16:28 +0000)]
Merge pull request #5531 from mshabunin:fix-vs2015

8 years agoMerge pull request #5513 from jet47:ctest-extended-support
Alexander Alekhin [Thu, 22 Oct 2015 12:37:40 +0000 (12:37 +0000)]
Merge pull request #5513 from jet47:ctest-extended-support

8 years agoMerge pull request #5499 from StevenPuttemans:fix_mask_notice_copyTo
Maksim Shabunin [Thu, 22 Oct 2015 12:27:45 +0000 (12:27 +0000)]
Merge pull request #5499 from StevenPuttemans:fix_mask_notice_copyTo

8 years agoMerge pull request #5365 from sturkmen72:patch-2
Maksim Shabunin [Thu, 22 Oct 2015 12:25:47 +0000 (12:25 +0000)]
Merge pull request #5365 from sturkmen72:patch-2

8 years agoMerge pull request #5432 from sturkmen72:patch-11
Maksim Shabunin [Thu, 22 Oct 2015 12:24:47 +0000 (12:24 +0000)]
Merge pull request #5432 from sturkmen72:patch-11

8 years agoEnable temp objects destruction test for VS versions less than 2015
Maksim Shabunin [Thu, 22 Oct 2015 09:44:03 +0000 (12:44 +0300)]
Enable temp objects destruction test for VS versions less than 2015

8 years agoMerge pull request #5539 from sturkmen72:patch-14
Vadim Pisarevsky [Wed, 21 Oct 2015 11:54:52 +0000 (11:54 +0000)]
Merge pull request #5539 from sturkmen72:patch-14

8 years agoMerge pull request #5532 from grundman:patch-2
Vadim Pisarevsky [Wed, 21 Oct 2015 11:54:30 +0000 (11:54 +0000)]
Merge pull request #5532 from grundman:patch-2

8 years agoMerge pull request #5542 from renatoGarcia:matx_constructors
Vadim Pisarevsky [Wed, 21 Oct 2015 11:46:27 +0000 (11:46 +0000)]
Merge pull request #5542 from renatoGarcia:matx_constructors

8 years agoMerge pull request #5543 from aman11dhanpat:master
Vadim Pisarevsky [Wed, 21 Oct 2015 11:44:35 +0000 (11:44 +0000)]
Merge pull request #5543 from aman11dhanpat:master

8 years agoMerge pull request #5548 from berak:patch-2
Vadim Pisarevsky [Wed, 21 Oct 2015 11:41:25 +0000 (11:41 +0000)]
Merge pull request #5548 from berak:patch-2

8 years agoupdate python features2d tutorials
berak [Tue, 20 Oct 2015 09:57:29 +0000 (11:57 +0200)]
update python features2d tutorials

8 years agoUpdate face detection samples
Suleyman TURKMEN [Fri, 18 Sep 2015 08:39:39 +0000 (11:39 +0300)]
Update face detection samples

8 years agoMerge pull request #5519 from hyunkim9123:camshift_py
Maksim Shabunin [Tue, 20 Oct 2015 14:43:33 +0000 (14:43 +0000)]
Merge pull request #5519 from hyunkim9123:camshift_py

8 years agoVisual Studio 2015 warning and test fixes
Maksim Shabunin [Fri, 16 Oct 2015 14:10:00 +0000 (17:10 +0300)]
Visual Studio 2015 warning and test fixes

8 years agoMerge pull request #5431 from MiguelAlgaba:em_one_cluster
Alexander Alekhin [Mon, 19 Oct 2015 15:27:35 +0000 (15:27 +0000)]
Merge pull request #5431 from MiguelAlgaba:em_one_cluster

8 years agoFixing compilation errors in windows and mac
Aman Verma [Mon, 19 Oct 2015 10:58:43 +0000 (10:58 +0000)]
Fixing compilation errors in windows and mac

8 years agoFix for #5495 : add setTrackbarMin
Aman Verma [Mon, 19 Oct 2015 08:44:06 +0000 (08:44 +0000)]
Fix for #5495 : add setTrackbarMin

8 years agoFix behavior of Matx 12 and 16 args constructors.
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.

8 years agoUpdate imgproc.hpp
Suleyman TURKMEN [Sun, 18 Oct 2015 11:50:39 +0000 (14:50 +0300)]
Update imgproc.hpp

8 years agocap_v4l: implement PROP_CONVERT_RGB
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.

8 years agofix wrong ifdef bracketing
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.

8 years agoadd python sample to test/ showcase new cap_v4l2 features
Pavel Rojtberg [Sun, 11 Oct 2015 16:06:02 +0000 (18:06 +0200)]
add python sample to test/ showcase new cap_v4l2 features

8 years agoreplace custom yuyv_to_rgb24 implementation by cvtColor
Pavel Rojtberg [Sat, 10 Oct 2015 11:42:26 +0000 (13:42 +0200)]
replace custom yuyv_to_rgb24 implementation by cvtColor

8 years agoavoid needless copies during mjpeg decoding
Pavel Rojtberg [Sat, 10 Oct 2015 11:14:57 +0000 (13:14 +0200)]
avoid needless copies during mjpeg decoding

8 years agoremove additional V4L2 pixelformat defines
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

8 years agosimplify autosetup_capture_mode_v4l2 by using a for loop
Pavel Rojtberg [Sat, 10 Oct 2015 10:39:37 +0000 (12:39 +0200)]
simplify autosetup_capture_mode_v4l2 by using a for loop

8 years agoimplement CAP_PROP_MODE, CAP_PROP_FOURCC and CAP_PROP_FORMAT
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.

8 years agoallow changing FPS and Image Size using V4L2
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.

8 years agoallow icvGetPropertyCAM_V4L to return zero
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.

8 years agosupport setting focus and autofocus with V4L2
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.

8 years agoFix racy modification of ForThread::m_state during invocation of stop()
grundman [Fri, 16 Oct 2015 18:19:27 +0000 (11:19 -0700)]
Fix racy modification of ForThread::m_state during invocation of stop()

8 years agoFix the issue in mouse click event
paul.kim [Thu, 15 Oct 2015 02:03:46 +0000 (11:03 +0900)]
Fix the issue in mouse click event

8 years agoMerge pull request #1 from Bovaz/Bovaz-patch-1
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

8 years agosqrtf to std::sqrt
Bovaz [Thu, 15 Oct 2015 01:57:33 +0000 (18:57 -0700)]
sqrtf to std::sqrt

8 years agoSpeedup of arcLength
Matteo Piovanelli [Wed, 14 Oct 2015 20:37:48 +0000 (13:37 -0700)]
Speedup of arcLength

By my tests, this version of cv::arcLength is almost 10% faster than the
one using a buffer it replaces.

8 years agoMerge pull request #5478 from alalek:fix_android_pack_build
Alexander Alekhin [Wed, 14 Oct 2015 13:05:18 +0000 (13:05 +0000)]
Merge pull request #5478 from alalek:fix_android_pack_build

8 years agoHit&Miss morphological operation
Lorena García [Wed, 14 Oct 2015 11:30:09 +0000 (13:30 +0200)]
Hit&Miss morphological operation

8 years agoMerge pull request #5507 from rodrigob:patch-1
Alexander Alekhin [Wed, 14 Oct 2015 09:14:43 +0000 (09:14 +0000)]
Merge pull request #5507 from rodrigob:patch-1

8 years agoMerge pull request #5509 from spmallick:master
Alexander Alekhin [Wed, 14 Oct 2015 09:14:10 +0000 (09:14 +0000)]
Merge pull request #5509 from spmallick:master

8 years agoMerge pull request #5504 from aman11dhanpat:master
Alexander Alekhin [Wed, 14 Oct 2015 09:10:30 +0000 (09:10 +0000)]
Merge pull request #5504 from aman11dhanpat:master

8 years agoMerge pull request #5502 from AlexanderStohr:file-handle-volatile-fix
Alexander Alekhin [Wed, 14 Oct 2015 09:09:30 +0000 (09:09 +0000)]
Merge pull request #5502 from AlexanderStohr:file-handle-volatile-fix

8 years agoload multi/hyperspectral images with using gdal
edgarriba [Wed, 14 Oct 2015 07:16:04 +0000 (09:16 +0200)]
load multi/hyperspectral images with using gdal

8 years agoUpdate window_QT.h
spmallick [Tue, 13 Oct 2015 22:51:43 +0000 (15:51 -0700)]
Update window_QT.h

QPushButton was included twice.

8 years agoCommandLineParser missing gpu option
Rodrigo Benenson [Tue, 13 Oct 2015 17:04:06 +0000 (19:04 +0200)]
CommandLineParser missing gpu option

As is it was not possible to use CUDA.

8 years agoadd CTest support to build tree
Vladislav Vinogradov [Fri, 12 Dec 2014 15:21:57 +0000 (18:21 +0300)]
add CTest support to build tree

8 years agoassing labels to targets and sources
Vladislav Vinogradov [Tue, 9 Dec 2014 12:46:00 +0000 (15:46 +0300)]
assing labels to targets and sources

8 years agoMerge pull request #5493 from lupustr3:pvlasov/ipp9_fixes
Alexander Alekhin [Tue, 13 Oct 2015 14:24:09 +0000 (14:24 +0000)]
Merge pull request #5493 from lupustr3:pvlasov/ipp9_fixes