Alexander Alekhin [Sat, 5 May 2018 16:14:35 +0000 (16:14 +0000)]
Merge pull request #11463 from abhi-jha:master
abhi-jha [Fri, 4 May 2018 19:26:29 +0000 (00:56 +0530)]
fix spelling error
Alexander Alekhin [Thu, 3 May 2018 10:37:40 +0000 (10:37 +0000)]
Merge pull request #11436 from seiko2plus:issue11433
zuoshaobo [Thu, 3 May 2018 10:36:49 +0000 (18:36 +0800)]
Merge pull request #11425 from zuoshaobo:relu_negative_slope
* FIX INF_ENGINE RELU ERROR
* set slope to variable
* tab in indentwq
Sayed Adel [Wed, 2 May 2018 08:19:50 +0000 (08:19 +0000)]
cmake: Disable -Wsuggest-override option in case of using PCH #11433
Alexander Alekhin [Sat, 28 Apr 2018 15:00:44 +0000 (15:00 +0000)]
Merge pull request #11420 from alalek:git_tag_describe
Alexander Alekhin [Sat, 28 Apr 2018 14:38:42 +0000 (14:38 +0000)]
Merge pull request #11406 from alalek:core_matsize_dims
Alexander Alekhin [Sat, 28 Apr 2018 12:46:56 +0000 (15:46 +0300)]
cmake: update 'git describe' information
Alexander Alekhin [Sat, 28 Apr 2018 13:23:32 +0000 (13:23 +0000)]
Merge pull request #11419 from alalek:msvs2017_build_warning
Alexander Alekhin [Sat, 28 Apr 2018 11:17:10 +0000 (14:17 +0300)]
eliminate MSVS2017 build warning
modules\dnn\src\layers\prior_box_layer.cpp(208): warning C4834: discarding return value of function with 'nodiscard' attribute
yuki takehara [Sat, 28 Apr 2018 11:14:10 +0000 (20:14 +0900)]
Merge pull request #11285 from take1014:core_6125
* Resolves 6125
* Fix test code
* Delete unnecessary code
Alexander Alekhin [Fri, 27 Apr 2018 16:34:29 +0000 (19:34 +0300)]
Merge pull request #11314 from terfendail:msmf_camera
Alexander Alekhin [Fri, 27 Apr 2018 15:19:45 +0000 (15:19 +0000)]
Merge pull request #11394 from dkurt:dnn_custom_layers_py
Alexander Alekhin [Thu, 26 Apr 2018 15:54:43 +0000 (18:54 +0300)]
core: added MatSize::dims() method
to avoid accessing of 'p[-1]' (static code analysers dislike this)
Alexander Alekhin [Fri, 27 Apr 2018 13:47:42 +0000 (13:47 +0000)]
Merge pull request #11401 from exoson:livestitch
Tomoaki Teshima [Fri, 27 Apr 2018 13:41:56 +0000 (22:41 +0900)]
Merge pull request #11409 from tomoaki0705/fixCLAHEfailure
Arm: fix the test failure of OCL_Imgproc/CLAHETest.Accuracy on ODROID-XU4 (#11409)
* fix the test failure of OCL_Imgproc/CLAHETest.Accuracy on ODROID-XU4
* avoid the race condition in the reduce
* imgproc(ocl): simplify CLAHE code
* remove unused class
Alexander Alekhin [Fri, 27 Apr 2018 11:52:21 +0000 (14:52 +0300)]
Merge tag '3.4.1-cvsdk' into 3.4
OpenCV 3.4.1 for Intel Computer Vision SDK
Alexander Alekhin [Fri, 27 Apr 2018 10:57:37 +0000 (10:57 +0000)]
Merge pull request #11410 from alalek:ipp_norm_L1_16UC3_mask_AVX512
Alexander Alekhin [Fri, 27 Apr 2018 09:56:42 +0000 (12:56 +0300)]
core: disabled IPP AVX512 normL1(a, b, mask)
for cv::Mat with type=16UC3 and width < 16
exoson [Wed, 25 Apr 2018 14:04:42 +0000 (17:04 +0300)]
Optimize MultiBandBlender to run faster
Alexander Alekhin [Thu, 26 Apr 2018 19:04:37 +0000 (19:04 +0000)]
Merge pull request #11402 from alalek:build_warnings
Alexander Alekhin [Thu, 26 Apr 2018 15:31:09 +0000 (15:31 +0000)]
Merge pull request #11403 from alalek:cmake_fix_cpu_baseline
Alexander Alekhin [Thu, 26 Apr 2018 15:29:35 +0000 (15:29 +0000)]
Merge pull request #11404 from alalek:icc_fix_std_exception_ptr
Alexander Alekhin [Thu, 26 Apr 2018 14:46:25 +0000 (17:46 +0300)]
core: fix icc std::exception_ptr detection
std::exception_ptr requires enabled C++11 mode
Alexander Alekhin [Thu, 26 Apr 2018 13:03:45 +0000 (16:03 +0300)]
cmake: fix CPU_BASELINE_FINAL filling
- remove duplicates
- restore "always on" missing entries
- fix FP16 detection on MSVC
Vitaly Tuzov [Tue, 24 Apr 2018 13:18:39 +0000 (16:18 +0300)]
Added precise seek to MSMF-based VideoCapture::set(CAP_PROP_POS_FRAMES)
Alexander Alekhin [Thu, 26 Apr 2018 12:13:19 +0000 (12:13 +0000)]
Merge pull request #11377 from Turim:master
Alexander Alekhin [Thu, 26 Apr 2018 12:06:59 +0000 (15:06 +0300)]
cuda: eliminate warnings
Alexander Alekhin [Thu, 26 Apr 2018 11:39:52 +0000 (11:39 +0000)]
Merge pull request #11400 from alalek:ipp_norm_L1_16UC3_mask
Alexander Alekhin [Thu, 26 Apr 2018 11:16:03 +0000 (14:16 +0300)]
videoio(openni2): fix CV_CAP_PROP_OPENNI2_SYNC property
Alexander Alekhin [Thu, 26 Apr 2018 11:13:01 +0000 (14:13 +0300)]
build: fix warnings
Alexander Enaldiev [Mon, 23 Apr 2018 12:15:34 +0000 (15:15 +0300)]
protobuf build documenting: move the WITH_PROTOBUF option to the top level
Alexander Alekhin [Thu, 26 Apr 2018 09:42:37 +0000 (12:42 +0300)]
core: disabled IPP AVX2 normL1(a, b, mask)
for cv::Mat with width < 16
Alexander Alekhin [Wed, 25 Apr 2018 16:32:53 +0000 (19:32 +0300)]
core: norm with mask 16UC3 regression test
Alexander Alekhin [Thu, 26 Apr 2018 10:31:31 +0000 (10:31 +0000)]
Merge pull request #11395 from alalek:fix_fixedpoint_build
Dmitry Kurtaev [Wed, 25 Apr 2018 12:19:02 +0000 (15:19 +0300)]
Custom deep learning layers in Python
Alexander Alekhin [Wed, 25 Apr 2018 19:42:13 +0000 (19:42 +0000)]
Merge pull request #11391 from alalek:android_pack_fix_contrib
Alexander Alekhin [Wed, 25 Apr 2018 14:18:15 +0000 (17:18 +0300)]
imgproc: fixed fixedpoint coding style
- fixed wrong condition (always true)
- replaced unnecessary shift operation: '>> 63' to '< 0'
- used CV_BIG_INT()/CV_BIG_UINT() macros
Alexander Alekhin [Wed, 25 Apr 2018 13:34:44 +0000 (16:34 +0300)]
imgproc: fix fixed point build
avoid using of templated 'operator T ()'
Alexander Alekhin [Wed, 25 Apr 2018 10:20:03 +0000 (13:20 +0300)]
android: don't use relative paths to contrib modules
Alexander Alekhin [Tue, 24 Apr 2018 15:11:14 +0000 (18:11 +0300)]
Merge pull request #11385 from shengyu7697:tab_to_space
Alexander Alekhin [Tue, 24 Apr 2018 15:06:59 +0000 (15:06 +0000)]
Merge pull request #11381 from alalek:replace_cv_errornoreturn
shengyu [Tue, 24 Apr 2018 12:34:47 +0000 (20:34 +0800)]
tab to space
Alexander Alekhin [Tue, 24 Apr 2018 11:29:01 +0000 (14:29 +0300)]
build: fix warnings
Alexander Alekhin [Tue, 24 Apr 2018 11:27:17 +0000 (14:27 +0300)]
build: -Wimplicit-fallthrough warning for GCC 7+ only
Alexander Alekhin [Tue, 24 Apr 2018 10:48:21 +0000 (13:48 +0300)]
build: unreachable code after CV_Error() (part 2)
Alexander Alekhin [Mon, 23 Apr 2018 16:02:39 +0000 (19:02 +0300)]
refactor: don't use CV_ErrorNoReturn() internally
Dmitry Kurtaev [Tue, 24 Apr 2018 11:59:59 +0000 (14:59 +0300)]
Custom layers for deep learning networks (#11129)
* Custom deep learning layers support
* Stack custom deep learning layers
Alexander Alekhin [Tue, 24 Apr 2018 11:44:33 +0000 (11:44 +0000)]
Merge pull request #11332 from alalek:v_select_x86
Vadim Pisarevsky [Tue, 24 Apr 2018 11:30:18 +0000 (11:30 +0000)]
Merge pull request #11380 from vpisarev:faster_interleave_deinterleave
Vadim Pisarevsky [Tue, 24 Apr 2018 11:29:50 +0000 (11:29 +0000)]
Merge pull request #11382 from alalek:cmake_macosx_cpu_baseline
Vitaly Tuzov [Mon, 23 Apr 2018 13:48:57 +0000 (16:48 +0300)]
Added DXVA hardware acceleration to MSMF-based VideoCapture
Alexander Alekhin [Tue, 24 Apr 2018 09:40:25 +0000 (12:40 +0300)]
cmake: fix popcnt detection
via GCC/Clang __POPCNT__ define
Vitaly Tuzov [Thu, 19 Apr 2018 15:24:02 +0000 (18:24 +0300)]
Integrated camera and file MSMF-based VideoCaptures and implemented configuration properties get/set
Vitaly Tuzov [Fri, 13 Apr 2018 12:43:41 +0000 (15:43 +0300)]
Remove unused code
Maksim Shabunin [Tue, 24 Apr 2018 08:23:56 +0000 (08:23 +0000)]
Merge pull request #11269 from allnes:gst_add_encoder_sample
Maksim Shabunin [Tue, 24 Apr 2018 08:23:28 +0000 (08:23 +0000)]
Merge pull request #11320 from mshabunin:gstreamer-cpp
Alexander Nesterov [Sun, 8 Apr 2018 22:27:55 +0000 (01:27 +0300)]
Added encode-pipeline to sample
Alexander Alekhin [Mon, 23 Apr 2018 16:42:49 +0000 (19:42 +0300)]
cmake: change CPU_BASELINE=DETECT for MacOSX
Vadim Pisarevsky [Mon, 23 Apr 2018 15:06:06 +0000 (18:06 +0300)]
improved performance of v_load_deinterleave(8uC3) & v_store_interleave(8uC3) intrinsics when using SSSE3 instructions.
Alexander Alekhin [Mon, 23 Apr 2018 14:51:55 +0000 (14:51 +0000)]
Merge pull request #11376 from alalek:cv_error_set_terminate
Vitaly Tuzov [Thu, 12 Apr 2018 12:26:18 +0000 (15:26 +0300)]
MSMF-based CameraCapture reworked to use SourceReader
Vitaly Tuzov [Wed, 11 Apr 2018 13:49:40 +0000 (16:49 +0300)]
Removed WINRT related code
Alexander Alekhin [Mon, 23 Apr 2018 14:01:16 +0000 (14:01 +0000)]
Merge pull request #11375 from alalek:warnings_unreachable_code
Alexander Alekhin [Mon, 23 Apr 2018 11:32:40 +0000 (14:32 +0300)]
build: unreachable code after CV_Error()
Alexander Alekhin [Mon, 23 Apr 2018 12:06:43 +0000 (15:06 +0300)]
core: CV_Error with set_terminate() on Windows
To dump contents of the last OpenCV error
Maksim Shabunin [Mon, 16 Apr 2018 12:59:25 +0000 (15:59 +0300)]
VideoIO: prettier test console output, gstreamer capture backend changed to C++ interface
Alexander Alekhin [Tue, 17 Apr 2018 14:50:23 +0000 (17:50 +0300)]
core(hal): improve v_select() SSE4.1+
v_select 'mask' is restricted to these values only: 0 or ~0 (0xff/0xffff/etc)
mask in accuracy test is updated.
Vadim Pisarevsky [Mon, 23 Apr 2018 10:09:29 +0000 (10:09 +0000)]
Merge pull request #11358 from mshabunin:enable-xine
Vadim Pisarevsky [Mon, 23 Apr 2018 10:08:10 +0000 (10:08 +0000)]
Merge pull request #11350 from alalek:fix_11348
Vadim Pisarevsky [Mon, 23 Apr 2018 10:06:43 +0000 (10:06 +0000)]
Merge pull request #11357 from alalek:disable_errors_dump
Alexander Alekhin [Mon, 23 Apr 2018 09:24:39 +0000 (09:24 +0000)]
Merge pull request #11363 from mshabunin:compat-vc2017
Alexander Alekhin [Mon, 23 Apr 2018 09:16:39 +0000 (09:16 +0000)]
Merge pull request #11351 from dkurt:dnn_enable_inf_engine_tests
Alexander Alekhin [Mon, 23 Apr 2018 09:14:23 +0000 (09:14 +0000)]
Merge pull request #11374 from lupustr3:pvlasov/morph_big_fix
Pavel Vlasov [Mon, 23 Apr 2018 06:45:10 +0000 (09:45 +0300)]
IPP morphology with big images hotfix.
Maksim Shabunin [Fri, 20 Apr 2018 15:12:51 +0000 (18:12 +0300)]
cmake config: adding fallback to VS 2015 if distribution does not have VS 2017 binaries
Alexander Alekhin [Sat, 21 Apr 2018 19:11:21 +0000 (19:11 +0000)]
Merge pull request #11367 from berak:core_fix_inrange
berak [Sat, 21 Apr 2018 09:43:05 +0000 (11:43 +0200)]
core: add a check for empty input in inRange()
Alexander Alekhin [Fri, 20 Apr 2018 16:53:38 +0000 (16:53 +0000)]
Merge pull request #11362 from dkurt:dnn_keras_deconv
Ryan Wong [Fri, 20 Apr 2018 15:43:47 +0000 (08:43 -0700)]
Merge pull request #11304 from kinchungwong:issue_11242_intrin_cv34x_nocpp11
* Issue 11242 intrinsics v_extract, v_rotate improvement, branch 3.4, without C++11 (remove type restrictions for SSE2, use PALIGNR on SSSE3, compile to no-op when imm is 0 or nlanes).
* fix whitespace
* Fix #11242 (NEON intrinsics v_rotate...) branch 3.4
Separate macro expansion OPENCV_HAL_IMPL_NEON_SHIFT_OP for bitwise shifts for integers, from macro expansion OPENCV_HAL_IMPL_NEON_ROTATE for lane rotations. Bitwise shifts do not apply to floats, but lane-rotations can apply to both.
* fix whitespace
* Fix #11242 compile error (VSX intrinsics v_rotate(a)) branch 3.4 no-c++11
Alexander Alekhin [Fri, 20 Apr 2018 14:50:40 +0000 (14:50 +0000)]
Merge pull request #11315 from tomoaki0705:featureComparePixelCount
Alexander Alekhin [Fri, 20 Apr 2018 14:49:37 +0000 (14:49 +0000)]
Merge pull request #11361 from alalek:ocl_use_host_mem_ptr_workaround
Dmitry Kurtaev [Fri, 20 Apr 2018 13:44:05 +0000 (16:44 +0300)]
Fuse deconvolution layer subgraphs from Keras
Simon Que [Fri, 20 Apr 2018 12:31:47 +0000 (08:31 -0400)]
Merge pull request #11353 from eecsninja:3.4
* Fix CV_Asserts with negation of strings
{!"string"} causes some compilers to throw a warning.
The value of the string is not that important -- it's only for printing
the assertion message.
Replace these calls with:
CV_Error(Error::StsError, "string")
to suppress the warning.
* remove unnecessary 'break' after CV_Error()
Alexander Alekhin [Fri, 20 Apr 2018 12:30:50 +0000 (12:30 +0000)]
Merge pull request #11352 from alalek:build_implicit_fallthrough
Alexander Alekhin [Fri, 20 Apr 2018 12:29:13 +0000 (12:29 +0000)]
Merge pull request #11349 from alalek:cv_error_no_return
Maksim Shabunin [Fri, 20 Apr 2018 09:30:54 +0000 (12:30 +0300)]
videoio: refactored XINE backend
Alexander Alekhin [Fri, 20 Apr 2018 11:51:55 +0000 (14:51 +0300)]
ocl: CL_MEM_USE_HOST_PTR workaround test
Alexander Alekhin [Fri, 20 Apr 2018 09:29:12 +0000 (12:29 +0300)]
core: disable errors dump
Error messages are available via exceptions
Dmitry Kurtaev [Thu, 19 Apr 2018 12:04:57 +0000 (15:04 +0300)]
Enable some tests for clDNN plugin from Intel's Inference Engine
Alexander Alekhin [Thu, 19 Apr 2018 16:54:03 +0000 (19:54 +0300)]
build: enable -Wimplicit-fallthrough warning for OpenCV modules
Alexander Alekhin [Thu, 19 Apr 2018 15:42:01 +0000 (18:42 +0300)]
python: fix support of UI callbacks
Alexander Alekhin [Thu, 19 Apr 2018 13:14:27 +0000 (16:14 +0300)]
core: CV_Error is marked as 'noreturn'
Vadim Pisarevsky [Thu, 19 Apr 2018 12:23:50 +0000 (15:23 +0300)]
Grabcut with frozen models (#11339)
* model is not learned when grabcut is called with GC_EVAL
* fixed test, was writing to wrong file.
* modified patch by Iwan Paolucci; added GC_EVAL_FREEZE_MODEL in addition to GC_EVAL (which semantics is retained)
Vadim Pisarevsky [Thu, 19 Apr 2018 12:23:15 +0000 (12:23 +0000)]
Merge pull request #11340 from dkurt:dnn_inf_engine_switch_target
Vadim Pisarevsky [Thu, 19 Apr 2018 12:21:50 +0000 (12:21 +0000)]
Merge pull request #11341 from alalek:v_min_max_sse41
Alexander Alekhin [Thu, 19 Apr 2018 10:58:00 +0000 (10:58 +0000)]
Merge pull request #11309 from K-Shinotsuka:issue41
Tomoaki Teshima [Thu, 19 Apr 2018 08:31:42 +0000 (17:31 +0900)]
add new comparison to tolerate with rounding error
* restore resize of carotene
* clean up the source code
* remove unused member function (Near)
* add strict test on the border
Dmitry Kurtaev [Wed, 18 Apr 2018 14:26:54 +0000 (17:26 +0300)]
Let switch CPU/OpenCL targets for models from Intel's Model Optimizer
Alexander Alekhin [Wed, 18 Apr 2018 16:40:59 +0000 (19:40 +0300)]
core(hal): v_min()/v_max() use SSE4.1 intrinsics