platform/upstream/opencv.git
9 years agoupdate fixing bug #5599
Viet Dinh [Mon, 2 Nov 2015 13:38:05 +0000 (08:38 -0500)]
update fixing bug #5599

9 years agofix whitespace errors
Viet Dinh [Mon, 2 Nov 2015 05:50:05 +0000 (00:50 -0500)]
fix whitespace errors

9 years agofix whitespace errors
Viet Dinh [Mon, 2 Nov 2015 05:20:13 +0000 (00:20 -0500)]
fix whitespace errors

9 years agofix whitespace errors
Viet Dinh [Mon, 2 Nov 2015 05:04:51 +0000 (00:04 -0500)]
fix whitespace errors

9 years agofix bug #5599
Viet Dinh [Mon, 2 Nov 2015 04:30:28 +0000 (23:30 -0500)]
fix bug #5599

solves equations more correctly, eliminates “nan” error.

9 years agofix bug #5599
Viet Dinh [Sun, 1 Nov 2015 16:08:01 +0000 (11:08 -0500)]
fix bug #5599

9 years agoMerge pull request #5575 from mshabunin:fix-vs2015-2.4
Maksim Shabunin [Fri, 30 Oct 2015 13:47:18 +0000 (13:47 +0000)]
Merge pull request #5575 from mshabunin:fix-vs2015-2.4

9 years agoFixed cmake and build issues when using Visual Studio 2015
Maksim Shabunin [Mon, 26 Oct 2015 13:55:42 +0000 (16:55 +0300)]
Fixed cmake and build issues when using Visual Studio 2015

9 years agoMerge pull request #5574 from ilya-lavrenov:image-sequence-videocapture
Alexander Alekhin [Tue, 27 Oct 2015 15:41:58 +0000 (15:41 +0000)]
Merge pull request #5574 from ilya-lavrenov:image-sequence-videocapture

9 years agoreturn false in grabFrame failed in open method
Ilya Lavrenov [Tue, 27 Oct 2015 13:56:31 +0000 (16:56 +0300)]
return false in grabFrame failed in open method

9 years agofixed case when grabbing failed
Ilya Lavrenov [Tue, 27 Oct 2015 13:26:24 +0000 (16:26 +0300)]
fixed case when grabbing failed

9 years agoallow to retrieve videocapture properties before first frame reading
Ilya Lavrenov [Mon, 26 Oct 2015 11:37:38 +0000 (14:37 +0300)]
allow to retrieve videocapture properties before first frame reading

9 years agoMerge pull request #5568 from asmorkalov:as/legacy_c_deb_pack_dep
Alexander Alekhin [Fri, 23 Oct 2015 15:37:26 +0000 (15:37 +0000)]
Merge pull request #5568 from asmorkalov:as/legacy_c_deb_pack_dep

9 years agoDebian packages with legacy C headers added to list of conflicts, relpaces, etc.
Alexander Smorkalov [Fri, 23 Oct 2015 09:28:09 +0000 (12:28 +0300)]
Debian packages with legacy C headers added to list of conflicts, relpaces, etc.

9 years agoMerge pull request #5533 from sturkmen72:patch-12
Maksim Shabunin [Thu, 22 Oct 2015 12:30:38 +0000 (12:30 +0000)]
Merge pull request #5533 from sturkmen72:patch-12

9 years agoMerge pull request #5500 from StevenPuttemans:fix_mask_notice_copyTo_2.4
Maksim Shabunin [Thu, 22 Oct 2015 12:28:54 +0000 (12:28 +0000)]
Merge pull request #5500 from StevenPuttemans:fix_mask_notice_copyTo_2.4

9 years agoMerge pull request #5552 from hyunkim9123:camshift-2.4
Alexander Alekhin [Wed, 21 Oct 2015 06:13:38 +0000 (06:13 +0000)]
Merge pull request #5552 from hyunkim9123:camshift-2.4

9 years agoMerge pull request #5545 from alalek:fix_linker_libs
Alexander Alekhin [Mon, 19 Oct 2015 15:29:02 +0000 (15:29 +0000)]
Merge pull request #5545 from alalek:fix_linker_libs

