platform/upstream/opencv.git
8 years agoupdate watershed.py: check if windows are still open
Simon Hänisch [Mon, 27 Jun 2016 15:03:37 +0000 (17:03 +0200)]
update watershed.py: check if windows are still open

change the `while` loop to check if the two windows created by this example still exist, stop the program otherwise

8 years agoMerge pull request #6721 from alalek:tbb_update
Alexander Alekhin [Fri, 24 Jun 2016 12:54:55 +0000 (12:54 +0000)]
Merge pull request #6721 from alalek:tbb_update

8 years agoUpdate TBB
Vitaly Tuzov [Wed, 22 Jun 2016 16:20:24 +0000 (19:20 +0300)]
Update TBB

8 years agoMerge pull request #6713 from alalek:cmake_install_fix
Alexander Alekhin [Wed, 22 Jun 2016 20:35:14 +0000 (20:35 +0000)]
Merge pull request #6713 from alalek:cmake_install_fix

8 years agoMerge pull request #6712 from alalek:cmake_export_fix
Alexander Alekhin [Wed, 22 Jun 2016 20:34:46 +0000 (20:34 +0000)]
Merge pull request #6712 from alalek:cmake_export_fix

8 years agocmake: don't use absolute paths with/without CMAKE_INSTALL_PREFIX
Alexander Alekhin [Wed, 22 Jun 2016 13:12:52 +0000 (16:12 +0300)]
cmake: don't use absolute paths with/without CMAKE_INSTALL_PREFIX

CPack can't work with absolute paths.

8 years agocmake: fix export issue
Alexander Alekhin [Tue, 21 Jun 2016 19:32:30 +0000 (22:32 +0300)]
cmake: fix export issue

opencv_ts is static internal library and in case of exporting
it requires all static dependencies (include HAL files)

8 years agoMerge pull request #6709 from alalek:cmake_hal_fix
Alexander Alekhin [Tue, 21 Jun 2016 19:27:02 +0000 (19:27 +0000)]
Merge pull request #6709 from alalek:cmake_hal_fix

8 years agocmake: fix HAL dependencies for core module
Alexander Alekhin [Tue, 21 Jun 2016 16:50:32 +0000 (19:50 +0300)]
cmake: fix HAL dependencies for core module

Linker dependencies are transitive for non-private

8 years agoMerge pull request #6705 from alalek:fix_hal_imgproc
Alexander Alekhin [Tue, 21 Jun 2016 16:24:29 +0000 (16:24 +0000)]
Merge pull request #6705 from alalek:fix_hal_imgproc

8 years agoMerge pull request #6708 from alalek:pr6477
Alexander Alekhin [Tue, 21 Jun 2016 15:38:41 +0000 (15:38 +0000)]
Merge pull request #6708 from alalek:pr6477

8 years agoMerge pull request #6581 from mshabunin:hal_mag
Alexander Alekhin [Tue, 21 Jun 2016 13:16:17 +0000 (13:16 +0000)]
Merge pull request #6581 from mshabunin:hal_mag

8 years agoMerge pull request #6704 from alalek:cmake_cmp0042
Alexander Alekhin [Tue, 21 Jun 2016 10:46:08 +0000 (10:46 +0000)]
Merge pull request #6704 from alalek:cmake_cmp0042

8 years agohal: fix missing include "opencv2/imgproc/hal/interface.h"
Alexander Alekhin [Mon, 20 Jun 2016 16:25:49 +0000 (19:25 +0300)]
hal: fix missing include "opencv2/imgproc/hal/interface.h"

8 years agocmake: change CMP0042 policy value
Alexander Alekhin [Mon, 20 Jun 2016 14:19:13 +0000 (17:19 +0300)]
cmake: change CMP0042 policy value

8 years agoMerge pull request #5980 from alalek:cmake_opencv_config
Alexander Alekhin [Mon, 20 Jun 2016 15:27:43 +0000 (15:27 +0000)]
Merge pull request #5980 from alalek:cmake_opencv_config

8 years agocmake: refactoring of OpenCVConfig
Alexander Alekhin [Mon, 11 Jan 2016 14:54:14 +0000 (17:54 +0300)]
cmake: refactoring of OpenCVConfig

