platform/upstream/opencv.git
8 years agoMerge pull request #5448 from Milania1:doc_normalize
Maksim Shabunin [Sun, 22 Nov 2015 18:07:13 +0000 (18:07 +0000)]
Merge pull request #5448 from Milania1:doc_normalize

8 years agoMerge pull request #5525 from Milania1:doc_normTypes
Maksim Shabunin [Sun, 22 Nov 2015 18:05:45 +0000 (18:05 +0000)]
Merge pull request #5525 from Milania1:doc_normTypes

8 years agoMerge pull request #5649 from hoangviet1985:solve_pow(x,3)=0_opencv300
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

8 years agosquash
hoangviet1985 [Fri, 20 Nov 2015 20:03:32 +0000 (15:03 -0500)]
squash

8 years agoMerge pull request #5666 from mshabunin:vs-run-py
Maksim Shabunin [Fri, 20 Nov 2015 15:53:48 +0000 (15:53 +0000)]
Merge pull request #5666 from mshabunin:vs-run-py

8 years agoMerge pull request #5653 from jia-kai:fix-jpeg-exif
Maksim Shabunin [Fri, 20 Nov 2015 15:37:50 +0000 (15:37 +0000)]
Merge pull request #5653 from jia-kai:fix-jpeg-exif

8 years agoMerge pull request #5663 from bertmsk:patch-1
Maksim Shabunin [Fri, 20 Nov 2015 15:28:26 +0000 (15:28 +0000)]
Merge pull request #5663 from bertmsk:patch-1

8 years agoMerge pull request #5665 from paroj:matx_norm
Maksim Shabunin [Fri, 20 Nov 2015 15:26:39 +0000 (15:26 +0000)]
Merge pull request #5665 from paroj:matx_norm

8 years agoMerge pull request #5681 from sturkmen72:patch-3
Maksim Shabunin [Fri, 20 Nov 2015 15:18:25 +0000 (15:18 +0000)]
Merge pull request #5681 from sturkmen72:patch-3

8 years agoMerge pull request #5685 from lupustr3:pvlasov/ipp9_fixes
Alexander Alekhin [Fri, 20 Nov 2015 12:11:08 +0000 (12:11 +0000)]
Merge pull request #5685 from lupustr3:pvlasov/ipp9_fixes

8 years agoIPP Sobel getBufferSize wrong func fix;
Pavel Vlasov [Thu, 19 Nov 2015 15:38:47 +0000 (18:38 +0300)]
IPP Sobel getBufferSize wrong func fix;

8 years agofixup! run.py: issues with forced configuration fixed
Maksim Shabunin [Thu, 19 Nov 2015 12:32:42 +0000 (15:32 +0300)]
fixup! run.py: issues with forced configuration fixed

8 years agoMerge pull request #5671 from PhilLab:patch-7
Alexander Alekhin [Thu, 19 Nov 2015 10:10:13 +0000 (10:10 +0000)]
Merge pull request #5671 from PhilLab:patch-7

8 years agoUpdate imgcodecs.hpp
Suleyman TURKMEN [Wed, 18 Nov 2015 22:25:36 +0000 (00:25 +0200)]
Update imgcodecs.hpp

8 years agoMerge pull request #5654 from mshabunin:ios-framework
Vadim Pisarevsky [Tue, 17 Nov 2015 17:55:23 +0000 (17:55 +0000)]
Merge pull request #5654 from mshabunin:ios-framework

8 years agoNew variant of iOS framework building, fixed some warnings for XCode 7.1.1 and cmake...
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

8 years agorun.py: issues with forced configuration fixed
Maksim Shabunin [Mon, 16 Nov 2015 11:02:26 +0000 (14:02 +0300)]
run.py: issues with forced configuration fixed

8 years agoFixed mjpeg frame size attribution
Philipp Hasper [Mon, 16 Nov 2015 07:40:09 +0000 (08:40 +0100)]
Fixed mjpeg frame size attribution

8 years agoFix run.py test detection issues for debug VS configurations
Maksim Shabunin [Fri, 13 Nov 2015 09:26:39 +0000 (12:26 +0300)]
Fix run.py test detection issues for debug VS configurations

8 years agosupport for NORM_L2SQR in norm(Matx<..>)
Pavel Rojtberg [Fri, 13 Nov 2015 13:29:56 +0000 (14:29 +0100)]
support for NORM_L2SQR in norm(Matx<..>)

8 years agoUpdate system.cpp
Bert [Fri, 13 Nov 2015 08:03:34 +0000 (11:03 +0300)]
Update system.cpp

FreeBSD compilation fix

8 years agocheck offset in ExifReader::getString
jiakai [Wed, 11 Nov 2015 12:17:24 +0000 (20:17 +0800)]
check offset in ExifReader::getString

8 years agoMerge pull request #5480 from dtmoodie:vecgpumat
Vadim Pisarevsky [Tue, 10 Nov 2015 17:02:21 +0000 (17:02 +0000)]
Merge pull request #5480 from dtmoodie:vecgpumat

8 years agoMerge pull request #5340 from alalek:ocl_off
Vadim Pisarevsky [Tue, 10 Nov 2015 16:53:36 +0000 (16:53 +0000)]
Merge pull request #5340 from alalek:ocl_off

8 years agoMerge pull request #5597 from andy-held:cmakecudacross
Vadim Pisarevsky [Tue, 10 Nov 2015 16:15:26 +0000 (16:15 +0000)]
Merge pull request #5597 from andy-held:cmakecudacross

8 years agoMerge pull request #5472 from StevenPuttemans:remove_unexisting_function
Vadim Pisarevsky [Tue, 10 Nov 2015 16:14:43 +0000 (16:14 +0000)]
Merge pull request #5472 from StevenPuttemans:remove_unexisting_function

8 years agoMerge pull request #5645 from jia-kai:master
Vadim Pisarevsky [Tue, 10 Nov 2015 15:56:23 +0000 (15:56 +0000)]
Merge pull request #5645 from jia-kai:master

8 years agoMerge pull request #5646 from brossetti:patch-1
Vadim Pisarevsky [Tue, 10 Nov 2015 15:56:05 +0000 (15:56 +0000)]
Merge pull request #5646 from brossetti:patch-1

8 years agofixed bug on left mouse button click
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

8 years agocheck for exifSize
jiakai [Thu, 5 Nov 2015 10:32:51 +0000 (18:32 +0800)]
check for exifSize

8 years agocheck boundary in ExifReader
jiakai [Thu, 5 Nov 2015 09:58:35 +0000 (17:58 +0800)]
check boundary in ExifReader

8 years agoSimplifies cross compilation with CUDA for ARM boards. CUDA arch is set for all ARM...
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.

8 years agoMerge pull request #5455 from michaelveth:matlab_cmake_unix_fix
Vadim Pisarevsky [Tue, 3 Nov 2015 10:59:45 +0000 (10:59 +0000)]
Merge pull request #5455 from michaelveth:matlab_cmake_unix_fix

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