platform/upstream/opencv.git
9 years agochanges to reflect 3.0 status
Dikay900 [Sat, 19 Sep 2015 12:15:40 +0000 (14:15 +0200)]
changes to reflect 3.0 status

9 years agoOnly conflict with packages corresponding to modules that are built
Roman Donchenko [Wed, 26 Aug 2015 10:42:21 +0000 (13:42 +0300)]
Only conflict with packages corresponding to modules that are built

9 years agoAdd missing packages to the Debian conflict list
Roman Donchenko [Tue, 25 Aug 2015 15:50:06 +0000 (18:50 +0300)]
Add missing packages to the Debian conflict list

And refactor the code to make sure that the dev and runtime package lists are
in sync.

9 years agoDebian packages header update to fix conflict with OpenCV from deb repo.
Alexander Smorkalov [Thu, 4 Jun 2015 12:42:27 +0000 (15:42 +0300)]
Debian packages header update to fix conflict with OpenCV from deb repo.

9 years agoAdded explicit deb package dependency from libtbb-dev if TBB is enabled.
Alexander Smorkalov [Wed, 6 May 2015 10:10:39 +0000 (13:10 +0300)]
Added explicit deb package dependency from libtbb-dev if TBB is enabled.

9 years agoPR #4003
Dikay900 [Sat, 19 Sep 2015 12:05:38 +0000 (14:05 +0200)]
PR #4003

9 years agoexclude dates from report names
Vladislav Vinogradov [Tue, 19 May 2015 15:23:10 +0000 (18:23 +0300)]
exclude dates from report names

9 years agosave tests console output to separate log files
Vladislav Vinogradov [Tue, 19 May 2015 15:22:30 +0000 (18:22 +0300)]
save tests console output to separate log files

9 years agocheck that current directory has write access
Vladislav Vinogradov [Tue, 19 May 2015 15:17:28 +0000 (18:17 +0300)]
check that current directory has write access

9 years agoAdd ARM64 packaging support
Roman Donchenko [Mon, 8 Jun 2015 15:01:24 +0000 (18:01 +0300)]
Add ARM64 packaging support

9 years agoSet CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of CPACK_DEBIAN_ARCHITECTURE
Roman Donchenko [Mon, 8 Jun 2015 13:08:58 +0000 (16:08 +0300)]
Set CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of CPACK_DEBIAN_ARCHITECTURE

Because that's the variable actually used by CPack.

9 years agoAdded test of minMaxLoc on filling with maximums of int
Gleb Gladilov [Tue, 21 Jul 2015 15:08:30 +0000 (18:08 +0300)]
Added test of minMaxLoc on filling with maximums of int

9 years agoFixed minMaxLoc and test functions
Gleb Gladilov [Mon, 20 Jul 2015 12:10:46 +0000 (15:10 +0300)]
Fixed minMaxLoc and test functions

9 years agoResize area result verification moved to the separate function
Vitaly Tuzov [Fri, 31 Jul 2015 12:01:33 +0000 (15:01 +0300)]
Resize area result verification moved to the separate function

fix position of assert expected/actual parameter

9 years agoAdded more resize_area tests to ensure right rounding behavior for half and quarter...
Vitaly Tuzov [Thu, 30 Jul 2015 15:42:29 +0000 (18:42 +0300)]
Added more resize_area tests to ensure right rounding behavior for half and quarter downscaling

9 years agodo not proceed with removing zero-length slice
Elena Shipunova [Mon, 7 Sep 2015 10:50:30 +0000 (13:50 +0300)]
do not proceed with removing zero-length slice

9 years agoMerge pull request #5329 from paroj:cliparser
Alexander Alekhin [Mon, 21 Sep 2015 09:46:54 +0000 (09:46 +0000)]
Merge pull request #5329 from paroj:cliparser

9 years agots/ts_perf: fix wrong has() usage
Pavel Rojtberg [Thu, 17 Sep 2015 09:57:00 +0000 (11:57 +0200)]
ts/ts_perf: fix wrong has() usage

`has()` only tests for an argument presence which is always true for
arguments with default values. Use `get<bool>()` to check the value
instead.

9 years agohas() should only test for the presence of the argument
Pavel Rojtberg [Tue, 15 Sep 2015 12:54:02 +0000 (14:54 +0200)]
has() should only test for the presence of the argument

and not consider its value. treat arguments with a set default value as
present.

9 years agodo not parse empty default values and improve error messages
Pavel Rojtberg [Thu, 10 Sep 2015 16:22:35 +0000 (18:22 +0200)]
do not parse empty default values and improve error messages