- removed OpenCV_LIB_DIR* vars (they are broken and not required anymore)
- OpenCVConfig.cmake doesn't contain ANDROID/CUDA code if there is no such support
- removed OpenCV2_INCLUDE_DIRS_CONFIGCMAKE, merged into OpenCV_INCLUDE_DIRS_CONFIGCMAKE
- fix hard-coded relative paths for OpenCV_INSTALL_PATH
- removed OpenCV_TBB_ARCH
- switch OpenCVConfig.cmake into 2-level mode for Android SDK

8 years agoandroid: update build scripts
Alexander Alekhin [Mon, 18 Jan 2016 11:11:02 +0000 (14:11 +0300)]
android: update build scripts

8 years agoMerge pull request #6675 from pnordhus:matconstiterator_reference
Alexander Alekhin [Fri, 17 Jun 2016 10:12:51 +0000 (10:12 +0000)]
Merge pull request #6675 from pnordhus:matconstiterator_reference

8 years agoMerge pull request #6668 from yadavankit:master
Alexander Alekhin [Fri, 17 Jun 2016 10:11:49 +0000 (10:11 +0000)]
Merge pull request #6668 from yadavankit:master

8 years agoMerge pull request #6535 from sovrasov:lapack-hal
Vadim Pisarevsky [Thu, 16 Jun 2016 20:09:47 +0000 (20:09 +0000)]
Merge pull request #6535 from sovrasov:lapack-hal

8 years agoMerge pull request #6453 from sovrasov:extend_calibrateCamera
Vadim Pisarevsky [Thu, 16 Jun 2016 18:28:49 +0000 (18:28 +0000)]
Merge pull request #6453 from sovrasov:extend_calibrateCamera

8 years agoMerge pull request #6690 from alalek:cmake_fix_android_samples
Alexander Alekhin [Thu, 16 Jun 2016 15:56:19 +0000 (15:56 +0000)]
Merge pull request #6690 from alalek:cmake_fix_android_samples

8 years agocmake: fix JNI configuration problem for Android samples
Alexander Alekhin [Thu, 16 Jun 2016 11:29:36 +0000 (14:29 +0300)]
cmake: fix JNI configuration problem for Android samples

Some CMake 3.x (2.8.12.2 is fine) provides broken build configurations
with following build error message:
    ld: fatal error: -soname: must take a non-empty argument

Linker command line sample contains this:
"-shared -Wl,-soname, -o"

8 years agoMerge pull request #6685 from ioxp:dofDocu
Alexander Alekhin [Wed, 15 Jun 2016 20:43:11 +0000 (20:43 +0000)]
Merge pull request #6685 from ioxp:dofDocu

8 years agoMerge pull request #6683 from alalek:cmake_hal
Alexander Alekhin [Wed, 15 Jun 2016 17:18:56 +0000 (17:18 +0000)]
Merge pull request #6683 from alalek:cmake_hal

8 years agorigidTransform: only four DoF
Philipp Hasper [Wed, 15 Jun 2016 14:41:39 +0000 (16:41 +0200)]
rigidTransform: only four DoF

combinations of translation, rotation, and uniform scaling equals four degrees of freedom

8 years agocmake: refactor HAL attaching process
Alexander Alekhin [Wed, 15 Jun 2016 12:51:19 +0000 (15:51 +0300)]
cmake: refactor HAL attaching process

8 years agoReturn reference on iterator indirection/subscript
Philipp Nordhus [Sat, 11 Jun 2016 13:17:52 +0000 (15:17 +0200)]
Return reference on iterator indirection/subscript

8 years agoFix typo
Ankit Yadav [Sat, 11 Jun 2016 12:26:58 +0000 (17:56 +0530)]
Fix typo

8 years agoMerge pull request #6649 from adamrankin:msmf_crash_fix
Alexander Alekhin [Wed, 8 Jun 2016 16:30:55 +0000 (16:30 +0000)]
Merge pull request #6649 from adamrankin:msmf_crash_fix

8 years agoCorrecting return type from videoDevice::findType to be int thus allowing detection...
Adam Rankin [Tue, 7 Jun 2016 19:14:27 +0000 (15:14 -0400)]
Correcting return type from videoDevice::findType to be int thus allowing detection of failed device init request

