Alexander Alekhin
eec468fa13
dnn(ocl4dnn): calculate activation expression once
...
- to avoid multiple conditional calls via sub_group() functions
2018-10-02 21:23:41 +00:00
Alexander Alekhin
81c94357e8
Merge pull request #12722 from tomoaki0705:fixCudaFiltersFailure
2018-10-02 20:52:34 +00:00
Peter Rekdal Sunde
042c486b68
Obtain fourcc when AVStream is network stream
...
The `codec_tag` is only available when opening a file from disk. If `AVStream` is a network stream then `fourcc` must be obtained using `codec_id`. I have tested the following scenarios:
1) Open a `.mp4` file and verify that `codec_tag` is returned (old behavior)
2) Open a `rtsp` stream and verify that `codec_fourcc` is returned (Tested with a MJPEG, H264 and H265 stream)
2018-10-02 22:15:05 +02:00
Alexander Alekhin
6921f967a1
Merge pull request #12605 from terfendail:integral_wintr
2018-10-02 16:40:13 +00:00
Alexander Alekhin
83a0c12144
Merge pull request #12581 from terfendail:lapack_intr
2018-10-02 16:39:50 +00:00
Tomoaki Teshima
fa8684b5c8
fix test failure of cudafilters Median_Accuracy
...
* avoid race condition
2018-10-03 00:59:08 +09:00
Alexander Alekhin
690fb0544c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-02 14:31:05 +03:00
Vitaly Tuzov
283348afc3
SSE2 code in invert() replaced with universal intrinsics
2018-10-02 12:47:07 +03:00
Suleyman TURKMEN
ee0c985491
Merge pull request #12649 from sturkmen72:patch-9
...
Update hog.cpp (#12649 )
2018-10-01 22:22:37 +03:00
Alexander Alekhin
b41f38ecc7
Merge pull request #12669 from mshabunin:add-paths-config
2018-10-01 15:57:57 +00:00
Alexander Alekhin
682180e0cd
Merge pull request #12620 from alalek:ocl_extra_build_options
2018-10-01 15:57:31 +00:00
Alexander Alekhin
1385db48f5
Merge pull request #12711 from alalek:dnn_ocl_idlf_drop_weights_buf
2018-10-01 15:36:49 +00:00
Alexander Alekhin
94201b7cf9
ocl: OPENCV_OPENCL_BUILD_EXTRA_OPTIONS parameter
2018-10-01 17:56:17 +03:00
Maksim Shabunin
15632c6305
Added support for multi-path configuration parameter (env)
2018-10-01 17:50:47 +03:00
Vitaly Tuzov
6b84990620
integral() implementation updated to utilize wide universal intrinsics
2018-10-01 17:25:43 +03:00
Alexander Alekhin
c9b6b2cf04
Merge pull request #12714 from antonioborondo:fix_documentation_cuda_compare
2018-10-01 13:35:03 +00:00
Alexander Alekhin
617fe2545c
Merge pull request #12709 from WydD:3.4
2018-10-01 13:32:51 +00:00
Alexander Alekhin
93663dc57a
Merge pull request #12708 from ldevulder:protobuf-fix-compilation-issue-on-s390
2018-10-01 13:32:29 +00:00
Antonio Borondo
28e55dc5f3
Fix documentation of cv::cuda::compare
2018-10-01 13:23:18 +01:00
Alexander Alekhin
ae4c72a153
Merge pull request #12668 from alalek:calib3d_chessboardsb_updates
2018-10-01 00:00:01 +03:00
Alexander Alekhin
9253e8bda2
Merge pull request #12705 from berak:imread_document_grayscale
2018-09-30 23:59:48 +03:00
Alexander Alekhin
0f031b6680
dnn(ocl4dnn): drop weights_buf
...
- avoid memory access violation during "prefetch" stage
2018-09-30 20:35:41 +00:00
Loic Petit
255b20f6de
Fix frame rate rounding in ffmpeg wrapper ( #9023 )
2018-09-30 22:24:02 +02:00
Loic Devulder
ac9ec55b37
3rdparty/protobuf: fix compilation issue on s390
...
This commit fixes an issue while trying to compile
on s390x architecture.
This is simply a backport of a fixe already applied
in official protobuf code:
- https://github.com/protocolbuffers/protobuf/pull/3955
2018-09-30 21:33:34 +02:00
berak
df4139d373
document imread grayscale behaviour
2018-09-30 15:22:26 +02:00
Hamdi Sahloul
1059735bfb
Merge pull request #12667 from cv3d:fix/ts_report
...
TS: fix Python v2/v3 compatibility (#12667 )
* TS: fix Python2.7 compatibility
* TS: fix Python3 compatibility
* py3: use integer division '/' => '//' instead of cast
2018-09-29 20:03:54 +03:00
Alexander Alekhin
8f2eb60719
Merge pull request #12690 from cv3d:fix/ts_python_exe
2018-09-29 16:39:05 +00:00
Alexander Alekhin
a1ffc00ba8
Merge pull request #12666 from tomoaki0705:cudevTestFailureLuvRGB
2018-09-29 16:36:25 +00:00
Hamdi Sahloul
1a81a97e9f
Utilize the currently running Python executable
...
especially if it matches the module being tested
2018-09-29 23:58:27 +09:00
Tomoaki Teshima
e6ef9221cb
fix test failure of cudev
...
* follow the implementation of Luv2RGBfloat in imgproc/src/color_lab.cpp
* loosen threshold in cudaimgproc
2018-09-29 23:13:12 +09:00
Alexander Alekhin
ee84ae0551
Merge pull request #12682 from soonbro:patch-1
2018-09-29 16:03:38 +03:00
Alexander Alekhin
bd04568baf
Merge pull request #12676 from PWhiddy:patch-1
2018-09-29 16:02:33 +03:00
Alexander Alekhin
ea92c2b1a6
Merge pull request #12663 from sturkmen72:patch-12
2018-09-29 12:52:27 +00:00
Alexander Alekhin
8ecdd215b6
Merge pull request #12661 from Slyce-Inc:fix-xcode10-bitcode
2018-09-29 12:50:51 +00:00
Alexander Alekhin
5a3bca8d5c
Merge pull request #12576 from cv3d:fix/cuda/polar_to_cart
2018-09-29 12:45:47 +00:00
soonbro
9b9f38afc8
fix typo in FpsMeter.java
...
'mFramesCouner' -> 'mFramesCounter'
2018-09-29 11:36:47 +00:00
Alexander Alekhin
9ac7aea930
Merge pull request #12653 from cv3d:cuda/legacy_traits
2018-09-28 19:21:04 +00:00
Hamdi Sahloul
5f17cc1abd
Fix Python wrapper for GpuMat
2018-09-29 02:47:59 +09:00
Alexander Alekhin
8f6695acc7
CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement
2018-09-29 02:47:59 +09:00
chacha21
9524abcd28
Merge pull request #12658 from chacha21:clr-mutex
...
* hide use of std::mutex from /clr compilation under Visual Studio
C++11 <mutex> is not available when compiling with /clr under Visual Studio, thus opencv cannot be easily included.
It is fixed by making a CEEMutex wrapper class, around an opaque implementation using std::mutex internally
* fixed compilation outside of Visual Studio
fixed compilation outside of Visual Studio by avoiding some macros
* fixed indentation, prepare getting rid of CEEMutex/CEELockGuard
fixed indentation
After discussion, CEEMutex and CEELockGuard can be totally removed, letting the developer in a /clr context to provide his own implementation
* remove CEEMutex/CEELockGuard
2018-09-28 19:19:05 +03:00
Alexander Alekhin
4fea6179a0
Merge pull request #12659 from dkurt:js_features2d
2018-09-28 16:18:09 +00:00
Alexander Alekhin
055f177a6a
Merge pull request #12630 from alalek:docs_blacklist_matlab
2018-09-28 16:15:19 +00:00
Alexander Alekhin
83efde6243
Merge pull request #12678 from cv3d:cleanup/python/enums
2018-09-28 16:07:21 +00:00
Suleyman TURKMEN
8eb987e393
Update findContours parameter type
2018-09-28 18:42:48 +03:00
Dmitry Matveev
2c6ab65476
Merge pull request #12674 from dmatveev:gapi_upd270918
...
* Update G-API code base to 27-Sep-18
Changes mostly improve standalone build support
* G-API code base update 28-09-2018
* Windows/Documentation warnings should be fixed
* Fixed stability issues in Fluid backend
* Fixed precompiled headers issues in G-API source files
* G-API code base update 28-09-18 EOD
* Fixed several static analysis issues
* Fixed issues found when G-API is built in a standalone mode
2018-09-28 18:42:09 +03:00
Alexander Alekhin
66fdddc339
Merge pull request #12656 from alalek:fix_documentation_build
2018-09-28 14:16:25 +00:00
Andrew Mroczkowski
3c5a6be835
Fix Xcode version parsing error (affects bitcode generation)
...
The regex was only parsing for a single digit in the major version, causing Xcode 10 to be treated as version "1". Other parts of the script only turn on bitcode generation if the Xcode version is > 7.
2018-09-28 17:01:40 +03:00
Alexander Alekhin
5575171652
Merge pull request #12673 from alalek:fix_build_warnings
...
* fix build warnings
* python: forbid wrapping of functions with "void*" arguments
2018-09-28 16:53:05 +03:00
Alexander Alekhin
a8b0db4e5d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-28 14:14:47 +03:00
Alexander Alekhin
4b895a4d1f
Merge pull request #12657 from alalek:docs_repair_cuda_section
2018-09-28 09:45:50 +00:00
