platform/upstream/opencv.git
8 years agoMerge pull request #5650 from hoangviet1985:fix_bug_5623
Maksim Shabunin [Fri, 20 Nov 2015 16:15:47 +0000 (16:15 +0000)]
Merge pull request #5650 from hoangviet1985:fix_bug_5623

8 years agoMerge pull request #5659 from jet47:cuda-wrap-stream-2.4
Maksim Shabunin [Thu, 19 Nov 2015 09:25:35 +0000 (09:25 +0000)]
Merge pull request #5659 from jet47:cuda-wrap-stream-2.4

8 years agoMerge pull request #5672 from ilya-lavrenov:npp-graphcut
Maksim Shabunin [Thu, 19 Nov 2015 09:18:23 +0000 (09:18 +0000)]
Merge pull request #5672 from ilya-lavrenov:npp-graphcut

8 years agoMerge pull request #5674 from mshabunin:mac-fix-2.4
Vadim Pisarevsky [Tue, 17 Nov 2015 17:30:07 +0000 (17:30 +0000)]
Merge pull request #5674 from mshabunin:mac-fix-2.4

8 years agoFix compilation problems with XCode 7.1.1 and cmake 3.3.2
Maksim Shabunin [Mon, 16 Nov 2015 15:07:24 +0000 (18:07 +0300)]
Fix compilation problems with XCode 7.1.1 and cmake 3.3.2

8 years agoGraphCut deprecated in 7.5 and removed in 8.0
Ilya Lavrenov [Sat, 14 Nov 2015 21:56:56 +0000 (00:56 +0300)]
GraphCut deprecated in 7.5 and removed in 8.0

8 years agoMerge pull request #5640 from mshabunin:restore-ts-gpu
Maksim Shabunin [Fri, 13 Nov 2015 15:47:17 +0000 (15:47 +0000)]
Merge pull request #5640 from mshabunin:restore-ts-gpu

8 years agoadd cv::gpu::StreamAccessor::wrapStream method
Vladislav Vinogradov [Thu, 12 Nov 2015 10:07:30 +0000 (13:07 +0300)]
add cv::gpu::StreamAccessor::wrapStream method

it allows to import existed CUDA stream to OpenCV

8 years agoMerge pull request #5652 from jet47:core-test-math-warning-fix
Alexander Alekhin [Thu, 12 Nov 2015 03:10:46 +0000 (03:10 +0000)]
Merge pull request #5652 from jet47:core-test-math-warning-fix

8 years agoMerge pull request #5655 from janstarzy:2.4-canny-fix
Alexander Alekhin [Thu, 12 Nov 2015 03:10:11 +0000 (03:10 +0000)]
Merge pull request #5655 from janstarzy:2.4-canny-fix

8 years agofix potential buffer overflow as in 3.0
Jan Starzynski [Wed, 11 Nov 2015 15:19:20 +0000 (16:19 +0100)]
fix potential buffer overflow as in 3.0

8 years agofix signed/unsigned comparison warning in core/test/test_math.cpp
Vladislav Vinogradov [Wed, 11 Nov 2015 08:53:39 +0000 (11:53 +0300)]
fix signed/unsigned comparison warning in core/test/test_math.cpp

8 years agoThe right signs give the right results
hoangviet1985 [Tue, 10 Nov 2015 21:18:07 +0000 (16:18 -0500)]
The right signs give the right results

8 years agoMerge pull request #5605 from hoangviet1985:fix_bug_5599
Vadim Pisarevsky [Tue, 10 Nov 2015 16:13:26 +0000 (16:13 +0000)]
Merge pull request #5605 from hoangviet1985:fix_bug_5599

8 years agoMerge pull request #5622 from LorenaGdL:hitAndMiss2.4
Vadim Pisarevsky [Tue, 10 Nov 2015 16:03:48 +0000 (16:03 +0000)]
Merge pull request #5622 from LorenaGdL:hitAndMiss2.4

8 years agoMerge pull request #5638 from hoangviet1985:fix_bug_5623
Vadim Pisarevsky [Tue, 10 Nov 2015 16:01:48 +0000 (16:01 +0000)]
Merge pull request #5638 from hoangviet1985:fix_bug_5623

8 years agoMerge pull request #5641 from alalek:backport_5320
Alexander Alekhin [Sat, 7 Nov 2015 05:21:31 +0000 (05:21 +0000)]
Merge pull request #5641 from alalek:backport_5320

8 years agoremove usage of obsolete _dataAsRows flag
berak [Tue, 8 Sep 2015 12:45:13 +0000 (14:45 +0200)]
remove usage of obsolete _dataAsRows flag