9 years agoMerge pull request #5349 from lupustr3:pvlasov/tls_update
Alexander Alekhin [Fri, 18 Sep 2015 14:39:08 +0000 (14:39 +0000)]
Merge pull request #5349 from lupustr3:pvlasov/tls_update

9 years agoMerge pull request #5355 from renatoGarcia:master
Alexander Alekhin [Fri, 18 Sep 2015 13:38:29 +0000 (13:38 +0000)]
Merge pull request #5355 from renatoGarcia:master

9 years agoMerge pull request #5343 from paroj:boolean_algebra
Alexander Alekhin [Fri, 18 Sep 2015 12:06:31 +0000 (12:06 +0000)]
Merge pull request #5343 from paroj:boolean_algebra

9 years agoMerge pull request #5335 from Dikay900:ports_to_master
Alexander Alekhin [Fri, 18 Sep 2015 11:06:07 +0000 (11:06 +0000)]
Merge pull request #5335 from Dikay900:ports_to_master

9 years agosimplify error conditions
Pavel Rojtberg [Mon, 14 Sep 2015 13:15:24 +0000 (15:15 +0200)]
simplify error conditions

`A || !A` is `true` so write `(A && B) || !A` as `B || !A`

9 years agoTLS keys leak fix;
Pavel Vlasov [Wed, 16 Sep 2015 11:00:36 +0000 (14:00 +0300)]
TLS keys leak fix;

Disables TLS copy constructor and operator, as they can lead to errors and reservation of too much keys in TLS storage;

gather method was added to TLS to gather data from all threads;

9 years agoCorrect a typo.
Renato Florentino Garcia [Thu, 17 Sep 2015 00:16:23 +0000 (21:16 -0300)]
Correct a typo.

9 years agoMerge pull request #5272 from avershov:opencl-vaapi-fallback
Vadim Pisarevsky [Mon, 14 Sep 2015 11:54:20 +0000 (11:54 +0000)]
Merge pull request #5272 from avershov:opencl-vaapi-fallback

9 years agoMerge pull request #5333 from UnaNancyOwen:fix3_LineAA
Vadim Pisarevsky [Mon, 14 Sep 2015 11:49:14 +0000 (11:49 +0000)]
Merge pull request #5333 from UnaNancyOwen:fix3_LineAA

9 years agoMerge pull request #5337 from Dikay900:tbb_cmake_visibility
Vadim Pisarevsky [Mon, 14 Sep 2015 11:47:04 +0000 (11:47 +0000)]
Merge pull request #5337 from Dikay900:tbb_cmake_visibility

9 years agoMerge pull request #5339 from blebo:patch-1
Vadim Pisarevsky [Mon, 14 Sep 2015 11:46:35 +0000 (11:46 +0000)]
Merge pull request #5339 from blebo:patch-1

9 years agoCorrection of minor typo.
Adam [Sun, 13 Sep 2015 16:12:06 +0000 (00:12 +0800)]
Correction of minor typo.

9 years agofix for corrent modules dependencies
Ilya Lavrenov [Wed, 2 Sep 2015 15:15:05 +0000 (18:15 +0300)]
fix for corrent modules dependencies

9 years agofixed uninitialized memory writing/reading in flann
Ilya Lavrenov [Thu, 3 Sep 2015 10:25:29 +0000 (13:25 +0300)]
fixed uninitialized memory writing/reading in flann

9 years agoinitialize padding of CvString with zeros
Ilya Lavrenov [Thu, 3 Sep 2015 14:21:04 +0000 (17:21 +0300)]
initialize padding of CvString with zeros

9 years agofixed "Conditional jump or move depends on uninitialised value(s)" in GBD
Ilya Lavrenov [Tue, 1 Sep 2015 10:22:49 +0000 (13:22 +0300)]
fixed "Conditional jump or move depends on uninitialised value(s)" in GBD

9 years agofixed memory leak in GBTrees
Ilya Lavrenov [Tue, 1 Sep 2015 08:40:23 +0000 (11:40 +0300)]
fixed memory leak in GBTrees

9 years agofixed memory leak in descriptor regression tests
Ilya Lavrenov [Mon, 31 Aug 2015 14:30:42 +0000 (17:30 +0300)]
fixed memory leak in descriptor regression tests

9 years agofixed memory leaks in modules/features2d/test/test_nearestneighbors.cpp
Ilya Lavrenov [Mon, 31 Aug 2015 14:20:52 +0000 (17:20 +0300)]
fixed memory leaks in modules/features2d/test/test_nearestneighbors.cpp

9 years agoproposed change by psyill
Dikay900 [Sat, 12 Sep 2015 10:19:44 +0000 (12:19 +0200)]
proposed change by psyill