9 years agoexport simple libs from OPENCV_LINKER_LIBS (fix #5541)
Alexander Alekhin [Mon, 19 Oct 2015 10:36:44 +0000 (13:36 +0300)]
export simple libs from OPENCV_LINKER_LIBS (fix #5541)

9 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

9 years agoUpdate camera_calibration_and_3d_reconstruction.rst
Suleyman TURKMEN [Fri, 16 Oct 2015 19:30:00 +0000 (22:30 +0300)]
Update camera_calibration_and_3d_reconstruction.rst

9 years agoMerge pull request #5514 from asmorkalov:as/nonfree-independent-samples
Alexander Smorkalov [Thu, 15 Oct 2015 10:56:23 +0000 (10:56 +0000)]
Merge pull request #5514 from asmorkalov:as/nonfree-independent-samples

9 years agoMerge pull request #5501 from asmorkalov:as/samples_lintian_fixes
Alexander Smorkalov [Thu, 15 Oct 2015 10:52:46 +0000 (10:52 +0000)]
Merge pull request #5501 from asmorkalov:as/samples_lintian_fixes

9 years agoFixed samples build with nonfree.
Alexander Smorkalov [Wed, 14 Oct 2015 13:19:37 +0000 (16:19 +0300)]
Fixed samples build with nonfree.

9 years agoMerge pull request #5511 from paleozogt:android-64-bit
Alexander Alekhin [Wed, 14 Oct 2015 11:35:04 +0000 (11:35 +0000)]
Merge pull request #5511 from paleozogt:android-64-bit

9 years agoMade samples build independent from nonfree module.
Alexander Smorkalov [Wed, 14 Oct 2015 09:52:32 +0000 (12:52 +0300)]
Made samples build independent from nonfree module.

9 years agoMerge pull request #5505 from a-andre:highguiheader
Alexander Alekhin [Wed, 14 Oct 2015 09:11:20 +0000 (09:11 +0000)]
Merge pull request #5505 from a-andre:highguiheader

9 years agobrining over fix in master (#4140) for libz import on 64-bit android
Aaron Simmons [Tue, 13 Oct 2015 23:42:40 +0000 (17:42 -0600)]
brining over fix in master (#4140) for libz import on 64-bit android

9 years agoinstall opencv2/highgui.hpp header
a-andre [Tue, 13 Oct 2015 16:16:14 +0000 (18:16 +0200)]
install opencv2/highgui.hpp header

9 years agoMerge pull request #5498 from asmorkalov:as/copyright_headers
Alexander Alekhin [Tue, 13 Oct 2015 14:22:57 +0000 (14:22 +0000)]
Merge pull request #5498 from asmorkalov:as/copyright_headers

9 years agoSet of lintain warning fixes for -samples debian package.
Alexander Smorkalov [Tue, 13 Oct 2015 13:32:53 +0000 (16:32 +0300)]
Set of lintain warning fixes for -samples debian package.

9 years agoadding extra explanation for mask parameter
StevenPuttemans [Tue, 13 Oct 2015 12:26:03 +0000 (14:26 +0200)]
adding extra explanation for mask parameter

9 years agoAdded missing copyright headers.
Alexander Smorkalov [Tue, 13 Oct 2015 12:02:38 +0000 (15:02 +0300)]
Added missing copyright headers.

9 years agoMerge pull request #5494 from asmorkalov:as/deb_copyright
Alexander Alekhin [Tue, 13 Oct 2015 08:54:20 +0000 (08:54 +0000)]
Merge pull request #5494 from asmorkalov:as/deb_copyright

9 years agoDebian formatted copyright file added to all debian packages.
Alexander Smorkalov [Mon, 12 Oct 2015 08:37:26 +0000 (11:37 +0300)]
Debian formatted copyright file added to all debian packages.

9 years agoMerge pull request #5491 from ilya-lavrenov:video-writers-delete
Alexander Alekhin [Mon, 12 Oct 2015 10:48:16 +0000 (10:48 +0000)]
Merge pull request #5491 from ilya-lavrenov:video-writers-delete

9 years agoMerge pull request #5490 from ilya-lavrenov:mem-leak-calib3d
Alexander Alekhin [Mon, 12 Oct 2015 10:47:50 +0000 (10:47 +0000)]
Merge pull request #5490 from ilya-lavrenov:mem-leak-calib3d

9 years agodelete video readers
Ilya Lavrenov [Sun, 11 Oct 2015 21:37:46 +0000 (00:37 +0300)]
delete video readers

9 years agofixed memory leak in findHomography tests
Ilya Lavrenov [Sun, 11 Oct 2015 21:11:45 +0000 (00:11 +0300)]
fixed memory leak in findHomography tests

9 years agoMerge pull request #5461 from berak:fix_putText_24
Alexander Alekhin [Tue, 6 Oct 2015 17:12:25 +0000 (17:12 +0000)]
Merge pull request #5461 from berak:fix_putText_24

9 years agofix zero length std::string in putText()
berak [Tue, 6 Oct 2015 16:25:24 +0000 (18:25 +0200)]
fix zero length std::string in putText()

9 years agoMerge pull request #5398 from asmorkalov:as/wrong-name-for-changelog-of-native-package
Alexander Alekhin [Mon, 28 Sep 2015 13:41:46 +0000 (13:41 +0000)]
Merge pull request #5398 from asmorkalov:as/wrong-name-for-changelog-of-native-package

9 years agoFixed wrong-name-for-changelog-of-native-package warning for deb packages.
Alexander Smorkalov [Thu, 24 Sep 2015 12:52:17 +0000 (15:52 +0300)]
Fixed wrong-name-for-changelog-of-native-package warning for deb packages.

9 years agoMerge pull request #5403 from sturkmen72:patch-9
Alexander Alekhin [Fri, 25 Sep 2015 12:08:13 +0000 (12:08 +0000)]
Merge pull request #5403 from sturkmen72:patch-9

9 years agoUpdate how_to_scan_images.cpp
Suleyman TURKMEN [Thu, 24 Sep 2015 23:57:29 +0000 (02:57 +0300)]
Update how_to_scan_images.cpp

9 years agoMerge pull request #5395 from enesates:patch-2
Maksim Shabunin [Fri, 25 Sep 2015 07:35:14 +0000 (07:35 +0000)]
Merge pull request #5395 from enesates:patch-2

9 years agoMerge pull request #5202 from ilya-lavrenov:gstreamer-v4l2
Alexander Alekhin [Thu, 24 Sep 2015 14:46:22 +0000 (14:46 +0000)]
Merge pull request #5202 from ilya-lavrenov:gstreamer-v4l2

9 years agoXML file path correction
Enes Ateş [Thu, 24 Sep 2015 08:34:42 +0000 (10:34 +0200)]
XML file path correction

in documentation exact path is images/CameraCalibration/VID5

see also PR #5393

9 years agoMerge pull request #5381 from robertxwu:Bugfix_for_issue_#_of_5145
Alexander Alekhin [Wed, 23 Sep 2015 09:58:24 +0000 (09:58 +0000)]
Merge pull request #5381 from robertxwu:Bugfix_for_issue_#_of_5145

9 years agore-submit
robertxwu [Mon, 21 Sep 2015 20:57:25 +0000 (13:57 -0700)]
re-submit

9 years agoMerge pull request #5357 from fxtentacle:ha-2.4.11
Vadim Pisarevsky [Mon, 21 Sep 2015 14:31:13 +0000 (14:31 +0000)]
Merge pull request #5357 from fxtentacle:ha-2.4.11

9 years agoMerge pull request #5359 from StevenPuttemans:contributing_guidelines_2.4
Vadim Pisarevsky [Mon, 21 Sep 2015 11:53:06 +0000 (11:53 +0000)]
Merge pull request #5359 from StevenPuttemans:contributing_guidelines_2.4

9 years agoMerge pull request #5360 from SpecLad:test2-fail-on-failed-download
Alexander Alekhin [Fri, 18 Sep 2015 12:10:52 +0000 (12:10 +0000)]
Merge pull request #5360 from SpecLad:test2-fail-on-failed-download

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 agoadd link to contributing guidelines
StevenPuttemans [Thu, 17 Sep 2015 12:14:21 +0000 (14:14 +0200)]
add link to contributing guidelines

9 years agobuffer_size should be in bytes, not bits
Hajo Nils Krabbenhöft [Wed, 16 Sep 2015 20:19:51 +0000 (22:19 +0200)]
buffer_size should be in bytes, not bits

9 years agofix crash for large BW tif images
Hajo Nils Krabbenhöft [Wed, 16 Sep 2015 20:04:42 +0000 (22:04 +0200)]
fix crash for large BW tif images

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

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

Fix bug when enter 4 channel image to LineAA function.

9 years agoMerge pull request #5290 from ilya-lavrenov:cmake_bug
Alexander Alekhin [Fri, 11 Sep 2015 09:49:42 +0000 (09:49 +0000)]
Merge pull request #5290 from ilya-lavrenov:cmake_bug

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 agoMerge pull request #5325 from jet47:gpu-stereobp-fix
Alexander Alekhin [Thu, 10 Sep 2015 14:40:05 +0000 (14:40 +0000)]
Merge pull request #5325 from jet47:gpu-stereobp-fix

9 years agoadd extra checks to data_step_down to prevent out-of-border access
Vladislav Vinogradov [Thu, 10 Sep 2015 07:05:25 +0000 (10:05 +0300)]
add extra checks to data_step_down to prevent out-of-border access

9 years agorevert previous change in gpu::StereoBeliefPropogation
Vladislav Vinogradov [Thu, 10 Sep 2015 07:05:04 +0000 (10:05 +0300)]
revert previous change in gpu::StereoBeliefPropogation

9 years agofix for gpu::StereoBeliefPropogation:
Vladislav Vinogradov [Tue, 8 Sep 2015 13:04:28 +0000 (16:04 +0300)]
fix for gpu::StereoBeliefPropogation:

use continuous memory for internal buffers

9 years agoMerge pull request #5313 from sturkmen72:patch-5
Vadim Pisarevsky [Wed, 9 Sep 2015 10:39:25 +0000 (10:39 +0000)]
Merge pull request #5313 from sturkmen72:patch-5

9 years agoMerge pull request #5315 from elenash:core_remove_slice
Vadim Pisarevsky [Wed, 9 Sep 2015 10:25:45 +0000 (10:25 +0000)]
Merge pull request #5315 from elenash:core_remove_slice

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 agoUpdate drawing.cpp
Suleyman TURKMEN [Mon, 7 Sep 2015 08:33:29 +0000 (11:33 +0300)]
Update drawing.cpp

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

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