8 years agoRestore ts/gpu_perf.hpp, trying to compile with VS 2015
Maksim Shabunin [Fri, 6 Nov 2015 10:26:58 +0000 (13:26 +0300)]
Restore ts/gpu_perf.hpp, trying to compile with VS 2015

8 years agoclean up
Viet Dinh [Fri, 6 Nov 2015 05:29:44 +0000 (00:29 -0500)]
clean up

8 years agomac compile error
Viet Dinh [Fri, 6 Nov 2015 04:31:30 +0000 (23:31 -0500)]
mac compile error

8 years agoMerge remote-tracking branch 'Itseez/2.4' into fix_bug_5599
Viet Dinh [Fri, 6 Nov 2015 04:20:04 +0000 (23:20 -0500)]
Merge remote-tracking branch 'Itseez/2.4' into fix_bug_5599

8 years agomac osx compile errors
Viet Dinh [Fri, 6 Nov 2015 02:44:36 +0000 (21:44 -0500)]
mac osx compile errors

8 years agooptimize code
Viet Dinh [Fri, 6 Nov 2015 00:38:24 +0000 (19:38 -0500)]
optimize code

8 years agofix solveCubic
Viet Dinh [Fri, 6 Nov 2015 00:19:56 +0000 (19:19 -0500)]
fix solveCubic

The original solution did not handle correctly when delta = 0,
resulting as nan errors. I also wrote a test case to test solving
equation x^3 = 0 after fixing.

8 years agostd::cbrt could not be found
Viet Dinh [Wed, 4 Nov 2015 02:40:52 +0000 (21:40 -0500)]
std::cbrt could not be found

8 years agocasting warning
Viet Dinh [Wed, 4 Nov 2015 02:10:38 +0000 (21:10 -0500)]
casting warning

8 years agodeal with type casting issues
Viet Dinh [Tue, 3 Nov 2015 21:19:41 +0000 (16:19 -0500)]
deal with type casting issues

8 years agofix compile errors
Viet Dinh [Tue, 3 Nov 2015 20:37:25 +0000 (15:37 -0500)]
fix compile errors

some functions were not found in namespace std

8 years agoeven more correct
Viet Dinh [Tue, 3 Nov 2015 20:17:49 +0000 (15:17 -0500)]
even more correct

calculates cube root of complex number to give more correct results.

8 years agoHit and Miss morphological op
Lorena García [Tue, 3 Nov 2015 18:42:22 +0000 (19:42 +0100)]
Hit and Miss morphological op

8 years agoupdate test_math.cpp
Viet Dinh [Tue, 3 Nov 2015 17:52:49 +0000 (12:52 -0500)]
update test_math.cpp

8 years agoMerge pull request #5392 from elenash:fisheye_fix
Vadim Pisarevsky [Tue, 3 Nov 2015 10:57:36 +0000 (10:57 +0000)]
Merge pull request #5392 from elenash:fisheye_fix

8 years agofix whitespace errors
Viet Dinh [Mon, 2 Nov 2015 14:28:37 +0000 (09:28 -0500)]
fix whitespace errors

8 years agoupdate fixing bug #5599
Viet Dinh [Mon, 2 Nov 2015 13:38:05 +0000 (08:38 -0500)]
update fixing bug #5599

8 years agoMerge pull request #5586 from mshabunin:run-py-changes-2.4
Vadim Pisarevsky [Mon, 2 Nov 2015 12:05:00 +0000 (12:05 +0000)]
Merge pull request #5586 from mshabunin:run-py-changes-2.4

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

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

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

8 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.

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

8 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

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

Conflicts:
modules/ts/misc/run.py

8 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

8 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

8 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

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

8 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

8 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

8 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.

8 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

8 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

8 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

8 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

8 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)

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 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

8 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

8 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

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

8 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

8 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.

8 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

8 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

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

8 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

8 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.

8 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

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

8 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

8 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.

8 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

8 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

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

8 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

8 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

8 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()

8 years agoFix in fisheye calibrate function: #5389
Elena Shipunova [Wed, 23 Sep 2015 10:15:40 +0000 (13:15 +0300)]
Fix in fisheye calibrate function: #5389

8 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

8 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.

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 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.

8 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

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

8 years agoadd link to contributing guidelines
StevenPuttemans [Thu, 17 Sep 2015 12:14:21 +0000 (14:14 +0200)]
add link to contributing guidelines

8 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

8 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

8 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

8 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.

8 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

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