9 years agofixed memory leak caused by illegal memory access
Ilya Lavrenov [Thu, 20 Aug 2015 10:28:10 +0000 (13:28 +0300)]
fixed memory leak caused by illegal memory access

9 years agofixed "Conditional jump or move depends on uninitialised value" warning
Ilya Lavrenov [Thu, 20 Aug 2015 09:20:38 +0000 (12:20 +0300)]
fixed "Conditional jump or move depends on uninitialised value" warning

9 years agotypo
Ilya Lavrenov [Sun, 16 Aug 2015 08:46:48 +0000 (11:46 +0300)]
typo

9 years agofixed typo
Ilya Lavrenov [Sat, 15 Aug 2015 13:25:25 +0000 (16:25 +0300)]
fixed typo

9 years agofixed memory leaks in warpAffine tests
Ilya Lavrenov [Sat, 15 Aug 2015 07:11:52 +0000 (10:11 +0300)]
fixed memory leaks in warpAffine tests

9 years agofixed memory leaks in floodfill tests
Ilya Lavrenov [Sat, 15 Aug 2015 07:09:31 +0000 (10:09 +0300)]
fixed memory leaks in floodfill tests

9 years agofixed memory leaks in cvtyuv tests
Ilya Lavrenov [Sat, 15 Aug 2015 07:06:09 +0000 (10:06 +0300)]
fixed memory leaks in cvtyuv tests

9 years agofixed memory leak in core ds tests
Ilya Lavrenov [Fri, 14 Aug 2015 21:35:38 +0000 (00:35 +0300)]
fixed memory leak in core ds tests

9 years agofixed valgrind warning in polylines
Ilya Lavrenov [Fri, 14 Aug 2015 14:57:54 +0000 (17:57 +0300)]
fixed valgrind warning in polylines

9 years agoFix LineAA in case of 4 channel
Tsukasa Sugiura [Fri, 11 Sep 2015 16:42:25 +0000 (01:42 +0900)]
Fix LineAA in case of 4 channel

Fix bug when enter 4 channel image to LineAA function.

9 years agoNearestNeighborTest: use ts->get_rng() instead of (implicit) theRNG()
Roman Donchenko [Thu, 30 Jul 2015 15:03:48 +0000 (18:03 +0300)]
NearestNeighborTest: use ts->get_rng() instead of (implicit) theRNG()

This ensures that test data is not dependent on the order the tests are
executed in.

9 years agoflann: fix AutotunedIndex crashing if a KDTree index is selected
Roman Donchenko [Wed, 29 Jul 2015 15:03:48 +0000 (18:03 +0300)]
flann: fix AutotunedIndex crashing if a KDTree index is selected

Backport of mariusmuja/flann@f8ca6df3.

9 years agoRefactor a section of icvRotatingCalipers to work around a GCC bug
Roman Donchenko [Tue, 14 Jul 2015 10:23:37 +0000 (13:23 +0300)]
Refactor a section of icvRotatingCalipers to work around a GCC bug

https://bugs.launchpad.net/ubuntu/+source/gcc-4.9/+bug/1474304

9 years agoMerge pull request #5317 from alalek:workaround
Alexander Alekhin [Fri, 11 Sep 2015 11:42:33 +0000 (11:42 +0000)]
Merge pull request #5317 from alalek:workaround

9 years agoMerge pull request #5255 from berak:java_videowriter
Maksim Shabunin [Fri, 11 Sep 2015 11:09:15 +0000 (11:09 +0000)]
Merge pull request #5255 from berak:java_videowriter

9 years agoMerge pull request #5327 from mshabunin:mingw-fix
Vadim Pisarevsky [Fri, 11 Sep 2015 10:19:46 +0000 (10:19 +0000)]
Merge pull request #5327 from mshabunin:mingw-fix

9 years agoimplemented sample build in fallback mode without interop
Alexey Ershov [Thu, 10 Sep 2015 16:30:19 +0000 (19:30 +0300)]
implemented sample build in fallback mode without interop

9 years agoEnabled pthreads backend for mingw
Maksim Shabunin [Thu, 10 Sep 2015 14:12:22 +0000 (17:12 +0300)]
Enabled pthreads backend for mingw

9 years agosample changed to execute only one mode (interop on/off) per run
Alexey Ershov [Thu, 10 Sep 2015 12:41:04 +0000 (15:41 +0300)]
sample changed to execute only one mode (interop on/off) per run

9 years agochanged call to getDefault: false to true in fallback initialization
Alexey Ershov [Thu, 10 Sep 2015 11:36:40 +0000 (14:36 +0300)]
changed call to getDefault: false to true in fallback initialization

