Alexander Alekhin [Tue, 2 Oct 2018 03:21:47 +0000 (03:21 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Suleyman TURKMEN [Mon, 1 Oct 2018 19:22:37 +0000 (22:22 +0300)]
Merge pull request #12649 from sturkmen72:patch-9
Update hog.cpp (#12649)
Alexander Alekhin [Mon, 1 Oct 2018 15:57:57 +0000 (15:57 +0000)]
Merge pull request #12669 from mshabunin:add-paths-config
Alexander Alekhin [Mon, 1 Oct 2018 15:57:31 +0000 (15:57 +0000)]
Merge pull request #12620 from alalek:ocl_extra_build_options
Alexander Alekhin [Mon, 1 Oct 2018 15:36:49 +0000 (15:36 +0000)]
Merge pull request #12711 from alalek:dnn_ocl_idlf_drop_weights_buf
Alexander Alekhin [Fri, 21 Sep 2018 15:04:18 +0000 (15:04 +0000)]
ocl: OPENCV_OPENCL_BUILD_EXTRA_OPTIONS parameter
Maksim Shabunin [Thu, 27 Sep 2018 12:52:42 +0000 (15:52 +0300)]
Added support for multi-path configuration parameter (env)
Alexander Alekhin [Mon, 1 Oct 2018 13:35:03 +0000 (13:35 +0000)]
Merge pull request #12714 from antonioborondo:fix_documentation_cuda_compare
Alexander Alekhin [Mon, 1 Oct 2018 13:32:51 +0000 (13:32 +0000)]
Merge pull request #12709 from WydD:3.4
Alexander Alekhin [Mon, 1 Oct 2018 13:32:29 +0000 (13:32 +0000)]
Merge pull request #12708 from ldevulder:protobuf-fix-compilation-issue-on-s390
Antonio Borondo [Mon, 1 Oct 2018 12:23:13 +0000 (13:23 +0100)]
Fix documentation of cv::cuda::compare
Alexander Alekhin [Sun, 30 Sep 2018 21:00:01 +0000 (00:00 +0300)]
Merge pull request #12668 from alalek:calib3d_chessboardsb_updates
Alexander Alekhin [Sun, 30 Sep 2018 20:59:48 +0000 (23:59 +0300)]
Merge pull request #12705 from berak:imread_document_grayscale
Alexander Alekhin [Sun, 30 Sep 2018 20:22:39 +0000 (20:22 +0000)]
dnn(ocl4dnn): drop weights_buf
- avoid memory access violation during "prefetch" stage
Loic Petit [Sun, 30 Sep 2018 20:24:02 +0000 (22:24 +0200)]
Fix frame rate rounding in ffmpeg wrapper (#9023)
Loic Devulder [Fri, 28 Sep 2018 13:33:18 +0000 (15:33 +0200)]
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
berak [Sun, 30 Sep 2018 13:22:26 +0000 (15:22 +0200)]
document imread grayscale behaviour
Hamdi Sahloul [Sat, 29 Sep 2018 17:03:54 +0000 (02:03 +0900)]
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
Alexander Alekhin [Sat, 29 Sep 2018 16:39:04 +0000 (16:39 +0000)]
Merge pull request #12690 from cv3d:fix/ts_python_exe
Alexander Alekhin [Sat, 29 Sep 2018 16:36:25 +0000 (16:36 +0000)]
Merge pull request #12666 from tomoaki0705:cudevTestFailureLuvRGB
Hamdi Sahloul [Sat, 29 Sep 2018 10:34:44 +0000 (19:34 +0900)]
Utilize the currently running Python executable
especially if it matches the module being tested
Tomoaki Teshima [Sat, 29 Sep 2018 14:13:12 +0000 (23:13 +0900)]
fix test failure of cudev
* follow the implementation of Luv2RGBfloat in imgproc/src/color_lab.cpp
* loosen threshold in cudaimgproc
Alexander Alekhin [Sat, 29 Sep 2018 13:03:38 +0000 (16:03 +0300)]
Merge pull request #12682 from soonbro:patch-1
Alexander Alekhin [Sat, 29 Sep 2018 13:02:33 +0000 (16:02 +0300)]
Merge pull request #12676 from PWhiddy:patch-1
Alexander Alekhin [Sat, 29 Sep 2018 12:52:27 +0000 (12:52 +0000)]
Merge pull request #12663 from sturkmen72:patch-12
Alexander Alekhin [Sat, 29 Sep 2018 12:50:51 +0000 (12:50 +0000)]
Merge pull request #12661 from Slyce-Inc:fix-xcode10-bitcode
Alexander Alekhin [Sat, 29 Sep 2018 12:45:47 +0000 (12:45 +0000)]
Merge pull request #12576 from cv3d:fix/cuda/polar_to_cart
soonbro [Fri, 28 Sep 2018 10:13:39 +0000 (19:13 +0900)]
fix typo in FpsMeter.java
'mFramesCouner' -> 'mFramesCounter'
Alexander Alekhin [Fri, 28 Sep 2018 19:21:04 +0000 (19:21 +0000)]
Merge pull request #12653 from cv3d:cuda/legacy_traits
Hamdi Sahloul [Thu, 27 Sep 2018 23:58:30 +0000 (08:58 +0900)]
Fix Python wrapper for GpuMat
Alexander Alekhin [Sun, 2 Sep 2018 03:31:05 +0000 (03:31 +0000)]
CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement
chacha21 [Fri, 28 Sep 2018 16:19:05 +0000 (18:19 +0200)]
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
Alexander Alekhin [Fri, 28 Sep 2018 16:18:09 +0000 (16:18 +0000)]
Merge pull request #12659 from dkurt:js_features2d
Alexander Alekhin [Fri, 28 Sep 2018 16:15:19 +0000 (16:15 +0000)]
Merge pull request #12630 from alalek:docs_blacklist_matlab
Alexander Alekhin [Fri, 28 Sep 2018 16:07:21 +0000 (16:07 +0000)]
Merge pull request #12678 from cv3d:cleanup/python/enums
Suleyman TURKMEN [Thu, 27 Sep 2018 04:42:21 +0000 (07:42 +0300)]
Update findContours parameter type
Dmitry Matveev [Fri, 28 Sep 2018 15:42:09 +0000 (18:42 +0300)]
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
Alexander Alekhin [Fri, 28 Sep 2018 14:16:25 +0000 (14:16 +0000)]
Merge pull request #12656 from alalek:fix_documentation_build
Andrew Mroczkowski [Wed, 26 Sep 2018 21:20:37 +0000 (17:20 -0400)]
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.
Alexander Alekhin [Fri, 28 Sep 2018 13:53:05 +0000 (16:53 +0300)]
Merge pull request #12673 from alalek:fix_build_warnings
* fix build warnings
* python: forbid wrapping of functions with "void*" arguments
Alexander Alekhin [Fri, 28 Sep 2018 09:48:51 +0000 (12:48 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 28 Sep 2018 09:45:49 +0000 (09:45 +0000)]
Merge pull request #12657 from alalek:docs_repair_cuda_section
Dmitry Kurtaev [Wed, 26 Sep 2018 16:11:40 +0000 (19:11 +0300)]
JavaScript bindings for features2d module
Hamdi Sahloul [Fri, 28 Sep 2018 06:39:51 +0000 (15:39 +0900)]
Generate enum bindings automatically
Peter Whidden [Thu, 27 Sep 2018 21:37:59 +0000 (14:37 -0700)]
Fix typo "wit" -> "with"
Alexander Alekhin [Thu, 27 Sep 2018 19:46:59 +0000 (19:46 +0000)]
Merge pull request #12660 from alalek:flann_drop_useless_mutex
Rostislav Vasilikhin [Thu, 27 Sep 2018 19:39:06 +0000 (22:39 +0300)]
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
Alexander Alekhin [Thu, 27 Sep 2018 16:23:05 +0000 (16:23 +0000)]
Merge pull request #12671 from alalek:fix_build_warnings_3.4
Alexander Alekhin [Thu, 27 Sep 2018 13:42:44 +0000 (13:42 +0000)]
Merge pull request #12568 from sturkmen72:patch-3
Alexander Alekhin [Thu, 27 Sep 2018 13:31:31 +0000 (16:31 +0300)]
fix build warnings
Alexander Alekhin [Thu, 27 Sep 2018 12:01:51 +0000 (15:01 +0300)]
calib3d: findChessboardCornersSB() minor updates
- avoid updating of input image during equalizeHist() call
- avoid for() with double variable (use 'int' instead)
- more CV_Check*() macros
- use Mat_<T>, Matx
- static for local variables
Alexander Alekhin [Thu, 27 Sep 2018 09:54:23 +0000 (12:54 +0300)]
Merge pull request #12650 from alalek:dnn_ocl4dnn_verification_test
* dnn(ocl4dnn): update kernel checks
* dnn: workaround for IDLF kernels on Intel iGPU
* dnn(test): remove "skip" check for unstable cases
Dmitry Matveev [Wed, 26 Sep 2018 18:50:39 +0000 (21:50 +0300)]
Merge pull request #12608 from dmatveev:gapi
* G-API Initial code upload
* Update G-API code base to Sep-24-2018
* The majority of OpenCV buildbot problems was addressed
* Update G-API code base to 24-Sep-18 EOD
* G-API code base update 25-Sep-2018
* Linux warnings should be resolved
* Documentation build should become green
* Number of Windows warnings should be reduced
* Update G-API code base to 25-Sep-18 EOD
* ARMv7 build issue should be resolved
* ADE is bumped to latest version and should fix Clang builds for macOS/iOS
* Remaining Windows warnings should be resolved
* New Linux32 / ARMv7 warnings should be resolved
* G-API code base update 25-Sep-2018-EOD2
* Final Windows warnings should be resolved now
* G-API code base update 26-Sep-2018
* Fixed issues with precompiled headers in module and its tests
Alexander Alekhin [Wed, 26 Sep 2018 16:37:44 +0000 (19:37 +0300)]
flann: drop useless mutex
Alexander Alekhin [Wed, 26 Sep 2018 16:21:07 +0000 (16:21 +0000)]
Merge pull request #12655 from alalek:fix_printf_format_warning
Alexander Alekhin [Wed, 26 Sep 2018 15:53:02 +0000 (18:53 +0300)]
Merge pull request #12647 from alalek:cmake_js_cleanup
* cmake: js cleanup
- avoid unnecessary 2 messages for other platforms
- drop MODULE_NAME variable
* js: cleanup build_js.py
Vadim Pisarevsky [Wed, 26 Sep 2018 15:19:55 +0000 (15:19 +0000)]
Merge pull request #12548 from alalek:videoio_backend_name
Dmitry Kurtaev [Wed, 26 Sep 2018 13:27:00 +0000 (16:27 +0300)]
Merge pull request #12565 from dkurt:dnn_non_intel_gpu
* Remove isIntel check from deep learning layers
* Remove fp16->fp32 fallbacks where it's not necessary
* Fix Kernel::run to prevent localsize > globalsize
Dmitry Kurtaev [Wed, 26 Sep 2018 13:08:51 +0000 (16:08 +0300)]
Fix #12542 (#12603)
* Fix #12542
* Remove ignore of non-virtual-dtor error
Menghui Xie [Wed, 26 Sep 2018 13:05:02 +0000 (21:05 +0800)]
M_PI changed to CV_PI (#12645)
* M_PI changed to CV_PI
* M_PI changed to CV_PI
* M_PI changed to CV_PI
Alexander Alekhin [Wed, 26 Sep 2018 12:36:55 +0000 (15:36 +0300)]
docs: fix CUDA docs section
Alexander Alekhin [Wed, 26 Sep 2018 12:24:52 +0000 (15:24 +0300)]
docs: fix build without opencv_contrib (avoid links to CUDA modules)
Alexander Alekhin [Wed, 26 Sep 2018 11:04:49 +0000 (14:04 +0300)]
dnn: fix printf format warning
Alexander Alekhin [Tue, 25 Sep 2018 16:12:59 +0000 (16:12 +0000)]
Merge pull request #12644 from dkurt:dnn_out_layers_names
Dmitry Kurtaev [Tue, 25 Sep 2018 15:10:45 +0000 (18:10 +0300)]
add Net::getUnconnectedOutLayersNames method
Alexander Alekhin [Tue, 25 Sep 2018 14:44:21 +0000 (14:44 +0000)]
Merge pull request #12599 from mshabunin:printf
Alexander Duda [Tue, 25 Sep 2018 14:06:46 +0000 (16:06 +0200)]
Merge pull request #12615 from D-Alex:master
findChessboardCornersSB: speed improvements (#12615)
* chessboard: fix do not modify const image
* chessboard: speed up scale space using parallel_for
* chessboard: small improvements
* chessboard: speed up board growing using parallel_for
* chessboard: add flags for tuning detection
* chessboard: fix compiler warnings
* chessborad: change flag name to CALIB_CB_EXHAUSTIVE
This also fixes a typo
* chessboard: fix const ref + remove to_string
Alexander Alekhin [Tue, 25 Sep 2018 13:19:51 +0000 (13:19 +0000)]
Merge pull request #12639 from tomoaki0705:fixFp16CudaFailure
Alexander Alekhin [Tue, 25 Sep 2018 10:05:15 +0000 (10:05 +0000)]
Merge pull request #12591 from sturkmen72:patch-6
Tomoaki Teshima [Tue, 25 Sep 2018 06:00:37 +0000 (15:00 +0900)]
fix CvFp16Test failure
Alexander Alekhin [Mon, 24 Sep 2018 17:53:11 +0000 (17:53 +0000)]
Merge pull request #12632 from mshabunin:move-opengl-sample
Alexander Alekhin [Mon, 24 Sep 2018 11:32:07 +0000 (11:32 +0000)]
Merge pull request #12629 from cv3d:fix/opengl
Maksim Shabunin [Mon, 24 Sep 2018 10:09:18 +0000 (13:09 +0300)]
Moved OpenGL sample to opengl folder
Hamdi Sahloul [Mon, 24 Sep 2018 08:27:03 +0000 (17:27 +0900)]
OpenGL: avoid losing precision in double-to-float conversion
Alexander Alekhin [Mon, 24 Sep 2018 09:36:51 +0000 (09:36 +0000)]
Merge pull request #12622 from cv3d:fix/js_property
Alexander Alekhin [Mon, 24 Sep 2018 08:34:03 +0000 (11:34 +0300)]
docs: DOXYGEN_BLACKLIST CMake variable for modules exclusion
Maksim Shabunin [Wed, 19 Sep 2018 12:49:59 +0000 (15:49 +0300)]
Fixed several incorrect printf format specifiers
Pavel Rojtberg [Mon, 6 Aug 2018 15:16:21 +0000 (17:16 +0200)]
core: fix printf warnings by using c++11 format
Pavel Rojtberg [Sun, 5 Aug 2018 23:23:19 +0000 (01:23 +0200)]
core: enable printf format warnings for cv::format
Hamdi Sahloul [Sun, 23 Sep 2018 14:36:42 +0000 (23:36 +0900)]
JS: Support enum properties
Alexander Alekhin [Sun, 23 Sep 2018 20:00:53 +0000 (20:00 +0000)]
Merge pull request #12621 from cv3d:fix/opengl
Hamdi Sahloul [Sun, 23 Sep 2018 14:07:28 +0000 (23:07 +0900)]
fix a bug in OpenGL
Alexander Alekhin [Sun, 23 Sep 2018 13:37:36 +0000 (13:37 +0000)]
Merge pull request #12614 from alalek:winpack_samples_python_launcher_update
Alexander Alekhin [Sat, 22 Sep 2018 20:44:45 +0000 (20:44 +0000)]
Merge pull request #12612 from alalek:winpack_samples_python_launcher_update
Alexander Alekhin [Sat, 22 Sep 2018 17:15:40 +0000 (17:15 +0000)]
samples: update winpack python samples launcher
- accepts script parameter (allows drag & drop from 'explorer')
- use script dir instead of current dir (can launch samples from 'samples/dnn')
- added 'pause' to show error messages (about missing numpy) instead of instant closing
Hamdi Sahloul [Fri, 21 Sep 2018 21:58:44 +0000 (06:58 +0900)]
cuda::polarToCart: update documentation
Hamdi Sahloul [Tue, 18 Sep 2018 13:38:07 +0000 (22:38 +0900)]
cuda::polarToCart: test double precision and tune tolerance
Hamdi Sahloul [Tue, 18 Sep 2018 13:37:51 +0000 (22:37 +0900)]
cuda::polarToCart: Support double precision
Alexander Alekhin [Fri, 21 Sep 2018 16:49:51 +0000 (16:49 +0000)]
Merge pull request #12592 from alalek:dnn_test_at_least_one
Hamdi Sahloul [Fri, 21 Sep 2018 15:12:35 +0000 (00:12 +0900)]
Merge pull request #12310 from cv3d:chunks/enum_interface
* Cleanup macros and enable expansion of `__VA_ARGS__` for Visual Studio
* Macros for enum-arguments backwards compatibility
* Convert struct Param to enum struct
* Enabled ParamType.type for enum types
* Enabled `cv.read` and `cv.write` for enum types
* Rename unnamed enum to AAKAZE.DescriptorType
* Rename unnamed enum to AccessFlag
* Rename unnamed enum to AgastFeatureDetector.DetectorType
* Convert struct DrawMatchesFlags to enum struct
* Rename unnamed enum to FastFeatureDetector.DetectorType
* Rename unnamed enum to Formatter.FormatType
* Rename unnamed enum to HOGDescriptor.HistogramNormType
* Rename unnamed enum to DescriptorMatcher.MatcherType
* Rename unnamed enum to KAZE.DiffusivityType
* Rename unnamed enum to ORB.ScoreType
* Rename unnamed enum to UMatData.MemoryFlag
* Rename unnamed enum to _InputArray.KindFlag
* Rename unnamed enum to _OutputArray.DepthMask
* Convert normType enums to static const NormTypes
* Avoid conflicts with ElemType
* Rename unnamed enum to DescriptorStorageFormat
Hamdi Sahloul [Fri, 21 Sep 2018 15:11:46 +0000 (00:11 +0900)]
Merge pull request #12601 from cv3d:fix/js
* JS: Support enum types in constructors
* JS: Avoid unary expression on enum-based consts
Alexander Alekhin [Fri, 21 Sep 2018 14:59:27 +0000 (14:59 +0000)]
Merge pull request #12598 from cv3d:cmake/js
Hamdi Sahloul [Thu, 20 Sep 2018 11:56:21 +0000 (20:56 +0900)]
JS: Provides meaningful message in case of compile issues
Hamdi Sahloul [Thu, 20 Sep 2018 11:55:45 +0000 (20:55 +0900)]
JS: Improves Emscripten detection
Suleyman TURKMEN [Wed, 19 Sep 2018 08:52:12 +0000 (11:52 +0300)]
Update hog.cpp
Alexander Alekhin [Wed, 19 Sep 2018 20:47:17 +0000 (20:47 +0000)]
Merge tag '4.0.0-alpha'
Alexander Alekhin [Tue, 18 Sep 2018 18:10:51 +0000 (18:10 +0000)]
release: OpenCV 4.0.0-alpha (version++)
Alexander Alekhin [Wed, 19 Sep 2018 16:30:02 +0000 (19:30 +0300)]
Merge pull request #12585 from alalek:move_cuda_modules
cuda: move CUDA modules to opencv_contrib: https://github.com/opencv/opencv_contrib/pull/1781
Alexander Alekhin [Tue, 18 Sep 2018 16:38:12 +0000 (16:38 +0000)]
cuda: move CUDA modules to opencv_contrib
OpenCV 4.0+
Alexander Alekhin [Wed, 19 Sep 2018 15:49:47 +0000 (15:49 +0000)]
Merge pull request #12401 from alalek:opencv_install_paths