platform/upstream/opencv.git
9 years agotest2.py: switch from urllib to urllib2
Roman Donchenko [Thu, 17 Sep 2015 15:21:04 +0000 (18:21 +0300)]
test2.py: switch from urllib to urllib2

urllib2 raises an exception if an HTTP request produces an error code,
making the test fail earlier.

9 years agotest2.py: fail if a downloaded image can't be decoded
Roman Donchenko [Thu, 17 Sep 2015 15:17:06 +0000 (18:17 +0300)]
test2.py: fail if a downloaded image can't be decoded

9 years agotest2.py: remove unused imports
Roman Donchenko [Thu, 17 Sep 2015 15:14:49 +0000 (18:14 +0300)]
test2.py: remove unused imports

9 years agoMerge pull request #5299 from ilya-lavrenov:core_hog
Alexander Alekhin [Fri, 4 Sep 2015 14:30:17 +0000 (14:30 +0000)]
Merge pull request #5299 from ilya-lavrenov:core_hog

9 years agoMerge pull request #5300 from ilya-lavrenov:cuda_warnings
Alexander Alekhin [Fri, 4 Sep 2015 10:21:44 +0000 (10:21 +0000)]
Merge pull request #5300 from ilya-lavrenov:cuda_warnings

9 years agoMerge pull request #5297 from ilya-lavrenov:flann
Alexander Alekhin [Fri, 4 Sep 2015 10:21:00 +0000 (10:21 +0000)]
Merge pull request #5297 from ilya-lavrenov:flann

9 years agofixed warnings in gpu module
Ilya Lavrenov [Thu, 3 Sep 2015 16:13:00 +0000 (19:13 +0300)]
fixed warnings in gpu module

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 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 agoMerge pull request #5289 from ilya-lavrenov:flann
Alexander Alekhin [Wed, 2 Sep 2015 11:41:03 +0000 (11:41 +0000)]
Merge pull request #5289 from ilya-lavrenov:flann

9 years agoMerge pull request #5285 from ilya-lavrenov:ml5
Alexander Alekhin [Wed, 2 Sep 2015 11:39:07 +0000 (11:39 +0000)]
Merge pull request #5285 from ilya-lavrenov:ml5

9 years agoMerge pull request #5281 from ilya-lavrenov:ml2
Alexander Alekhin [Wed, 2 Sep 2015 11:38:45 +0000 (11:38 +0000)]
Merge pull request #5281 from ilya-lavrenov:ml2

9 years agofixed memory leak in flann index
Ilya Lavrenov [Tue, 1 Sep 2015 13:17:18 +0000 (16:17 +0300)]
fixed memory leak in flann index

9 years agoMerge pull request #5284 from ilya-lavrenov:ml4
Vadim Pisarevsky [Tue, 1 Sep 2015 12:31:46 +0000 (12:31 +0000)]
Merge pull request #5284 from ilya-lavrenov:ml4

9 years agoMerge pull request #5283 from ilya-lavrenov:ml3
Vadim Pisarevsky [Tue, 1 Sep 2015 12:31:05 +0000 (12:31 +0000)]
Merge pull request #5283 from ilya-lavrenov:ml3

9 years agoMerge pull request #5280 from ilya-lavrenov:ml
Vadim Pisarevsky [Tue, 1 Sep 2015 12:30:36 +0000 (12:30 +0000)]
Merge pull request #5280 from ilya-lavrenov:ml

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 "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 agoMerge pull request #5274 from ilya-lavrenov:features2d
Alexander Alekhin [Tue, 1 Sep 2015 10:14:28 +0000 (10:14 +0000)]
Merge pull request #5274 from ilya-lavrenov:features2d

9 years agorelease filestorage before exception
Ilya Lavrenov [Tue, 1 Sep 2015 10:04:33 +0000 (13:04 +0300)]
release filestorage before exception

9 years agofixed memory leak in ANN
Ilya Lavrenov [Tue, 1 Sep 2015 09:29:52 +0000 (12:29 +0300)]
fixed memory leak in ANN

9 years agofixed memory leak in ml module
Ilya Lavrenov [Tue, 1 Sep 2015 08:26:25 +0000 (11:26 +0300)]
fixed memory leak in ml module

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 agoMerge pull request #5262 from jet47:gpu-stereobp-fix
Alexander Alekhin [Fri, 28 Aug 2015 10:05:19 +0000 (10:05 +0000)]
Merge pull request #5262 from jet47:gpu-stereobp-fix