9 years agoMerge pull request #5321 from alalek:copy_if_different
Maksim Shabunin [Thu, 10 Sep 2015 09:41:49 +0000 (09:41 +0000)]
Merge pull request #5321 from alalek:copy_if_different

9 years agoMerge pull request #5258 from sturkmen72:patch-6
Maksim Shabunin [Thu, 10 Sep 2015 09:22:07 +0000 (09:22 +0000)]
Merge pull request #5258 from sturkmen72:patch-6

9 years agoocl: workaround for getUMat()
Alexander Alekhin [Tue, 8 Sep 2015 01:06:04 +0000 (04:06 +0300)]
ocl: workaround for getUMat()

9 years agoman/unmap, preventing getMat/getUMat from temp object, fix thread-unsafe code in...
Andrey Pavlenko [Thu, 3 Sep 2015 14:18:59 +0000 (17:18 +0300)]
man/unmap, preventing getMat/getUMat from temp object, fix thread-unsafe code in `UMat::getMat()`

9 years agoMerge pull request #5293 from alalek:tapi_custom_ptr_perf
Alexander Alekhin [Wed, 9 Sep 2015 14:59:17 +0000 (14:59 +0000)]
Merge pull request #5293 from alalek:tapi_custom_ptr_perf

9 years agoMerge pull request #5292 from alalek:tapi_custom_ptr
Alexander Alekhin [Wed, 9 Sep 2015 14:58:28 +0000 (14:58 +0000)]
Merge pull request #5292 from alalek:tapi_custom_ptr

9 years agoMerge pull request #5294 from LorenaGdL:master
Vadim Pisarevsky [Wed, 9 Sep 2015 13:41:39 +0000 (13:41 +0000)]
Merge pull request #5294 from LorenaGdL:master

9 years agoMerge pull request #5304 from paroj:calib_feye
Vadim Pisarevsky [Wed, 9 Sep 2015 11:00:40 +0000 (11:00 +0000)]
Merge pull request #5304 from paroj:calib_feye

9 years agoMerge pull request #5301 from vtsatskin:patch-1
Vadim Pisarevsky [Wed, 9 Sep 2015 10:39:52 +0000 (10:39 +0000)]
Merge pull request #5301 from vtsatskin:patch-1

9 years agoMerge pull request #5302 from berak:patch-2
Vadim Pisarevsky [Wed, 9 Sep 2015 10:34:29 +0000 (10:34 +0000)]
Merge pull request #5302 from berak:patch-2

9 years agoMerge pull request #5312 from sturkmen72:patch-2
Vadim Pisarevsky [Wed, 9 Sep 2015 10:30:22 +0000 (10:30 +0000)]
Merge pull request #5312 from sturkmen72:patch-2

9 years agocmake: use copy_if_different
Alexander Alekhin [Tue, 8 Sep 2015 19:42:05 +0000 (22:42 +0300)]
cmake: use copy_if_different

9 years agoadded run iteration without timing to complete internal initializations
Alexey Ershov [Tue, 8 Sep 2015 18:01:57 +0000 (21:01 +0300)]
added run iteration without timing to complete internal initializations

9 years agoMerge pull request #5316 from mshabunin:fix-contrib-tests
Alexander Alekhin [Tue, 8 Sep 2015 16:52:43 +0000 (16:52 +0000)]
Merge pull request #5316 from mshabunin:fix-contrib-tests

9 years agofixed argument in call to {Input|Output}Array.getMat()
Alexey Ershov [Tue, 8 Sep 2015 16:29:19 +0000 (19:29 +0300)]
fixed argument in call to {Input|Output}Array.getMat()

9 years agoseparated UMat & Mat usage in interop/copy paths
Alexey Ershov [Mon, 7 Sep 2015 18:11:05 +0000 (21:11 +0300)]
separated UMat & Mat usage in interop/copy paths

9 years agoFixed: Concurrency static scheduler release failed
Maksim Shabunin [Mon, 7 Sep 2015 15:59:07 +0000 (18:59 +0300)]
Fixed: Concurrency static scheduler release failed

9 years agoUpdate drawing.cpp
Suleyman TURKMEN [Mon, 7 Sep 2015 08:30:14 +0000 (11:30 +0300)]
Update drawing.cpp

https://github.com/Itseez/opencv/issues/4791

9 years agodocumentation patch
Suleyman TURKMEN [Thu, 27 Aug 2015 09:17:23 +0000 (12:17 +0300)]
documentation patch