8 years agoMerge pull request #6645 from tomoaki0705:fixTypoEigen
Alexander Alekhin [Tue, 7 Jun 2016 13:51:30 +0000 (13:51 +0000)]
Merge pull request #6645 from tomoaki0705:fixTypoEigen

8 years agoAdd an extended version of CalibrateCamera function
Vladislav Sovrasov [Tue, 7 Jun 2016 09:31:11 +0000 (12:31 +0300)]
Add an extended version of CalibrateCamera function

8 years agoChange names of some internal functions
Vladislav Sovrasov [Tue, 7 Jun 2016 07:58:12 +0000 (10:58 +0300)]
Change names of some internal functions

8 years agofix typo
Tomoaki Teshima [Tue, 7 Jun 2016 05:53:04 +0000 (14:53 +0900)]
fix typo

8 years agoMerge pull request #6607 from alalek:issue_6604
Maksim Shabunin [Mon, 6 Jun 2016 09:20:57 +0000 (09:20 +0000)]
Merge pull request #6607 from alalek:issue_6604

8 years agoMerge pull request #6628 from sovrasov:hal_samples_update
Maksim Shabunin [Mon, 6 Jun 2016 09:18:26 +0000 (09:18 +0000)]
Merge pull request #6628 from sovrasov:hal_samples_update

8 years agoUpdate HAL samples
Vladislav Sovrasov [Fri, 3 Jun 2016 08:52:30 +0000 (11:52 +0300)]
Update HAL samples

8 years agoImplement internal HAL for GEMM and matrix decompositions
Vladislav Sovrasov [Fri, 3 Jun 2016 07:38:30 +0000 (10:38 +0300)]
Implement internal HAL for GEMM and matrix decompositions

8 years agoMerge pull request #6611 from tomoaki0705:fixPerformanceSplitAarch64
Alexander Alekhin [Wed, 1 Jun 2016 10:34:33 +0000 (10:34 +0000)]
Merge pull request #6611 from tomoaki0705:fixPerformanceSplitAarch64

8 years agolet the performance test of split pass on 64bit ARM
Tomoaki Teshima [Tue, 31 May 2016 14:57:49 +0000 (23:57 +0900)]
let the performance test of split pass on 64bit ARM
  * loosen the threshold only under aarch64
  * fix #6610

8 years agoMerge pull request #6482 from paroj:filestorage_py
Alexander Alekhin [Tue, 31 May 2016 11:53:34 +0000 (11:53 +0000)]
Merge pull request #6482 from paroj:filestorage_py

8 years agoMerge pull request #6485 from vagran:vagran-patch-1
Vadim Pisarevsky [Tue, 31 May 2016 10:58:18 +0000 (10:58 +0000)]
Merge pull request #6485 from vagran:vagran-patch-1

8 years agoMerge pull request #6537 from Slonegg:opeeni2_multiple_devices
Vadim Pisarevsky [Tue, 31 May 2016 10:35:44 +0000 (10:35 +0000)]
Merge pull request #6537 from Slonegg:opeeni2_multiple_devices

8 years agoMerge pull request #6593 from bramton:documentation-update
Vadim Pisarevsky [Tue, 31 May 2016 10:32:18 +0000 (10:32 +0000)]
Merge pull request #6593 from bramton:documentation-update

8 years agoMerge pull request #6597 from sturkmen72:issue_4678
Vadim Pisarevsky [Tue, 31 May 2016 10:31:15 +0000 (10:31 +0000)]
Merge pull request #6597 from sturkmen72:issue_4678

8 years agocore: prevent changes in 'std' namespace
Alexander Alekhin [Mon, 30 May 2016 14:49:54 +0000 (17:49 +0300)]
core: prevent changes in 'std' namespace

8 years agoHAL math interfaces: fastAtan2, magnitude, sqrt, invSqrt, log, exp
Maksim Shabunin [Tue, 24 May 2016 10:57:27 +0000 (13:57 +0300)]
HAL math interfaces: fastAtan2, magnitude, sqrt, invSqrt, log, exp