9 years agofix potential out-of-border access in gpu StereoBeliefPropagation
Vladislav Vinogradov [Thu, 27 Aug 2015 13:09:37 +0000 (16:09 +0300)]
fix potential out-of-border access in gpu StereoBeliefPropagation

9 years agoMerge pull request #5250 from SpecLad:missing-conflicts
Alexander Alekhin [Wed, 26 Aug 2015 16:39:13 +0000 (16:39 +0000)]
Merge pull request #5250 from SpecLad:missing-conflicts

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 agoMerge pull request #5143 from alankarkotwal:2.4
Vadim Pisarevsky [Mon, 24 Aug 2015 11:06:30 +0000 (11:06 +0000)]
Merge pull request #5143 from alankarkotwal:2.4

9 years agoMerge pull request #5114 from a-andre:missingHeader
Maksim Shabunin [Thu, 20 Aug 2015 15:45:52 +0000 (15:45 +0000)]
Merge pull request #5114 from a-andre:missingHeader

9 years agoMerge pull request #5226 from ilya-lavrenov:valgrind_memory_leak
Alexander Alekhin [Thu, 20 Aug 2015 13:14:29 +0000 (13:14 +0000)]
Merge pull request #5226 from ilya-lavrenov:valgrind_memory_leak

9 years agoMerge pull request #5223 from ilya-lavrenov:warpaffine_valgrind
Alexander Alekhin [Thu, 20 Aug 2015 12:36:24 +0000 (12:36 +0000)]
Merge pull request #5223 from ilya-lavrenov:warpaffine_valgrind

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 agoMerge pull request #5094 from SpecLad:f2d-ts-rng
Alexander Alekhin [Wed, 19 Aug 2015 00:45:03 +0000 (00:45 +0000)]
Merge pull request #5094 from SpecLad:f2d-ts-rng

9 years agofix documentation builder warnings
a-andre [Tue, 18 Aug 2015 16:48:32 +0000 (18:48 +0200)]
fix documentation builder warnings

9 years agoMerge pull request #5203 from ilya-lavrenov:valgrind_error
Alexander Alekhin [Mon, 17 Aug 2015 17:18:07 +0000 (17:18 +0000)]
Merge pull request #5203 from ilya-lavrenov:valgrind_error

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 uninitialized values warning in bad arg test class
Ilya Lavrenov [Sat, 15 Aug 2015 11:30:27 +0000 (14:30 +0300)]
fixed uninitialized values warning in bad arg test class

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 agoMerge pull request #5193 from ilya-lavrenov:valgrind_error
Alexander Alekhin [Fri, 14 Aug 2015 15:32:16 +0000 (15:32 +0000)]
Merge pull request #5193 from ilya-lavrenov:valgrind_error

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 agoMerge pull request #5151 from mshabunin:fix-training-data-corruption
Maksim Shabunin [Wed, 12 Aug 2015 14:40:51 +0000 (14:40 +0000)]
Merge pull request #5151 from mshabunin:fix-training-data-corruption

9 years agoFixing possible corruption for big training data sizes
Maksim Shabunin [Fri, 7 Aug 2015 16:29:52 +0000 (19:29 +0300)]
Fixing possible corruption for big training data sizes

9 years agoMerge pull request #5124 from StevenPuttemans:fix_annotation_tool_2.4
Alexander Alekhin [Sat, 8 Aug 2015 16:51:51 +0000 (16:51 +0000)]
Merge pull request #5124 from StevenPuttemans:fix_annotation_tool_2.4

9 years agoMerge pull request #1 from alankarkotwal/bugfix
Alankar Kotwal [Thu, 6 Aug 2015 16:45:04 +0000 (22:15 +0530)]
Merge pull request #1 from alankarkotwal/bugfix

Correct missing braces in operations_in_arrays.rst

9 years agoCorrect missing braces in operations_in_arrays.rst
Alankar Kotwal [Thu, 6 Aug 2015 16:39:23 +0000 (22:09 +0530)]
Correct missing braces in operations_in_arrays.rst

9 years agoadd checks on input parameters for valid path and folder
StevenPuttemans [Tue, 4 Aug 2015 12:02:42 +0000 (14:02 +0200)]
add checks on input parameters for valid path and folder
opening a folder is system specific - made system specific code
added license

9 years agoMerge branch '2.4.10.x-prep' into 2.4
Alexander Alekhin [Wed, 5 Aug 2015 13:20:12 +0000 (16:20 +0300)]
Merge branch '2.4.10.x-prep' into 2.4