9 years agoMerge pull request #5303 from berak:patch-3
Alexander Alekhin [Fri, 4 Sep 2015 16:49:41 +0000 (16:49 +0000)]
Merge pull request #5303 from berak:patch-3

9 years agoUpdate cloning_gui.cpp
berak [Fri, 4 Sep 2015 09:14:17 +0000 (11:14 +0200)]
Update cloning_gui.cpp

9 years agoadd support for fisheye camera model
Pavel Rojtberg [Mon, 30 Mar 2015 14:53:10 +0000 (16:53 +0200)]
add support for fisheye camera model

9 years agoUpdate PnPProblem.cpp
berak [Fri, 4 Sep 2015 08:57:33 +0000 (10:57 +0200)]
Update PnPProblem.cpp

9 years agofallback path & sample timing implemented
Alexey Ershov [Sun, 30 Aug 2015 23:33:15 +0000 (02:33 +0300)]
fallback path & sample timing implemented
fixed trailing whitespaces
renamed files *vaapi* to *va_intel*
changed names vaapi* to va_intel*

9 years agoFix variable names in python color spaces tutorial
Valentin Tsatskin [Thu, 3 Sep 2015 19:45:36 +0000 (15:45 -0400)]
Fix variable names in python color spaces tutorial

9 years agoUMat: add perf test for custom ptr
Alexander Alekhin [Wed, 2 Sep 2015 17:20:07 +0000 (20:20 +0300)]
UMat: add perf test for custom ptr

9 years agoupdate custom_ptr test
Alexander Alekhin [Wed, 2 Sep 2015 16:25:09 +0000 (19:25 +0300)]
update custom_ptr test

9 years agoTrainData doc update
Lorena García [Thu, 3 Sep 2015 03:52:04 +0000 (05:52 +0200)]
TrainData doc update

Update docs according to PR #5127

9 years agoMerge pull request #5282 from mshabunin:mingw-51
Alexander Alekhin [Wed, 2 Sep 2015 13:19:52 +0000 (13:19 +0000)]
Merge pull request #5282 from mshabunin:mingw-51

9 years agofixup! Some changes to support mingw-w64
Maksim Shabunin [Tue, 1 Sep 2015 10:49:23 +0000 (13:49 +0300)]
fixup! Some changes to support mingw-w64

9 years agofixup! Some changes to support mingw-w64
Maksim Shabunin [Tue, 1 Sep 2015 09:14:40 +0000 (12:14 +0300)]
fixup! Some changes to support mingw-w64

9 years agoSome changes to support mingw-w64
Maksim Shabunin [Mon, 31 Aug 2015 21:59:08 +0000 (00:59 +0300)]
Some changes to support mingw-w64

- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes #5253)

9 years agoMerge pull request #5261 from apavlenko:android_ocl_sample_improvements
Vadim Pisarevsky [Mon, 31 Aug 2015 11:09:40 +0000 (11:09 +0000)]
Merge pull request #5261 from apavlenko:android_ocl_sample_improvements

9 years agoMerge pull request #5269 from eladj:patch-1
Vadim Pisarevsky [Mon, 31 Aug 2015 11:09:09 +0000 (11:09 +0000)]
Merge pull request #5269 from eladj:patch-1

9 years agoUpdate documentation in calib3d.hpp
Elad Joseph [Sun, 30 Aug 2015 09:42:30 +0000 (12:42 +0300)]
Update documentation in calib3d.hpp

Fixed small mistake in documentation.
The prism coefficients in y'' equation were mistakenly written as s1,s2 instead of s3,s4

9 years agoMerge pull request #5098 from powderluv:master
Vadim Pisarevsky [Thu, 27 Aug 2015 14:31:35 +0000 (14:31 +0000)]
Merge pull request #5098 from powderluv:master

9 years agoMerge pull request #5242 from apavlenko:fix_releasing_temp_umat
Vadim Pisarevsky [Thu, 27 Aug 2015 14:29:52 +0000 (14:29 +0000)]
Merge pull request #5242 from apavlenko:fix_releasing_temp_umat

9 years agogiving a chance for OpenCL 1.1 devices
Andrey Pavlenko [Thu, 27 Aug 2015 11:04:08 +0000 (14:04 +0300)]
giving a chance for OpenCL 1.1 devices

9 years agounused imports clean-up
Andrey Pavlenko [Thu, 27 Aug 2015 11:03:08 +0000 (14:03 +0300)]
unused imports clean-up

9 years agoadding `NO_PROCESSING` (i.e. just preview) mode
Andrey Pavlenko [Thu, 27 Aug 2015 10:28:09 +0000 (13:28 +0300)]
adding `NO_PROCESSING` (i.e. just preview) mode