8 years agoMerge pull request #6008 from amroamroamro:fix_sparse_snippet
Alexander Alekhin [Tue, 31 May 2016 08:19:37 +0000 (08:19 +0000)]
Merge pull request #6008 from amroamroamro:fix_sparse_snippet

8 years agoMerge pull request #6602 from berak:patch-1
Maksim Shabunin [Mon, 30 May 2016 14:19:18 +0000 (14:19 +0000)]
Merge pull request #6602 from berak:patch-1

8 years agoUpdate non_linear_svms.cpp
berak [Mon, 30 May 2016 04:56:28 +0000 (06:56 +0200)]
Update non_linear_svms.cpp

fix for #6598

8 years agoUpdate highgui.hpp
Suleyman TURKMEN [Sat, 28 May 2016 02:25:25 +0000 (05:25 +0300)]
Update highgui.hpp

8 years agoMinor additions to the documentation.
Bram Ton [Thu, 26 May 2016 14:35:20 +0000 (16:35 +0200)]
Minor additions to the documentation.

8 years agoMerge pull request #6592 from guysoft:fix_6500_fix2
Maksim Shabunin [Thu, 26 May 2016 14:15:14 +0000 (14:15 +0000)]
Merge pull request #6592 from guysoft:fix_6500_fix2

8 years agoMerge pull request #6589 from tomoaki0705:fixThresh64fTest
Alexander Alekhin [Thu, 26 May 2016 12:44:56 +0000 (12:44 +0000)]
Merge pull request #6589 from tomoaki0705:fixThresh64fTest

8 years agoFix #6500 cmake bug that adds D_FORCE_INLINES to NVCC
Guy Sheffer [Thu, 26 May 2016 10:45:50 +0000 (13:45 +0300)]
Fix #6500 cmake bug that adds D_FORCE_INLINES to NVCC

8 years agoMerge pull request #6583 from mshabunin:doc-warnings-fix
Maksim Shabunin [Thu, 26 May 2016 09:54:26 +0000 (09:54 +0000)]
Merge pull request #6583 from mshabunin:doc-warnings-fix

8 years agoUpdate test case for 64F version
Tomoaki Teshima [Wed, 25 May 2016 23:38:29 +0000 (08:38 +0900)]
Update test case for 64F version

8 years agoFixed documentation warnings produced by updated doxygen
Maksim Shabunin [Wed, 25 May 2016 15:04:32 +0000 (18:04 +0300)]
Fixed documentation warnings produced by updated doxygen

8 years agoFileStorage: add simplified API for bindings
Pavel Rojtberg [Wed, 27 Apr 2016 14:59:26 +0000 (16:59 +0200)]
FileStorage: add simplified API for bindings

at least it is possible to read/ write calibration files. Fixes #4282.

Also add CPP method for writing comments.

8 years agoMerge pull request #6546 from atinfinity:pullreq/160517-threshold-64F
Vadim Pisarevsky [Wed, 25 May 2016 13:19:50 +0000 (13:19 +0000)]
Merge pull request #6546 from atinfinity:pullreq/160517-threshold-64F

8 years agoMerge pull request #6547 from mshabunin:python-vector-pair-int-double
Vadim Pisarevsky [Wed, 25 May 2016 13:17:15 +0000 (13:17 +0000)]
Merge pull request #6547 from mshabunin:python-vector-pair-int-double

8 years agoMerge pull request #6548 from fnorf:master
Vadim Pisarevsky [Wed, 25 May 2016 13:16:07 +0000 (13:16 +0000)]
Merge pull request #6548 from fnorf:master

8 years agoMerge pull request #6551 from mshabunin:fix-old-cmake
Vadim Pisarevsky [Wed, 25 May 2016 13:13:50 +0000 (13:13 +0000)]
Merge pull request #6551 from mshabunin:fix-old-cmake

8 years agoMerge pull request #6573 from dharezlak:patch-1
Maksim Shabunin [Tue, 24 May 2016 15:28:27 +0000 (15:28 +0000)]
Merge pull request #6573 from dharezlak:patch-1

8 years agoMerge pull request #6018 from sturkmen72:patch-2
Maksim Shabunin [Mon, 23 May 2016 11:57:25 +0000 (11:57 +0000)]
Merge pull request #6018 from sturkmen72:patch-2