9 years agoMerge pull request #5096 from terfendail:2.4
Alexander Alekhin [Mon, 3 Aug 2015 12:46:44 +0000 (12:46 +0000)]
Merge pull request #5096 from terfendail:2.4

9 years agoinstall new headers like "opencv2/core.hpp"
a-andre [Sun, 2 Aug 2015 11:13:58 +0000 (13:13 +0200)]
install new headers like "opencv2/core.hpp"

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

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 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 agoMerge pull request #5092 from etalanin:update-branch-to-2-4-12
Alexander Smorkalov [Wed, 29 Jul 2015 18:57:02 +0000 (18:57 +0000)]
Merge pull request #5092 from etalanin:update-branch-to-2-4-12

9 years agoIncrease Android Manager version
Evgeny Talanin [Wed, 29 Jul 2015 18:16:21 +0000 (21:16 +0300)]
Increase Android Manager version

9 years agoIncrease version to 2.4.12
Evgeny Talanin [Wed, 29 Jul 2015 17:34:47 +0000 (20:34 +0300)]
Increase version to 2.4.12

9 years agoMerge pull request #5091 from jet47:gpu-sanity-epsilon
Alexander Alekhin [Wed, 29 Jul 2015 16:29:37 +0000 (16:29 +0000)]
Merge pull request #5091 from jet47:gpu-sanity-epsilon

9 years agoincrease epsilon for some GPU sanity tests
Vladislav Vinogradov [Wed, 29 Jul 2015 15:57:14 +0000 (18:57 +0300)]
increase epsilon for some GPU sanity tests

9 years agoMerge pull request #5090 from SpecLad:autotune-crash
Alexander Alekhin [Wed, 29 Jul 2015 15:47:20 +0000 (15:47 +0000)]
Merge pull request #5090 from SpecLad:autotune-crash

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 agoMerge pull request #4211 from alalek:fix_python_2_4
Maksim Shabunin [Fri, 24 Jul 2015 13:33:51 +0000 (13:33 +0000)]
Merge pull request #4211 from alalek:fix_python_2_4

9 years agoMerge pull request #4220 from alalek:fix_gcc_warnings_2_4
Maksim Shabunin [Fri, 24 Jul 2015 13:09:44 +0000 (13:09 +0000)]
Merge pull request #4220 from alalek:fix_gcc_warnings_2_4

9 years agoMerge pull request #4219 from SpecLad:freak-missing-init
Alexander Alekhin [Wed, 22 Jul 2015 12:52:36 +0000 (12:52 +0000)]
Merge pull request #4219 from SpecLad:freak-missing-init

9 years agofix GCC 4.9 warnings
Alexander Alekhin [Wed, 22 Jul 2015 11:17:37 +0000 (14:17 +0300)]
fix GCC 4.9 warnings

9 years agoFREAK: add missing field initialization
Roman Donchenko [Wed, 22 Jul 2015 11:06:39 +0000 (14:06 +0300)]
FREAK: add missing field initialization

9 years agoMerge pull request #4204 from gladilov-gleb:minMaxLocBugFix
Vadim Pisarevsky [Wed, 22 Jul 2015 10:52:15 +0000 (10:52 +0000)]
Merge pull request #4204 from gladilov-gleb:minMaxLocBugFix

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 agofix python cross-compilation
Alexander Alekhin [Tue, 21 Jul 2015 09:41:57 +0000 (12:41 +0300)]
fix python cross-compilation

9 years agoMerge pull request #4191 from SpecLad:irc-workaround
Alexander Smorkalov [Thu, 16 Jul 2015 08:17:45 +0000 (08:17 +0000)]
Merge pull request #4191 from SpecLad:irc-workaround

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 #4187 from SpecLad:chessboard-png
Alexander Alekhin [Mon, 13 Jul 2015 15:52:46 +0000 (15:52 +0000)]
Merge pull request #4187 from SpecLad:chessboard-png

9 years agoCV_ChessboardDetectorTimingTest: don't ignore missing test data
Roman Donchenko [Thu, 9 Jul 2015 14:32:08 +0000 (17:32 +0300)]
CV_ChessboardDetectorTimingTest: don't ignore missing test data

9 years agoMerge pull request #4137 from asmorkalov:as/ros_conflict
Vadim Pisarevsky [Mon, 22 Jun 2015 11:52:05 +0000 (11:52 +0000)]
Merge pull request #4137 from asmorkalov:as/ros_conflict

