Alexander Alekhin
a9c8a526cf
Merge pull request #12695 from sam09:master
6 years ago
Sam Radhakrishnan
699db77293
Fixes #12692 : Update samples/gpu/videoreader.cpp
...
Change iteration to iterate separately when the video is decode on a GPU to account for different number of frames
6 years ago
Alexander Alekhin
690fb0544c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
6 years ago
Suleyman TURKMEN
ee0c985491
Merge pull request #12649 from sturkmen72:patch-9
...
Update hog.cpp (#12649 )
6 years ago
Alexander Alekhin
b41f38ecc7
Merge pull request #12669 from mshabunin:add-paths-config
6 years ago
Alexander Alekhin
682180e0cd
Merge pull request #12620 from alalek:ocl_extra_build_options
6 years ago
Alexander Alekhin
1385db48f5
Merge pull request #12711 from alalek:dnn_ocl_idlf_drop_weights_buf
6 years ago
Alexander Alekhin
94201b7cf9
ocl: OPENCV_OPENCL_BUILD_EXTRA_OPTIONS parameter
6 years ago
Maksim Shabunin
15632c6305
Added support for multi-path configuration parameter (env)
6 years ago
Alexander Alekhin
c9b6b2cf04
Merge pull request #12714 from antonioborondo:fix_documentation_cuda_compare
6 years ago
Alexander Alekhin
617fe2545c
Merge pull request #12709 from WydD:3.4
6 years ago
Alexander Alekhin
93663dc57a
Merge pull request #12708 from ldevulder:protobuf-fix-compilation-issue-on-s390
6 years ago
Antonio Borondo
28e55dc5f3
Fix documentation of cv::cuda::compare
6 years ago
Alexander Alekhin
ae4c72a153
Merge pull request #12668 from alalek:calib3d_chessboardsb_updates
6 years ago
Alexander Alekhin
9253e8bda2
Merge pull request #12705 from berak:imread_document_grayscale
6 years ago
Alexander Alekhin
0f031b6680
dnn(ocl4dnn): drop weights_buf
...
- avoid memory access violation during "prefetch" stage
6 years ago
Loic Petit
255b20f6de
Fix frame rate rounding in ffmpeg wrapper ( #9023 )
6 years ago
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
6 years ago
berak
df4139d373
document imread grayscale behaviour
6 years ago
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
6 years ago
Alexander Alekhin
8f2eb60719
Merge pull request #12690 from cv3d:fix/ts_python_exe
6 years ago
Alexander Alekhin
a1ffc00ba8
Merge pull request #12666 from tomoaki0705:cudevTestFailureLuvRGB
6 years ago
Hamdi Sahloul
1a81a97e9f
Utilize the currently running Python executable
...
especially if it matches the module being tested
6 years ago
Tomoaki Teshima
e6ef9221cb
fix test failure of cudev
...
* follow the implementation of Luv2RGBfloat in imgproc/src/color_lab.cpp
* loosen threshold in cudaimgproc
6 years ago
Alexander Alekhin
ee84ae0551
Merge pull request #12682 from soonbro:patch-1
6 years ago
Alexander Alekhin
bd04568baf
Merge pull request #12676 from PWhiddy:patch-1
6 years ago
Alexander Alekhin
ea92c2b1a6
Merge pull request #12663 from sturkmen72:patch-12
6 years ago
Alexander Alekhin
8ecdd215b6
Merge pull request #12661 from Slyce-Inc:fix-xcode10-bitcode
6 years ago
Alexander Alekhin
5a3bca8d5c
Merge pull request #12576 from cv3d:fix/cuda/polar_to_cart
6 years ago
soonbro
9b9f38afc8
fix typo in FpsMeter.java
...
'mFramesCouner' -> 'mFramesCounter'
6 years ago
Alexander Alekhin
9ac7aea930
Merge pull request #12653 from cv3d:cuda/legacy_traits
6 years ago
Hamdi Sahloul
5f17cc1abd
Fix Python wrapper for GpuMat
6 years ago
Alexander Alekhin
8f6695acc7
CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement
6 years ago
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
6 years ago
Alexander Alekhin
4fea6179a0
Merge pull request #12659 from dkurt:js_features2d
6 years ago
Alexander Alekhin
055f177a6a
Merge pull request #12630 from alalek:docs_blacklist_matlab
6 years ago
Alexander Alekhin
83efde6243
Merge pull request #12678 from cv3d:cleanup/python/enums
6 years ago
Suleyman TURKMEN
8eb987e393
Update findContours parameter type
6 years ago
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
6 years ago
Alexander Alekhin
66fdddc339
Merge pull request #12656 from alalek:fix_documentation_build
6 years ago
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.
6 years ago
Alexander Alekhin
5575171652
Merge pull request #12673 from alalek:fix_build_warnings
...
* fix build warnings
* python: forbid wrapping of functions with "void*" arguments
6 years ago
Alexander Alekhin
a8b0db4e5d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
6 years ago
Alexander Alekhin
4b895a4d1f
Merge pull request #12657 from alalek:docs_repair_cuda_section
6 years ago
Dmitry Kurtaev
e9f99063c7
JavaScript bindings for features2d module
6 years ago
Hamdi Sahloul
e104fcc000
Generate enum bindings automatically
6 years ago
Peter Whidden
9f0ff03da5
Fix typo "wit" -> "with"
6 years ago
Alexander Alekhin
9ba659af84
Merge pull request #12660 from alalek:flann_drop_useless_mutex
6 years ago
Rostislav Vasilikhin
be989b3b60
Merge pull request #12637 from savuor:fix/instr_ipp_ocl
...
Fixes for instrumentation of IPP and OCL (#12637 )
* fixed warning about re-declaring variable when both IPP and instrumentation are enabled
* fixed segfault when no funName provided
* compilation fixed when both OCL and instrumentation are enabled
6 years ago
Alexander Alekhin
0706bd72b8
Merge pull request #12671 from alalek:fix_build_warnings_3.4
6 years ago