platform/upstream/opencv.git
8 years agoMerge pull request #6001 from terfendail:pyrsegmentation_valgrind
Alexander Alekhin [Thu, 21 Jan 2016 15:03:46 +0000 (15:03 +0000)]
Merge pull request #6001 from terfendail:pyrsegmentation_valgrind

8 years agoMerge pull request #5993 from asmorkalov:linitian_signed_packages
Alexander Alekhin [Thu, 21 Jan 2016 15:03:31 +0000 (15:03 +0000)]
Merge pull request #5993 from asmorkalov:linitian_signed_packages

8 years agoAdded lintian overrides for package signature entry.
Alexander Smorkalov [Wed, 20 Jan 2016 08:58:48 +0000 (11:58 +0300)]
Added lintian overrides for package signature entry.

8 years agoFixed "Conditional jump or move depends on uninitialised value(s)" valgrind issue...
Vitaly Tuzov [Wed, 20 Jan 2016 16:20:36 +0000 (19:20 +0300)]
Fixed "Conditional jump or move depends on uninitialised value(s)" valgrind issue due to wrong pointer recalculation for zero level of pyramid.

8 years agoMerge pull request #5995 from alalek:fix_include_opencv_24
Alexander Alekhin [Thu, 21 Jan 2016 05:16:37 +0000 (05:16 +0000)]
Merge pull request #5995 from alalek:fix_include_opencv_24

8 years agoMerge pull request #5996 from ElenaGvozdeva:pyrUp_fix
Alexander Alekhin [Wed, 20 Jan 2016 15:50:59 +0000 (15:50 +0000)]
Merge pull request #5996 from ElenaGvozdeva:pyrUp_fix

8 years agoinclude available modules only
Alexander Alekhin [Wed, 20 Jan 2016 10:06:51 +0000 (13:06 +0300)]
include available modules only

8 years agofix bug on border at pyrUp
Elena Gvozdeva [Wed, 20 Jan 2016 10:07:07 +0000 (13:07 +0300)]
fix bug on border at pyrUp

8 years agoMerge pull request #5984 from terfendail:2.4
Vadim Pisarevsky [Tue, 19 Jan 2016 10:49:56 +0000 (10:49 +0000)]
Merge pull request #5984 from terfendail:2.4

8 years agoRemoved ioctl calls to query for VIDIOC_G_INPUT and VIDIOC_ENUMINPUT since informatio...
Vitaly Tuzov [Mon, 18 Jan 2016 09:54:53 +0000 (12:54 +0300)]
Removed ioctl calls to query for VIDIOC_G_INPUT and VIDIOC_ENUMINPUT since information returned by the calls is never used.
Fixed icvCaptureFromCAM_V4L return value in case of V4L2 camera initialization failure.

8 years agoMerge pull request #5975 from terfendail:2.4
Alexander Alekhin [Fri, 15 Jan 2016 11:45:10 +0000 (11:45 +0000)]
Merge pull request #5975 from terfendail:2.4

8 years agoUpdate call to Tegra optimized morphology filtering
Vitaly Tuzov [Fri, 4 Dec 2015 11:31:24 +0000 (14:31 +0300)]
Update call to Tegra optimized morphology filtering

8 years agoMerge pull request #5946 from takacsd:patch-1
Alexander Alekhin [Tue, 12 Jan 2016 08:08:58 +0000 (08:08 +0000)]
Merge pull request #5946 from takacsd:patch-1