9 years agoMerge branch '2.4.9.x-prep' into 2.4
Alexander Alekhin [Fri, 19 Jun 2015 11:55:38 +0000 (14:55 +0300)]
Merge branch '2.4.9.x-prep' into 2.4

9 years agoMerge branch '2.4.8.x-prep' into 2.4
Alexander Alekhin [Fri, 19 Jun 2015 11:54:18 +0000 (14:54 +0300)]
Merge branch '2.4.8.x-prep' into 2.4

9 years agoMerge pull request #4034 from jet47:opencv_run_all_tests_unix
Alexander Smorkalov [Wed, 17 Jun 2015 08:19:47 +0000 (08:19 +0000)]
Merge pull request #4034 from jet47:opencv_run_all_tests_unix

9 years agoMerge pull request #4107 from SpecLad:libav-compat
Vadim Pisarevsky [Tue, 16 Jun 2015 13:22:40 +0000 (13:22 +0000)]
Merge pull request #4107 from SpecLad:libav-compat

9 years agoMerge pull request #4104 from SpecLad:arm64-packaging
Vadim Pisarevsky [Tue, 16 Jun 2015 13:19:10 +0000 (13:19 +0000)]
Merge pull request #4104 from SpecLad:arm64-packaging

9 years agoMerge pull request #4088 from howtobeahacker:2.4
Vadim Pisarevsky [Tue, 16 Jun 2015 12:31:13 +0000 (12:31 +0000)]
Merge pull request #4088 from howtobeahacker:2.4

9 years agoget code to compile on Ubuntu Saucy
Vincent Rabaud [Thu, 7 May 2015 11:38:59 +0000 (11:38 +0000)]
get code to compile on Ubuntu Saucy
A define was forgotten for the codecs and there was a typo for
another.

(cherry picked from commit f052b0bc4d2619daafe5c56d91fc4a6cb00b8b7c)

Conflicts:
modules/videoio/src/ffmpeg_codecs.hpp

9 years agofixed compile warnings; hopefully fixed test failures
Vadim Pisarevsky [Wed, 22 Apr 2015 21:39:44 +0000 (00:39 +0300)]
fixed compile warnings; hopefully fixed test failures

(cherry picked from commit 30912b49f3514895efbc597da89e6421bf08e60b)

Conflicts:
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp

9 years agomake sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu...
Vadim Pisarevsky [Wed, 22 Apr 2015 18:57:29 +0000 (21:57 +0300)]
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)

(cherry picked from commit 2b2e3ee93c6788b892b084cc04d0ead5ab75c197)

Conflicts:
cmake/OpenCVFindLibsVideo.cmake
modules/videoio/src/cap.cpp
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
modules/videoio/test/test_ffmpeg.cpp

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 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 agocorrect covariation matrix formula in Harris corner detector
howtobeahacker [Wed, 3 Jun 2015 09:33:40 +0000 (17:33 +0800)]
correct covariation matrix formula in Harris corner detector

9 years agoMerge pull request #4085 from berak:patch-3
Vadim Pisarevsky [Wed, 3 Jun 2015 07:25:17 +0000 (07:25 +0000)]
Merge pull request #4085 from berak:patch-3

9 years agohttp://code.opencv.org/issues/4359 2.4 branch
berak [Wed, 3 Jun 2015 05:48:29 +0000 (07:48 +0200)]
http://code.opencv.org/issues/4359  2.4 branch

9 years agoMerge pull request #4003 from uwinsoftware:2.4
Vadim Pisarevsky [Fri, 29 May 2015 18:55:55 +0000 (18:55 +0000)]
Merge pull request #4003 from uwinsoftware:2.4

9 years agoMerge pull request #4057 from apavlenko:24_java_memory_release
Vadim Pisarevsky [Thu, 28 May 2015 14:59:45 +0000 (14:59 +0000)]
Merge pull request #4057 from apavlenko:24_java_memory_release

9 years agoMerge pull request #4061 from ilya-lavrenov:android
Vadim Pisarevsky [Tue, 26 May 2015 17:24:05 +0000 (17:24 +0000)]
Merge pull request #4061 from ilya-lavrenov:android

9 years agofixed OS names
Ilya Lavrenov [Tue, 26 May 2015 14:32:02 +0000 (17:32 +0300)]
fixed OS names

9 years agoreleasing native memory of temp `Mat` objects in generated Java code
Andrey Pavlenko [Tue, 26 May 2015 10:50:56 +0000 (13:50 +0300)]
releasing native memory of temp `Mat` objects in generated Java code