8 years agoImproved Java wrapper generation
dharezlak [Mon, 23 May 2016 09:13:18 +0000 (11:13 +0200)]
Improved Java wrapper generation

While generating Java JNI wrappers package names with an underscore (`_`) character where not properly escaped according to https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/design.html#resolving_native_method_names (see also: https://github.com/Itseez/opencv_contrib/issues/652).

This fix replaces all the occurrences of `_` with `_1` resulting in proper JNI method names.

8 years agoMerge pull request #6564 from jlguardi:ml_load_empty_ptr
Maksim Shabunin [Mon, 23 May 2016 08:41:05 +0000 (08:41 +0000)]
Merge pull request #6564 from jlguardi:ml_load_empty_ptr

8 years agoMerge pull request #6565 from jlguardi:ann_64f_bug
Maksim Shabunin [Mon, 23 May 2016 08:39:25 +0000 (08:39 +0000)]
Merge pull request #6565 from jlguardi:ann_64f_bug

8 years agoMerge pull request #6570 from sturkmen72:patch-14
Maksim Shabunin [Mon, 23 May 2016 08:36:16 +0000 (08:36 +0000)]
Merge pull request #6570 from sturkmen72:patch-14

8 years agoUpdate pca.cpp
Suleyman TURKMEN [Tue, 26 Jan 2016 21:56:25 +0000 (23:56 +0200)]
Update pca.cpp

8 years agoUpdate imgproc.hpp
Suleyman TURKMEN [Fri, 20 May 2016 21:29:14 +0000 (00:29 +0300)]
Update imgproc.hpp

update documentation of calcBackProject() calcHist() compareHist()

8 years agoMerge pull request #6554 from CSBVision:patch-1
Alexander Alekhin [Fri, 20 May 2016 19:42:15 +0000 (19:42 +0000)]
Merge pull request #6554 from CSBVision:patch-1

8 years agoMerge pull request #6561 from tomoaki0705:fixMulSpectrumAarch64
Alexander Alekhin [Fri, 20 May 2016 19:39:09 +0000 (19:39 +0000)]
Merge pull request #6561 from tomoaki0705:fixMulSpectrumAarch64

8 years agoMerge pull request #6559 from OzgrCn:cuda-ORB-useProvidedKeypoints
Alexander Alekhin [Fri, 20 May 2016 19:38:31 +0000 (19:38 +0000)]
Merge pull request #6559 from OzgrCn:cuda-ORB-useProvidedKeypoints

8 years agoFixed #6563: Incorrect management for invalid files/filestorage/filenode in ml module
Jose Luis Guardiola [Fri, 20 May 2016 11:18:02 +0000 (13:18 +0200)]
Fixed #6563: Incorrect management for invalid files/filestorage/filenode in ml module

8 years agoFixed #6562: Incorrect CV_64F management in ANN
Jose Luis Guardiola [Fri, 20 May 2016 11:16:59 +0000 (13:16 +0200)]
Fixed #6562: Incorrect CV_64F management in ANN

8 years agoFix issue #6473
Özgür Can [Thu, 19 May 2016 16:59:41 +0000 (19:59 +0300)]
Fix issue #6473

Enable "useProvidedKeypoints" flag on cuda::ORB's detectAndCompute function in order to able to describe provided keypoints.

* additional author : Ender Tunç <endertunc@yahoo.com>

resolves #6473

 * Enable "useProvidedKeypoints" flag on cuda::ORB's detectAndCompute function in order to able to describe provided keypoints.

   Update for using 'const' reference to avoid array copy on each iteration.

resolves #6473

Update for 'const' reference to avoid array copy on each iteration.

8 years agoMerge pull request #6498 from berak:python_size_t
Maksim Shabunin [Fri, 20 May 2016 09:45:52 +0000 (09:45 +0000)]
Merge pull request #6498 from berak:python_size_t

8 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

8 years agoneural_network.cpp added
CSBVision [Thu, 19 May 2016 13:40:42 +0000 (15:40 +0200)]
neural_network.cpp added

8 years agoRestored cmake 2.8.7 support
Maksim Shabunin [Wed, 18 May 2016 10:20:21 +0000 (13:20 +0300)]
Restored cmake 2.8.7 support

