Alexander Alekhin
979b0ae9ce
Merge pull request #7711 from alalek:fix_java_tests_2.4
2016-11-24 16:14:25 +00:00
Alexander Alekhin
408e4a7c27
Merge pull request #7708 from alalek:cmake_ccache_2.4
2016-11-24 16:12:46 +00:00
Alexander Alekhin
da75d129fe
java: fix Calib3d test
2016-11-23 15:49:24 +03:00
Alexander Alekhin
a3bfa6f566
cmake: ccache
2016-11-23 15:07:58 +03:00
Alexander Alekhin
8e22b17919
java: backport test changes from master
2016-11-23 14:26:22 +03:00
Vadim Pisarevsky
af8e6b06f7
Merge pull request #7689 from alalek:warnings_2.4
2016-11-22 13:30:25 +00:00
Alexander Alekhin
7b13550bdd
Merge pull request #7697 from alalek:backport_6561
2016-11-22 11:01:29 +00:00
Vadim Pisarevsky
62b2039040
Merge pull request #7698 from alalek:backport_perf_gabor
2016-11-21 14:42:54 +00:00
Alexander Alekhin
f21f153a5f
test: backport check for Image_KernelSize_GaborFilter2d perf test
2016-11-21 14:56:51 +03:00
Tomoaki Teshima
3ea4f72e35
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
2016-11-21 14:52:29 +03:00
Alexander Alekhin
b1c8557401
Merge pull request #7690 from alalek:backport_arm_toolchain
2016-11-20 11:38:01 +00:00
Alexander Alekhin
0a543c5531
test: fix Legacy_StereoGC.regression assertion
2016-11-18 22:32:32 +03:00
Alexander Alekhin
a42be1f9bd
backport ARM toolchain from master
2016-11-18 15:36:16 +03:00
Alexander Alekhin
19270eeab4
warnings
2016-11-18 15:31:59 +03:00
Alexander Alekhin
497d0fd2e7
build: OSSpinLock deprecation warning
2016-11-18 15:31:14 +03:00
Maksim Shabunin
21167b1bf1
Fixed several GCC 5.x warnings
2016-11-18 15:31:05 +03:00
Alexander Alekhin
4d041e6809
Merge pull request #7672 from dec1:2.4
2016-11-15 19:01:46 +00:00
Declan Moran
4d84e6efee
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;"
2016-11-15 16:35:11 +01:00
Alexander Alekhin
8f4251fbfa
Merge pull request #7655 from alalek:backport_7213
2016-11-14 13:42:31 +00:00
Alexander Alekhin
64a2d1904b
ffmpeg: backport 7213
...
Commit:
6d54abbd0f
2016-11-11 16:57:10 +03:00
Vadim Pisarevsky
f632f5c552
Merge pull request #7529 from alalek:backport_7526
2016-11-02 10:50:45 +00:00
Alexander Alekhin
f0d592e6b6
Merge pull request #7559 from alalek:cv_xadd_24
2016-10-27 16:00:37 +00:00
Alexander Alekhin
c585d3890e
core: update CV_XADD
...
Allow to use custom implementations of CV_XADD (passed via -D of CXXFLAGS)
2016-10-27 13:46:51 +03:00
Alexander Alekhin
8577f71810
ts: 2.4 changes
2016-10-20 16:26:19 +03:00
Alexander Alekhin
6f00e53159
ts: update run.py
...
Add information about python bindings
2016-10-20 16:23:27 +03:00
Alexander Alekhin
422154dc97
Merge pull request #7499 from catree:add_distortion_images_2.4
2016-10-17 03:21:45 +00:00
Alexander Alekhin
50486bd34d
Merge pull request #7498 from catree:morphology_additional_information_2.4
2016-10-17 03:21:26 +00:00
catree
1c409abe9c
Add example image about distortion effect.
2016-10-17 00:18:41 +02:00
catree
c419552002
Add images for tutorials on morphological operations to avoid possible confusion.
2016-10-17 00:01:08 +02:00
Juha Reunanen
4e7f28811c
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
2016-10-12 10:37:07 +03:00
Vadim Pisarevsky
c7c831bca5
Merge pull request #7414 from StevenPuttemans:fix_docs_OPENNI_2.4
2016-10-06 13:26:47 +00:00
StevenPuttemans
80f03f58e7
backport of 7361
2016-10-06 13:45:55 +02:00
Vadim Pisarevsky
a34b8d4abf
Merge pull request #7391 from alalek:24_fix_7388
2016-10-04 12:42:18 +00:00
Vadim Pisarevsky
72becbbb1f
Merge pull request #7379 from catree:fix_hitmiss_doc_link_2.4
2016-10-04 12:15:35 +00:00
Alexander Alekhin
c181f2f493
cmake: fix for GCC 6.x
2016-10-04 13:30:43 +03:00
Alexander Alekhin
36db16a00d
Merge pull request #7383 from alalek:fix_get_property
2016-10-02 11:34:36 +00:00
Alexander Alekhin
26a32dcbf6
videoio: remove 'const' from getProperty
...
'const' is available in OpenCV 3.x only
2016-10-02 03:04:37 +03:00
catree
f1009e2234
Fix dead link for hit or miss 2.4 documentation.
2016-09-30 23:56:35 +02:00
Vadim Pisarevsky
9ff63a46fc
Merge pull request #7314 from alalek:backport_7266
2016-09-22 11:28:46 +00:00
Alexander Alekhin
c314178e7a
highgui/osx: backport AVFoundation support
2016-09-19 19:51:10 +03:00
Alexander Alekhin
3648c61172
highgui: clone cap_avfoundation_mac.mm from master
2016-09-19 19:46:42 +03:00
Alexander Alekhin
d68e350227
OpenCV version++
2016-09-16 18:55:58 +03:00
Alexander Alekhin
14ac55d05e
Merge pull request #7289 from alalek:android24
2016-09-16 15:55:39 +00:00
Alexander Alekhin
2d10336601
fix documentation
2016-09-16 16:15:51 +03:00
Alexander Alekhin
4d17051f14
android: backport Android SDK build script
2016-09-16 16:15:51 +03:00
Alexander Alekhin
9285dddbaa
android: clone build_sdk.py from 3.x
2016-09-16 16:15:51 +03:00
Alexander Alekhin
1f6cf50be3
Merge pull request #7286 from alalek:fix_android_clang
2016-09-16 09:56:34 +00:00
Alexander Alekhin
c68b9328ca
android: workaround for Android NDK-8e clang ICE
2016-09-14 23:20:10 +03:00
Vadim Pisarevsky
2f01930ecc
Merge pull request #7218 from savuor:fix2.4/copyTo
2016-09-14 11:58:29 +00:00
Alexander Alekhin
4bccd9a92a
Merge pull request #7239 from savuor:fix2.4/ported
2016-09-08 11:18:13 +00:00
