Alexander Alekhin
4d7d630e92
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-23 18:45:02 +03:00
Alexander Alekhin
e82af627ed
Merge pull request #11376 from alalek:cv_error_set_terminate
2018-04-23 14:51:55 +00:00
Alexander Alekhin
643e4f37ba
Merge pull request #11375 from alalek:warnings_unreachable_code
2018-04-23 14:01:17 +00:00
Alexander Alekhin
4cbec82ac1
build: unreachable code after CV_Error()
2018-04-23 15:45:57 +03:00
Alexander Alekhin
10c9227136
core: CV_Error with set_terminate() on Windows
...
To dump contents of the last OpenCV error
2018-04-23 15:09:41 +03:00
Vadim Pisarevsky
9615f8c994
Merge pull request #11358 from mshabunin:enable-xine
2018-04-23 10:09:29 +00:00
Vadim Pisarevsky
b8a6bfb54e
Merge pull request #11350 from alalek:fix_11348
2018-04-23 10:08:10 +00:00
Vadim Pisarevsky
a312380367
Merge pull request #11357 from alalek:disable_errors_dump
2018-04-23 10:06:43 +00:00
Alexander Alekhin
dca9ca1cac
Merge pull request #11363 from mshabunin:compat-vc2017
2018-04-23 09:24:39 +00:00
Alexander Alekhin
29b4fd2774
Merge pull request #11351 from dkurt:dnn_enable_inf_engine_tests
2018-04-23 09:16:39 +00:00
Alexander Alekhin
f659f80c7f
Merge pull request #11374 from lupustr3:pvlasov/morph_big_fix
2018-04-23 09:14:23 +00:00
Pavel Vlasov
a42789f330
IPP morphology with big images hotfix.
2018-04-23 10:50:20 +03:00
Maksim Shabunin
abce51fb7b
cmake config: adding fallback to VS 2015 if distribution does not have VS 2017 binaries
2018-04-23 09:33:27 +03:00
Alexander Alekhin
7973a2ca1f
Merge pull request #11367 from berak:core_fix_inrange
2018-04-21 19:11:21 +00:00
berak
d89fb163c6
core: add a check for empty input in inRange()
2018-04-21 12:54:52 +02:00
Alexander Alekhin
7b36e57551
Merge pull request #11362 from dkurt:dnn_keras_deconv
2018-04-20 16:53:38 +00:00
Ryan Wong
6f675ae75b
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
2018-04-20 18:43:47 +03:00
Alexander Alekhin
c8b515ea69
Merge pull request #11315 from tomoaki0705:featureComparePixelCount
2018-04-20 14:50:40 +00:00
Alexander Alekhin
52172e6f92
Merge pull request #11361 from alalek:ocl_use_host_mem_ptr_workaround
2018-04-20 14:49:37 +00:00
Dmitry Kurtaev
d959d7b9f0
Fuse deconvolution layer subgraphs from Keras
2018-04-20 16:51:38 +03:00
Simon Que
705464258e
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()
2018-04-20 15:31:47 +03:00
Alexander Alekhin
2b4b946689
Merge pull request #11352 from alalek:build_implicit_fallthrough
2018-04-20 12:30:50 +00:00
Alexander Alekhin
4e063be421
Merge pull request #11349 from alalek:cv_error_no_return
2018-04-20 12:29:13 +00:00
Maksim Shabunin
a9bdf75c5b
videoio: refactored XINE backend
2018-04-20 15:20:46 +03:00
Alexander Alekhin
d76b41b50e
ocl: CL_MEM_USE_HOST_PTR workaround test
2018-04-20 14:58:42 +03:00
Alexander Alekhin
2f9cbc2e57
core: disable errors dump
...
Error messages are available via exceptions
2018-04-20 12:33:20 +03:00
Dmitry Kurtaev
bd77d100e1
Enable some tests for clDNN plugin from Intel's Inference Engine
2018-04-20 10:47:46 +03:00
Alexander Alekhin
12e8e33144
build: enable -Wimplicit-fallthrough warning for OpenCV modules
2018-04-19 19:54:03 +03:00
Alexander Alekhin
21026bf7cd
python: fix support of UI callbacks
2018-04-19 18:42:01 +03:00
Alexander Alekhin
647eb243ae
core: CV_Error is marked as 'noreturn'
2018-04-19 18:04:12 +03:00
Vadim Pisarevsky
7ea5029ae5
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)
2018-04-19 15:23:50 +03:00
Vadim Pisarevsky
64a6b12114
Merge pull request #11340 from dkurt:dnn_inf_engine_switch_target
2018-04-19 12:23:15 +00:00
Vadim Pisarevsky
4e31015715
Merge pull request #11341 from alalek:v_min_max_sse41
2018-04-19 12:21:50 +00:00
Alexander Alekhin
ad2127765f
Merge pull request #11309 from K-Shinotsuka:issue41
2018-04-19 10:58:00 +00:00
Tomoaki Teshima
98d9369a38
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
2018-04-19 17:31:42 +09:00
Dmitry Kurtaev
3b4a292ca9
Let switch CPU/OpenCL targets for models from Intel's Model Optimizer
2018-04-19 10:23:57 +03:00
Alexander Alekhin
fa3cb03f62
core(hal): v_min()/v_max() use SSE4.1 intrinsics
2018-04-18 19:43:20 +03:00
Alexander Alekhin
0477284b0a
Merge pull request #11338 from alalek:fix_fp16_with_disabled_optimizations
2018-04-18 13:34:34 +00:00
Vadim Pisarevsky
b290bdafb9
Merge pull request #11322 from dkurt:dnn_yolov3
2018-04-18 12:11:13 +00:00
Alexander Alekhin
97882d03cc
core: fix FP16 conversion with CV_DISABLE_OPTIMIZATION option
...
Reproducer:
cmake -DCPU_BASELINE=AVX2 -DCV_DISABLE_OPTIMIZATION=ON ...
2018-04-18 14:13:03 +03:00
Alexander Alekhin
29dd115e9e
Merge pull request #11333 from alalek:cmake_fix_native
2018-04-18 09:09:08 +00:00
Alexander Alekhin
28d4157ea7
Merge pull request #11331 from dkurt:fix_11318
2018-04-17 16:41:29 +00:00
Alexander Alekhin
5b867b6f1f
cmake: fix CPU_BASELINE=NATIVE on MSVS
2018-04-17 19:34:35 +03:00
Dmitry Kurtaev
66ce8cd7ea
Fix bugs found by valgrind
2018-04-17 17:53:51 +03:00
Vadim Pisarevsky
b8b7ca7302
Rewite polar transforms ( #11323 )
...
* Rewrite polar transformations
- A new wrapPolar function encapsulate both linear and semi-log remap
- Destination size is a parameter or calculated automatically to keep objects size between remapping
- linearPolar and logPolar has been deprecated
* Fix build warning and error in accuracy test
* Fix function name to warpPolar
* Explicitly specify the mapping mode, so we retain all the parameters as non-optional.
Introduces WarpPolarMode enum to specify the mapping mode in flags
* resolves performance warning on windows build
* removed duplicated logPolar and linearPolar implementations
2018-04-17 15:50:52 +03:00
k-shinotsuka
b3755ae670
add universal intrinsics for RGB2HLS_f
2018-04-17 19:37:36 +09:00
Dmitry Kurtaev
97fec07d96
Support YOLOv3 model from Darknet
2018-04-16 18:44:12 +03:00
Alexander Alekhin
e0fef2bca1
Merge pull request #11319 from alalek:issue_11293
2018-04-16 15:39:22 +00:00
Alexander Alekhin
16d6502920
Merge pull request #11317 from alalek:issue_11303
2018-04-16 15:38:57 +00:00
Alexander Alekhin
ee90a6cbde
dnn(test): update error tolerance for RCNN/RFCN tests
2018-04-16 14:24:41 +03:00