8 years agoAdd missing implementation to one of the Mat_<_Tp> constructor. (#5945)
takacsd [Mon, 11 Jan 2016 15:05:22 +0000 (16:05 +0100)]
Add missing implementation to one of the Mat_<_Tp> constructor. (#5945)

8 years agoMerge pull request #5942 from akarsakov:fix_memcpy_empty_vector
Alexander Alekhin [Mon, 11 Jan 2016 11:12:31 +0000 (11:12 +0000)]
Merge pull request #5942 from akarsakov:fix_memcpy_empty_vector

8 years agoFixed pnpTask: don't copy inliers vector in case it's empty.
Alexander Karsakov [Mon, 11 Jan 2016 08:39:18 +0000 (11:39 +0300)]
Fixed pnpTask: don't copy inliers vector in case it's empty.

8 years agoMerge pull request #5858 from mshabunin:fix-arm-cross-warnings
Alexander Alekhin [Thu, 24 Dec 2015 09:07:29 +0000 (09:07 +0000)]
Merge pull request #5858 from mshabunin:fix-arm-cross-warnings

8 years agoMerge pull request #5869 from atinfinity:pullreq/151223-FindTBB-VS2015-2.4
Alexander Alekhin [Wed, 23 Dec 2015 16:16:56 +0000 (16:16 +0000)]
Merge pull request #5869 from atinfinity:pullreq/151223-FindTBB-VS2015-2.4

8 years agochanged to find TBB library(VS2015)
atinfinity [Wed, 23 Dec 2015 14:43:01 +0000 (23:43 +0900)]
changed to find TBB library(VS2015)

8 years agoMerge pull request #5846 from mshabunin:backports-3
Alexander Alekhin [Tue, 22 Dec 2015 17:31:19 +0000 (17:31 +0000)]
Merge pull request #5846 from mshabunin:backports-3

8 years agoFixed PCH warning during ARM crosscompilation
Maksim Shabunin [Tue, 22 Dec 2015 12:58:39 +0000 (15:58 +0300)]
Fixed PCH warning during ARM crosscompilation

8 years agoBackported several changes from master branch:
Maksim Shabunin [Fri, 27 Feb 2015 15:59:55 +0000 (18:59 +0300)]
Backported several changes from master branch:
- #3771 - inline round on ARM
- #5633 - documentation for MSER
- #5666 - run.py fixes

8 years agoMerge pull request #5763 from ilya-lavrenov:lintian
Alexander Smorkalov [Wed, 16 Dec 2015 11:27:59 +0000 (11:27 +0000)]
Merge pull request #5763 from ilya-lavrenov:lintian

8 years agosuppress lintian warning in opencv.pc
Ilya Lavrenov [Mon, 7 Dec 2015 10:21:51 +0000 (13:21 +0300)]
suppress lintian warning in opencv.pc

8 years agoMerge pull request #5733 from teng88:patch-3
Vadim Pisarevsky [Mon, 7 Dec 2015 10:08:23 +0000 (10:08 +0000)]
Merge pull request #5733 from teng88:patch-3

8 years agoMerge pull request #5720 from asmorkalov:as/cuda_qnx
Maksim Shabunin [Thu, 3 Dec 2015 07:41:22 +0000 (07:41 +0000)]
Merge pull request #5720 from asmorkalov:as/cuda_qnx

8 years agoUpdate cascadeclassifier.cpp
Teng Cao [Wed, 2 Dec 2015 09:31:17 +0000 (17:31 +0800)]
Update cascadeclassifier.cpp

minor fix since predict() returun int

8 years agoBuild fix for QNX 6.6 neitrino.
Alexander Smorkalov [Mon, 30 Nov 2015 07:28:04 +0000 (10:28 +0300)]
Build fix for QNX 6.6 neitrino.

8 years agoMerge pull request #5713 from ilya-lavrenov:lintian
Alexander Smorkalov [Thu, 26 Nov 2015 08:20:12 +0000 (08:20 +0000)]
Merge pull request #5713 from ilya-lavrenov:lintian

8 years agoadded suppression for python-script-but-no-python-dep
Ilya Lavrenov [Wed, 25 Nov 2015 20:38:33 +0000 (23:38 +0300)]
added suppression for python-script-but-no-python-dep

8 years agoMerge pull request #5390 from StevenPuttemans:add_markers_2.4
Vadim Pisarevsky [Mon, 23 Nov 2015 13:40:00 +0000 (13:40 +0000)]
Merge pull request #5390 from StevenPuttemans:add_markers_2.4

8 years agoMerge pull request #5682 from ilya-lavrenov:lintian-overrides
Vadim Pisarevsky [Mon, 23 Nov 2015 13:38:38 +0000 (13:38 +0000)]
Merge pull request #5682 from ilya-lavrenov:lintian-overrides

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 agoadded lintian overrides for debian packages
Ilya Lavrenov [Thu, 19 Nov 2015 13:51:30 +0000 (16:51 +0300)]
added lintian overrides for debian packages

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.