platform/upstream/opencv.git
7 years agoMerge pull request #7819 from alalek:fix_mulSpectrums_inplace_2.4
Alexander Alekhin [Wed, 14 Dec 2016 11:00:53 +0000 (11:00 +0000)]
Merge pull request #7819 from alalek:fix_mulSpectrums_inplace_2.4

7 years agoMerge pull request #7754 from LAZI-2240:toupstream2.4
bedbad [Mon, 12 Dec 2016 19:29:53 +0000 (14:29 -0500)]
Merge pull request #7754 from LAZI-2240:toupstream2.4

Introducing boundingRect2f() (#7754)

* Introducing boundingRect2f to return exact bounding float rectangle for RotatedRect

* Introducing boundingRect2f to return exact bounding float rectangle for RotatedRect

* Introducing boundingRect2f() - update

* Introducing boundingRect2f to return exact bounding float rectangle for RotatedRect

* Introducing boundingRect2f() - update - tested

7 years agotest: fix mulSpectrums error tolerance
Alexander Alekhin [Sat, 10 Dec 2016 12:53:57 +0000 (15:53 +0300)]
test: fix mulSpectrums error tolerance

7 years agocmake: disable warning C4127 for MSVS < 2015
Alexander Alekhin [Thu, 8 Dec 2016 15:02:57 +0000 (18:02 +0300)]
cmake: disable warning C4127 for MSVS < 2015

7 years agomulSpectrums: refactor code
Alexander Alekhin [Thu, 8 Dec 2016 10:20:38 +0000 (13:20 +0300)]
mulSpectrums: refactor code

7 years agocore: added inplace check in 'divSpectrums'
Alexander Alekhin [Wed, 7 Dec 2016 16:59:16 +0000 (19:59 +0300)]
core: added inplace check in 'divSpectrums'

7 years agotest: fix inplace in 'mulComplex' from test_dxt
Alexander Alekhin [Wed, 7 Dec 2016 16:55:40 +0000 (19:55 +0300)]
test: fix inplace in 'mulComplex' from test_dxt

7 years agocore: fix inplace support in mulSpectrums
Alexander Alekhin [Wed, 7 Dec 2016 16:27:19 +0000 (19:27 +0300)]
core: fix inplace support in mulSpectrums

7 years agoMerge pull request #7809 from alalek:backport_7797
Alexander Alekhin [Wed, 7 Dec 2016 16:20:45 +0000 (16:20 +0000)]
Merge pull request #7809 from alalek:backport_7797

7 years agoMerge pull request #7807 from alalek:ipp_build_fix_2.4
Alexander Alekhin [Wed, 7 Dec 2016 16:00:20 +0000 (16:00 +0000)]
Merge pull request #7807 from alalek:ipp_build_fix_2.4

7 years agoMerge pull request #7808 from alalek:backport_7767
Maksim Shabunin [Wed, 7 Dec 2016 14:01:38 +0000 (14:01 +0000)]
Merge pull request #7808 from alalek:backport_7767

7 years agoMerge pull request #7806 from alalek:backport_7640
Maksim Shabunin [Wed, 7 Dec 2016 14:00:40 +0000 (14:00 +0000)]
Merge pull request #7806 from alalek:backport_7640

7 years agoMerge pull request #7805 from alalek:fix_java_test_2.4
Maksim Shabunin [Wed, 7 Dec 2016 13:58:31 +0000 (13:58 +0000)]
Merge pull request #7805 from alalek:fix_java_test_2.4

7 years agoAdded VS2017 support (MSVC 1910)
Patrik Huber [Tue, 6 Dec 2016 00:04:24 +0000 (00:04 +0000)]
Added VS2017 support (MSVC 1910)

7 years agoFixed Intel C++ 17 build in VS2015
Maksim Shabunin [Thu, 1 Dec 2016 13:41:21 +0000 (16:41 +0300)]
Fixed Intel C++ 17 build in VS2015

7 years agoperf: remove tvl1 check for magic numbers, reduce number of samples
Alexander Alekhin [Thu, 10 Nov 2016 12:41:44 +0000 (15:41 +0300)]
perf: remove tvl1 check for magic numbers, reduce number of samples

7 years agotest: tvl1 test check update
Alexander Alekhin [Thu, 10 Nov 2016 12:39:18 +0000 (15:39 +0300)]
test: tvl1 test check update

7 years agojava: fix PATH environment variable
Alexander Alekhin [Tue, 6 Dec 2016 14:42:00 +0000 (17:42 +0300)]
java: fix PATH environment variable

7 years agoipp: disable compilation with IPP 9+
Alexander Alekhin [Mon, 28 Nov 2016 21:54:15 +0000 (00:54 +0300)]
ipp: disable compilation with IPP 9+

7 years agoMerge pull request #7743 from alalek:cmake_ffmpeg_cleanup_2.4
Vadim Pisarevsky [Tue, 29 Nov 2016 17:35:12 +0000 (17:35 +0000)]
Merge pull request #7743 from alalek:cmake_ffmpeg_cleanup_2.4

7 years agoMerge pull request #7741 from alalek:cmake_remove_legacy_pkgconfig
Vadim Pisarevsky [Mon, 28 Nov 2016 20:55:29 +0000 (20:55 +0000)]
Merge pull request #7741 from alalek:cmake_remove_legacy_pkgconfig

7 years agoMerge pull request #7742 from alalek:backport_5884
Vadim Pisarevsky [Mon, 28 Nov 2016 20:53:27 +0000 (20:53 +0000)]
Merge pull request #7742 from alalek:backport_5884

7 years agoMerge pull request #7739 from alalek:fix_gtk_deprecated_2.4
Vadim Pisarevsky [Mon, 28 Nov 2016 16:39:17 +0000 (16:39 +0000)]
Merge pull request #7739 from alalek:fix_gtk_deprecated_2.4

7 years agocmake: cleanup ffmpeg detection
Alexander Alekhin [Sun, 27 Nov 2016 20:31:04 +0000 (23:31 +0300)]
cmake: cleanup ffmpeg detection

7 years agocmake: add DEBUG_PRE/DEBUG_POST commands handling
Alexander Alekhin [Fri, 15 Jan 2016 11:03:48 +0000 (14:03 +0300)]
cmake: add DEBUG_PRE/DEBUG_POST commands handling

Useful for debug purposes:
    cmake -DDEBUG_POST="ocv_cmake_dump_vars(CUDA)" .
    cmake -DCMAKE_PRE="ocv_cmake_dump_vars(\"OPENCL|opencl\")" .

7 years agocmake: CMakeVars.txt (for debugging purpose)
Alexander Alekhin [Sun, 27 Nov 2016 18:15:40 +0000 (21:15 +0300)]
cmake: CMakeVars.txt (for debugging purpose)

7 years agocmake: remove outdated pkg-config module
Alexander Alekhin [Sun, 27 Nov 2016 17:42:39 +0000 (20:42 +0300)]
cmake: remove outdated pkg-config module

7 years agohighgui: g_thread_create deprecated warning
Alexander Alekhin [Fri, 25 Nov 2016 13:16:25 +0000 (16:16 +0300)]
highgui: g_thread_create deprecated warning

7 years agoMerge pull request #7733 from alalek:debug_check_matrelease_2.4
Alexander Alekhin [Sat, 26 Nov 2016 08:13:37 +0000 (08:13 +0000)]
Merge pull request #7733 from alalek:debug_check_matrelease_2.4

7 years agoMerge pull request #7727 from alalek:backport_7536
Alexander Alekhin [Sat, 26 Nov 2016 08:10:29 +0000 (08:10 +0000)]
Merge pull request #7727 from alalek:backport_7536

7 years agocalib3d: fix fisheye for test fisheyeTest.stereoCalibrateFixIntrinsic
Alexander Alekhin [Tue, 15 Nov 2016 19:25:42 +0000 (22:25 +0300)]
calib3d: fix fisheye for test fisheyeTest.stereoCalibrateFixIntrinsic

7 years agocore: drop type/dims/rows/cols information in Mat::release()
Alexander Alekhin [Tue, 15 Nov 2016 15:55:23 +0000 (18:55 +0300)]
core: drop type/dims/rows/cols information in Mat::release()

7 years agoviz: eliminate warnings from tutorial code
Alexander Alekhin [Fri, 21 Oct 2016 15:22:07 +0000 (18:22 +0300)]
viz: eliminate warnings from tutorial code

7 years agoviz: update for VTK6.2+
Alexander Alekhin [Fri, 21 Oct 2016 15:19:15 +0000 (18:19 +0300)]
viz: update for VTK6.2+

PCL PR 1205

7 years agoRevert "Fix for VTK6.2 issue."
Alexander Alekhin [Fri, 21 Oct 2016 14:57:33 +0000 (17:57 +0300)]
Revert "Fix for VTK6.2 issue."

This reverts commit f45da9866a94dbf52f5fb955bea67fce913ca515.

7 years agoMerge pull request #7711 from alalek:fix_java_tests_2.4
Alexander Alekhin [Thu, 24 Nov 2016 16:14:25 +0000 (16:14 +0000)]
Merge pull request #7711 from alalek:fix_java_tests_2.4

7 years agoMerge pull request #7708 from alalek:cmake_ccache_2.4
Alexander Alekhin [Thu, 24 Nov 2016 16:12:46 +0000 (16:12 +0000)]
Merge pull request #7708 from alalek:cmake_ccache_2.4

7 years agojava: fix Calib3d test
Alexander Alekhin [Tue, 15 Nov 2016 13:13:36 +0000 (16:13 +0300)]
java: fix Calib3d test

7 years agocmake: ccache
Alexander Alekhin [Tue, 8 Nov 2016 15:00:03 +0000 (18:00 +0300)]
cmake: ccache

7 years agojava: backport test changes from master
Alexander Alekhin [Wed, 23 Nov 2016 11:20:06 +0000 (14:20 +0300)]
java: backport test changes from master

7 years agoMerge pull request #7689 from alalek:warnings_2.4
Vadim Pisarevsky [Tue, 22 Nov 2016 13:30:25 +0000 (13:30 +0000)]
Merge pull request #7689 from alalek:warnings_2.4

7 years agoMerge pull request #7697 from alalek:backport_6561
Alexander Alekhin [Tue, 22 Nov 2016 11:01:28 +0000 (11:01 +0000)]
Merge pull request #7697 from alalek:backport_6561

7 years agoMerge pull request #7698 from alalek:backport_perf_gabor
Vadim Pisarevsky [Mon, 21 Nov 2016 14:42:54 +0000 (14:42 +0000)]
Merge pull request #7698 from alalek:backport_perf_gabor

7 years agotest: backport check for Image_KernelSize_GaborFilter2d perf test
Alexander Alekhin [Mon, 21 Nov 2016 11:31:26 +0000 (14:31 +0300)]
test: backport check for Image_KernelSize_GaborFilter2d perf test

7 years agofix Core_MulSpectrum test on 64bit ARM + release mode
Tomoaki Teshima [Fri, 20 May 2016 09:17:22 +0000 (18:17 +0900)]
fix Core_MulSpectrum test on 64bit ARM + release mode
  * fix issue 6536
  * increase threshold in particular tests due to the difference of fmsub and fsub

7 years agoMerge pull request #7690 from alalek:backport_arm_toolchain
Alexander Alekhin [Sun, 20 Nov 2016 11:38:01 +0000 (11:38 +0000)]
Merge pull request #7690 from alalek:backport_arm_toolchain

7 years agotest: fix Legacy_StereoGC.regression assertion
Alexander Alekhin [Tue, 15 Nov 2016 15:51:17 +0000 (18:51 +0300)]
test: fix Legacy_StereoGC.regression assertion

7 years agobackport ARM toolchain from master
Alexander Alekhin [Mon, 14 Nov 2016 15:59:18 +0000 (18:59 +0300)]
backport ARM toolchain from master

7 years agowarnings
Alexander Alekhin [Tue, 15 Nov 2016 13:13:30 +0000 (16:13 +0300)]
warnings

7 years agobuild: OSSpinLock deprecation warning
Alexander Alekhin [Thu, 10 Nov 2016 17:04:08 +0000 (20:04 +0300)]
build: OSSpinLock deprecation warning

7 years agoFixed several GCC 5.x warnings
Maksim Shabunin [Wed, 31 Aug 2016 20:12:52 +0000 (23:12 +0300)]
Fixed several GCC 5.x warnings

7 years agoMerge pull request #7672 from dec1:2.4
Alexander Alekhin [Tue, 15 Nov 2016 19:01:46 +0000 (19:01 +0000)]
Merge pull request #7672 from dec1:2.4

7 years agofix compiler error when building with gnu-5 toolchain (eg as currently shipped with...
Declan Moran [Mon, 14 Nov 2016 16:21:53 +0000 (17:21 +0100)]
fix compiler error when building with gnu-5 toolchain (eg as currently shipped with crystax.org android ndk, and presumably soon with android studio).

"ts_perf.cpp ....error: 'errno' was not declared in this scope
      int err=errno;"

7 years agoMerge pull request #7655 from alalek:backport_7213
Alexander Alekhin [Mon, 14 Nov 2016 13:42:31 +0000 (13:42 +0000)]
Merge pull request #7655 from alalek:backport_7213

7 years agoffmpeg: backport 7213
Alexander Alekhin [Fri, 11 Nov 2016 13:27:22 +0000 (16:27 +0300)]
ffmpeg: backport 7213

Commit:
  6d54abbd0fc64b23ea0b97f3c906cba219b52dc8

7 years agoMerge pull request #7529 from alalek:backport_7526
Vadim Pisarevsky [Wed, 2 Nov 2016 10:50:45 +0000 (10:50 +0000)]
Merge pull request #7529 from alalek:backport_7526

7 years agoMerge pull request #7559 from alalek:cv_xadd_24
Alexander Alekhin [Thu, 27 Oct 2016 16:00:37 +0000 (16:00 +0000)]
Merge pull request #7559 from alalek:cv_xadd_24

7 years agocore: update CV_XADD
Alexander Alekhin [Thu, 27 Oct 2016 10:22:13 +0000 (13:22 +0300)]
core: update CV_XADD

Allow to use custom implementations of CV_XADD (passed via -D of CXXFLAGS)

7 years agots: 2.4 changes
Alexander Alekhin [Thu, 20 Oct 2016 13:26:19 +0000 (16:26 +0300)]
ts: 2.4 changes

7 years agots: update run.py
Alexander Alekhin [Thu, 20 Oct 2016 11:35:34 +0000 (14:35 +0300)]
ts: update run.py

Add information about python bindings

7 years agoMerge pull request #7499 from catree:add_distortion_images_2.4
Alexander Alekhin [Mon, 17 Oct 2016 03:21:45 +0000 (03:21 +0000)]
Merge pull request #7499 from catree:add_distortion_images_2.4

7 years agoMerge pull request #7498 from catree:morphology_additional_information_2.4
Alexander Alekhin [Mon, 17 Oct 2016 03:21:26 +0000 (03:21 +0000)]
Merge pull request #7498 from catree:morphology_additional_information_2.4

7 years agoAdd example image about distortion effect.
catree [Sun, 16 Oct 2016 22:18:41 +0000 (00:18 +0200)]
Add example image about distortion effect.

7 years agoAdd images for tutorials on morphological operations to avoid possible confusion.
catree [Sun, 16 Oct 2016 22:01:08 +0000 (00:01 +0200)]
Add images for tutorials on morphological operations to avoid possible confusion.

7 years agoMerge pull request #7452 from reunanen:issue-7409-2.4
Juha Reunanen [Wed, 12 Oct 2016 07:37:07 +0000 (10:37 +0300)]
Merge pull request #7452 from reunanen:issue-7409-2.4

Fix findContours crash for very large images (v2.4)

* Cast step to size_t in order to avoid integer overflow when processing very large images

* Change assert to CV_Assert

7 years agoMerge pull request #7414 from StevenPuttemans:fix_docs_OPENNI_2.4
Vadim Pisarevsky [Thu, 6 Oct 2016 13:26:47 +0000 (13:26 +0000)]
Merge pull request #7414 from StevenPuttemans:fix_docs_OPENNI_2.4

7 years agobackport of 7361
StevenPuttemans [Thu, 6 Oct 2016 11:42:12 +0000 (13:42 +0200)]
backport of 7361

7 years agoMerge pull request #7391 from alalek:24_fix_7388
Vadim Pisarevsky [Tue, 4 Oct 2016 12:42:18 +0000 (12:42 +0000)]
Merge pull request #7391 from alalek:24_fix_7388

7 years agoMerge pull request #7379 from catree:fix_hitmiss_doc_link_2.4
Vadim Pisarevsky [Tue, 4 Oct 2016 12:15:35 +0000 (12:15 +0000)]
Merge pull request #7379 from catree:fix_hitmiss_doc_link_2.4

7 years agocmake: fix for GCC 6.x
Alexander Alekhin [Tue, 4 Oct 2016 10:30:43 +0000 (13:30 +0300)]
cmake: fix for GCC 6.x

7 years agoMerge pull request #7383 from alalek:fix_get_property
Alexander Alekhin [Sun, 2 Oct 2016 11:34:36 +0000 (11:34 +0000)]
Merge pull request #7383 from alalek:fix_get_property

7 years agovideoio: remove 'const' from getProperty
Alexander Alekhin [Sun, 2 Oct 2016 00:04:37 +0000 (03:04 +0300)]
videoio: remove 'const' from getProperty

'const' is available in OpenCV 3.x only

7 years agoFix dead link for hit or miss 2.4 documentation.
catree [Fri, 30 Sep 2016 21:56:35 +0000 (23:56 +0200)]
Fix dead link for hit or miss 2.4 documentation.

7 years agoMerge pull request #7314 from alalek:backport_7266
Vadim Pisarevsky [Thu, 22 Sep 2016 11:28:46 +0000 (11:28 +0000)]
Merge pull request #7314 from alalek:backport_7266

7 years agohighgui/osx: backport AVFoundation support
Alexander Alekhin [Mon, 19 Sep 2016 16:51:10 +0000 (19:51 +0300)]
highgui/osx: backport AVFoundation support

7 years agohighgui: clone cap_avfoundation_mac.mm from master
Alexander Alekhin [Mon, 19 Sep 2016 16:46:42 +0000 (19:46 +0300)]
highgui: clone cap_avfoundation_mac.mm from master

7 years agoOpenCV version++
Alexander Alekhin [Fri, 16 Sep 2016 11:58:07 +0000 (14:58 +0300)]
OpenCV version++

7 years agoMerge pull request #7289 from alalek:android24
Alexander Alekhin [Fri, 16 Sep 2016 15:55:39 +0000 (15:55 +0000)]
Merge pull request #7289 from alalek:android24

7 years agofix documentation
Alexander Alekhin [Fri, 16 Sep 2016 13:10:41 +0000 (16:10 +0300)]
fix documentation

7 years agoandroid: backport Android SDK build script
Alexander Alekhin [Fri, 16 Sep 2016 13:14:54 +0000 (16:14 +0300)]
android: backport Android SDK build script

7 years agoandroid: clone build_sdk.py from 3.x
Alexander Alekhin [Fri, 16 Sep 2016 13:03:35 +0000 (16:03 +0300)]
android: clone build_sdk.py from 3.x

7 years agoMerge pull request #7286 from alalek:fix_android_clang
Alexander Alekhin [Fri, 16 Sep 2016 09:56:34 +0000 (09:56 +0000)]
Merge pull request #7286 from alalek:fix_android_clang

7 years agoandroid: workaround for Android NDK-8e clang ICE
Alexander Alekhin [Wed, 14 Sep 2016 17:00:28 +0000 (20:00 +0300)]
android: workaround for Android NDK-8e clang ICE

7 years agoMerge pull request #7218 from savuor:fix2.4/copyTo
Vadim Pisarevsky [Wed, 14 Sep 2016 11:58:29 +0000 (11:58 +0000)]
Merge pull request #7218 from savuor:fix2.4/copyTo

7 years agoMerge pull request #7239 from savuor:fix2.4/ported
Alexander Alekhin [Thu, 8 Sep 2016 11:18:13 +0000 (11:18 +0000)]
Merge pull request #7239 from savuor:fix2.4/ported

7 years agofixed random failures in Core_DFT.complex_output2 test (the case of input_mat.cols...
Rostislav Vasilikhin [Mon, 5 Sep 2016 19:33:31 +0000 (22:33 +0300)]
fixed random failures in Core_DFT.complex_output2 test (the case of input_mat.cols == 1)

7 years agofixed invalid output of cv::dft when using DFT_ROWS + DFT_COMPLEX_OUTPUT (http:/...
Rostislav Vasilikhin [Mon, 5 Sep 2016 19:32:57 +0000 (22:32 +0300)]
fixed invalid output of cv::dft when using DFT_ROWS + DFT_COMPLEX_OUTPUT (code.opencv.org/issues/3428)

7 years agoadded test for http://code.opencv.org/issues/1918
Rostislav Vasilikhin [Mon, 5 Sep 2016 19:14:47 +0000 (22:14 +0300)]
added test for http://code.opencv.org/issues/1918

7 years agoadded test checking http://code.opencv.org/issues/4050
Rostislav Vasilikhin [Mon, 5 Sep 2016 18:55:17 +0000 (21:55 +0300)]
added test checking code.opencv.org/issues/4050

7 years agoMerge pull request #7242 from bkuhls:asm
Maksim Shabunin [Wed, 7 Sep 2016 09:09:29 +0000 (09:09 +0000)]
Merge pull request #7242 from bkuhls:asm

7 years agofixed optional args processing in SVD::compute()
Rostislav Vasilikhin [Tue, 6 Sep 2016 11:09:44 +0000 (14:09 +0300)]
fixed optional args processing in SVD::compute()

7 years agotypes_c.h: Fix compiling VFP assembler code
Bernd Kuhls [Tue, 6 Sep 2016 09:49:00 +0000 (11:49 +0200)]
types_c.h: Fix compiling VFP assembler code

Replace asm by __asm__ according to
https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords
as suggested by Arnout Vandecappelle:
http://lists.busybox.net/pipermail/buildroot/2016-September/171491.html

to fix build errors in ffmpeg with opencv2 support detected by
buildroot autobuilders:
http://autobuild.buildroot.net/results/c32/c32a21240a9933796ee850349a62ff3c2314f25c/build-end.log

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
7 years agofixed U non-orthogonality in SVD (http://code.opencv.org/issues/3801)
Rostislav Vasilikhin [Sat, 3 Sep 2016 18:58:19 +0000 (21:58 +0300)]
fixed U non-orthogonality in SVD (code.opencv.org/issues/3801)

7 years agofixed http://code.opencv.org/issues/3828
Rostislav Vasilikhin [Sat, 3 Sep 2016 18:49:54 +0000 (21:49 +0300)]
fixed http://code.opencv.org/issues/3828

7 years agofixed http://code.opencv.org/issues/4278
Rostislav Vasilikhin [Sat, 3 Sep 2016 17:28:54 +0000 (20:28 +0300)]
fixed http://code.opencv.org/issues/4278

7 years agointeger overflow fixed in getContinuousSize()
Rostislav Vasilikhin [Thu, 1 Sep 2016 22:50:54 +0000 (01:50 +0300)]
integer overflow fixed in getContinuousSize()

7 years agoMerge pull request #7206 from alalek:issue_7204
Alexander Alekhin [Thu, 1 Sep 2016 12:07:02 +0000 (12:07 +0000)]
Merge pull request #7206 from alalek:issue_7204

7 years agocalib3d: fix cornerSubPix memory error
Alexander Alekhin [Wed, 31 Aug 2016 12:18:25 +0000 (15:18 +0300)]
calib3d: fix cornerSubPix memory error

7 years agoMerge pull request #7152 from PkLab:fix_rho&phi_doc_2.4
Vadim Pisarevsky [Tue, 23 Aug 2016 20:36:39 +0000 (20:36 +0000)]
Merge pull request #7152 from PkLab:fix_rho&phi_doc_2.4

7 years agoFix rho,phi exchange. Backport to 2.4
PkLab.net [Mon, 22 Aug 2016 17:57:42 +0000 (19:57 +0200)]
Fix rho,phi exchange. Backport to 2.4