8 years agoMerge pull request #6446 from kevin-coder:bugfix_6445
Maksim Shabunin [Wed, 18 May 2016 09:40:26 +0000 (09:40 +0000)]
Merge pull request #6446 from kevin-coder:bugfix_6445

8 years agoremove unnecessary cast
atinfinity [Tue, 17 May 2016 23:32:29 +0000 (08:32 +0900)]
remove unnecessary cast

8 years agofixed "tot_error" to "mean_error" & nicer whitespace
Hannes [Tue, 17 May 2016 18:00:28 +0000 (20:00 +0200)]
fixed "tot_error" to "mean_error" & nicer whitespace

8 years agofixed "corners2" to "corners" & nicer whitespace
Hannes [Tue, 17 May 2016 17:36:32 +0000 (19:36 +0200)]
fixed "corners2" to "corners" & nicer whitespace

8 years agofixed compilation warning
atinfinity [Tue, 17 May 2016 15:34:51 +0000 (00:34 +0900)]
fixed compilation warning

8 years agoPython bindings: added std::vector< std::pair< int, double > > type read support
Maksim Shabunin [Tue, 17 May 2016 14:26:27 +0000 (17:26 +0300)]
Python bindings: added std::vector< std::pair< int, double > > type read support

8 years agoAdded test case of cv::threshold(CV_64F)
atinfinity [Tue, 17 May 2016 13:57:05 +0000 (22:57 +0900)]
Added test case of cv::threshold(CV_64F)

8 years agoChanged cv::threshold() to support CV_64F
atinfinity [Tue, 17 May 2016 13:56:03 +0000 (22:56 +0900)]
Changed cv::threshold() to support CV_64F

8 years agoMerge pull request #6543 from tomoaki0705:cudaThresholdMultiChannels
Alexander Alekhin [Mon, 16 May 2016 13:18:01 +0000 (13:18 +0000)]
Merge pull request #6543 from tomoaki0705:cudaThresholdMultiChannels

8 years agoMerge pull request #6541 from mshabunin:disable-pch-for-gcc6
Maksim Shabunin [Mon, 16 May 2016 13:12:23 +0000 (13:12 +0000)]
Merge pull request #6541 from mshabunin:disable-pch-for-gcc6

8 years agoaccept multiple channels image for threshold on cuda
Tomoaki Teshima [Sun, 15 May 2016 21:45:35 +0000 (06:45 +0900)]
accept multiple channels image for threshold on cuda
  * modify test, too

8 years agoDisabled PCH support for gcc >= 6.0.0
Maksim Shabunin [Fri, 13 May 2016 10:28:09 +0000 (13:28 +0300)]
Disabled PCH support for gcc >= 6.0.0

Command line generation routine uses "-isystem" to include headers outside of "<opencv>/modules" folder, but GCC 6 does not work when passed "-isystem /usr/include" option.

8 years agoMerge pull request #6460 from m039:fix/add_extra_modules_path_to_build_sdk
Maksim Shabunin [Fri, 13 May 2016 09:01:46 +0000 (09:01 +0000)]
Merge pull request #6460 from m039:fix/add_extra_modules_path_to_build_sdk

8 years agoMerge pull request #6522 from tomoaki0705:fixVSqrtAarch64
Maksim Shabunin [Fri, 13 May 2016 09:00:12 +0000 (09:00 +0000)]
Merge pull request #6522 from tomoaki0705:fixVSqrtAarch64

8 years agoadd support for multiple OpenNI2 devices
Dmitry Trifonov [Fri, 13 May 2016 01:12:51 +0000 (18:12 -0700)]
add support for multiple OpenNI2 devices

8 years agoAdded --extra_modules_path to build_sdk.py
Dmitry Mozgin [Fri, 22 Apr 2016 22:09:07 +0000 (01:09 +0300)]
Added --extra_modules_path to build_sdk.py

8 years agofix hal_intrin test on 64bit ARM
Tomoaki Teshima [Thu, 12 May 2016 09:30:09 +0000 (18:30 +0900)]
fix hal_intrin test on 64bit ARM
  * fix issue 6521
  * use correct comparison