491a3fdebc
android samples: force setVisibility (see #5812 )
2015-12-16 14:31:49 +03:00
b2bb7d075a
Merge pull request #5781 from jet47:fix-cuda-createContinuous
2015-12-16 10:37:56 +00:00
3bbd22cb63
Merge pull request #5808 from cedrou:hdr.mergemertens.fixalgo
2015-12-16 10:36:29 +00:00
3b87e3fa20
Merge pull request #5812 from qubick:master
2015-12-16 10:05:34 +00:00
74cb74dc0a
Merge pull request #5813 from alalek:fix_warning
2015-12-16 07:54:51 +00:00
5502f0b45d
surfaceview import
2015-12-15 12:35:21 -07:00
8f60740205
fix build warning (unreachable code) and exit error codes
2015-12-15 22:06:11 +03:00
1434f55cb9
camera view was enabled to visible when the app launched
2015-12-15 11:38:56 -07:00
0d9938dab5
Merge pull request #5809 from alalek:fixup
2015-12-15 13:52:56 +00:00
31d0dcf28e
fixup
2015-12-15 15:54:45 +03:00
574280cd3a
Merge pull request #5784 from alalek:distrib_fix
2015-12-15 12:24:36 +00:00
76e4b0a8fe
Reverts "Set the default value of exposure_weight in createMergeMertens to 1.0" because it breaks source code compatibility and tests
...
This reverts commit dbfd6a3dde
2015-12-15 13:16:15 +01:00
1e443a6ea6
Merge pull request #5800 from taketwo:fix-merge-debevec
2015-12-15 10:26:00 +00:00
f93a4dfbc9
Merge pull request #5799 from alalek:fix_5066
2015-12-15 10:24:39 +00:00
34129d8e83
Merge pull request #5806 from IshankGulati:cv-merge-documentation
2015-12-15 10:16:21 +00:00
dbfd6a3dde
Set the default value of exposure_weight in createMergeMertens to 1.0
2015-12-15 11:12:10 +01:00
c5d4ecae37
Merge pull request #5588 from T-Dunker:ScheimpflugModel
2015-12-15 10:11:59 +00:00
d19189e80f
Fixed the formula to compute the well-exposedness weight map.
2015-12-15 10:30:06 +01:00
d1ac75cabd
corrected cv::merge documentation
2015-12-15 11:02:08 +05:30
08b30580b7
Do not modify input parameter in MergeDebevec
...
MergeDebevec takes camera response function as an optional input
parameter. Despite being clearly marked as input, this matrix is
overwritten during processing.
This commit adds a temporary matrix to store the log response and avoid
modification of the input.
2015-12-14 22:24:27 +01:00
aee03cd5e5
Merge pull request #5796 from alalek:fix_5019
2015-12-14 19:52:32 +00:00
d366cb960d
Merge pull request #5798 from vpisarev:fixed_digits_py
2015-12-14 19:51:07 +00:00
5ac1d8323e
Merge pull request #5797 from alalek:fix_5018
2015-12-14 16:54:22 +00:00
e4fea5abab
Merge pull request #5793 from alalek:precomp_add_cvconfig
2015-12-14 16:50:40 +00:00
1305962af7
fixes #5066 : laplacian: "y" may contain negative values
2015-12-14 18:13:57 +03:00
fd0773eb32
Merge pull request #5795 from alalek:fix_5095
2015-12-14 14:35:17 +00:00
6882c10b45
Extension of the camera distortion model for tilted image sensors (Scheimpflug condition) including test
2015-12-14 15:20:34 +01:00
ba71caca04
fixed digits.py sample
2015-12-14 16:37:19 +03:00
0db10a3052
fixes #5019 : python and java bindings become CMake modules (loadable plugins)
2015-12-14 16:20:18 +03:00
4c1c0b108d
Merge pull request #5790 from bastelflp:py3compatibility
2015-12-14 12:47:19 +00:00
f0c14888d5
fixes #5018 : fix framework links in opencv.pc (MacOS)
2015-12-14 15:14:23 +03:00
5c15461595
UMat access flags ( fixes #5095 )
2015-12-14 14:26:43 +03:00
5d346128f7
workaround: cvconfig.h doesn't work with hal at this moment
2015-12-14 13:52:02 +03:00
e37a58df3c
include "cvconfig.h"
2015-12-14 13:34:30 +03:00
4ed2d6328b
Python samples adapted for Python3 compatibility
...
Common fixes:
- print function
- int / float division
- map, zip iterators in py3 but lists in py2
Known bugs with opencv 3.0.0
- digits.py, called via digits_video.py: https://github.com/Itseez/opencv/issues/4969
- gaussian_mix.py: https://github.com/Itseez/opencv/pull/4232
- video_v4l2.py: https://github.com/Itseez/opencv/pull/5474
Not working:
- letter_recog.py due to changed ml_StatModel.train() signature
2015-12-13 02:49:54 +01:00
2bfad68812
pkg-config: remove $<LINK_ONLY:...> expressions
2015-12-12 15:23:31 +03:00
a153871940
disable ts module if it is not used: BUILD_TESTS=OFF and BUILD_PERF_TESTS=OFF
2015-12-12 15:23:31 +03:00
7afce8e003
world build: fix modules instantiation order
...
opencv_hal before opencv_world
opencv_world before opencv_ts
2015-12-12 15:23:31 +03:00
1836d41b5c
warning fix (MSVS2015)
2015-12-12 15:23:31 +03:00
fe2f5c175a
distrib: remove useless static files from shared distribution package
2015-12-12 15:23:31 +03:00
8f732f2cfe
fix samples deps
...
some tutorials depends on contrib modules
2015-12-12 15:23:31 +03:00
5053aeeb19
cmake: DOWNLOAD_EXTERNAL_TEST_DATA option
2015-12-12 15:23:31 +03:00
5cdf0e3e89
Merge pull request #5351 from paroj:calibout
2015-12-11 16:21:06 +00:00
c22673e999
Merge pull request #5782 from alalek:update_libpng
2015-12-11 16:13:40 +00:00
e0395a79ec
Merge pull request #5616 from afriesen:lr_predict
2015-12-11 12:22:56 +00:00
60c06e551a
calibrateCamera: do not require rvec and tvec to be vector<Mat>
...
if they are not we also do not need to allocate a local copy of the rvec
and tvec
2015-12-11 11:01:57 +01:00
205775ed52
calibrateCamera: only allocate and compute rvecs, tvecs when needed
...
also replace C defines with C++ enums
2015-12-11 10:58:26 +01:00
c2a86a6a84
NEON flags fix
2015-12-11 12:06:24 +03:00
dbc0aa6c7b
libpng: re-apply patch
2015-12-11 12:06:24 +03:00
0831bd3990
libpng: update 1.6.19 - November 12, 2015
2015-12-11 12:06:24 +03:00
Alexander Alekhin