Sergey Nuzhny
80610ca054
Merge pull request #12449 from Nuzhny007:master
...
* Fixed compilation error WITH_OPENMP under Windows
* Move up OpenMP condition
2018-09-08 23:20:14 +03:00
Alexander Alekhin
fd0df5a89b
Merge pull request #12469 from cv3d:fix/js/python3_msvc
2018-09-08 11:42:11 +00:00
Hamdi Sahloul
b487e2df0b
opencv_js: Support Python3 and MSVC
2018-09-08 18:23:41 +09:00
Hamdi Sahloul
c6ed2bf9aa
opencv_js: fix a bug in handling enums using the new parser
2018-09-08 18:23:41 +09:00
Alexander Alekhin
40b1dc12de
Merge pull request #12464 from alalek:fix_contrib_1754
2018-09-07 20:03:41 +00:00
Alexander Alekhin
8eba3c1e7e
Merge pull request #12462 from alalek:issue_12453
2018-09-07 16:55:01 +00:00
Alexander Alekhin
b50c70bbfa
features2d(test): extract common extract/invariance test code
...
to share with opencv_contrib/xfeatures2d
2018-09-07 19:30:51 +03:00
Alexander Alekhin
af021e79d9
video(perf): drop unreliable sanity checks
2018-09-07 18:09:00 +03:00
Alexander Alekhin
73bfe68821
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-07 12:40:27 +03:00
Alexander Alekhin
f3fae0dae0
Merge pull request #12459 from alalek:fix_cuda_build
2018-09-07 09:27:31 +00:00
Alexander Alekhin
4a73b4859f
Merge pull request #12452 from seiko2plus:issue12427
2018-09-07 07:32:15 +00:00
Alexander Alekhin
f90aea22b1
cuda: fix build (legacy C-API usage)
2018-09-07 07:26:17 +00:00
Alexander Alekhin
bd98ed46bd
Merge pull request #12446 from alalek:imgproc_grabcut_numeric_issues
2018-09-06 20:18:45 +00:00
cyy
8b48c2a10c
Merge pull request #12443 from DEEPIR:master
...
* simplify condition
* dims must > 0 or latter sz[dims-1] will underflow
2018-09-06 23:09:39 +03:00
Alexander Alekhin
f1f15841d7
Merge pull request #11630 from alalek:c_api_eliminate_constructors
2018-09-06 20:07:16 +00:00
Sayed Adel
f5d181db3a
python:ppc64 Add missing support for PyLongObject
2018-09-06 20:04:05 +00:00
Vadim Pisarevsky
80b62a41c6
Merge pull request #12411 from vpisarev:wide_convert
...
* rewrote Mat::convertTo() and convertScaleAbs() to wide universal intrinsics; added always-available and SIMD-optimized FP16<=>FP32 conversion
* fixed compile warnings
* fix some more compile errors
* slightly relaxed accuracy threshold for int->float conversion (since we now do it using single-precision arithmetics, not double-precision)
* fixed compile errors on iOS, Android and in the baseline C++ version (intrin_cpp.hpp)
* trying to fix ARM-neon builds
* trying to fix ARM-neon builds
* trying to fix ARM-neon builds
* trying to fix ARM-neon builds
2018-09-06 19:36:59 +03:00
Vadim Pisarevsky
54279523a3
Merge pull request #12437 from vpisarev:avx2_fixes
...
* trying to fix the custom AVX2 builder test failures (false alarms)
* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests
* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests
* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests
* seemingly disabled false alarm warning in surf.cpp; increased tolerance thresholds in the tests for SolvePnP and in DNN/ENet
2018-09-06 18:56:55 +03:00
Alexander Alekhin
24e72e151a
imgproc: grabcut numeric stability
2018-09-06 17:05:54 +03:00
Alexander Alekhin
8a3c394d6a
don't use constructors for C API structures
2018-09-06 14:34:16 +03:00
Alexander Alekhin
ad146e5a6b
core: remove constructors from C API structures
...
POD structures can't have constructors.
2018-09-06 14:34:09 +03:00
Alexander Alekhin
66d15e89df
Merge pull request #12440 from woodychow:fix_normL2Sqr_speed_regression_3.4
2018-09-06 10:33:33 +00:00
Rostislav Vasilikhin
da7e1cfb49
Merge pull request #12279 from savuor:cvtcolor_bgr2gray_8u_15bits
...
* bgr2gray 8u fixed to be in conformance with IPP code
* coefficients fixed so their sum is 32768
* java test for CascadeDetect fixed: equalizeHist added
2018-09-06 13:28:24 +03:00
Dmitry Kurtaev
d486204a0d
Merge pull request #12264 from dkurt:dnn_remove_forward_method
...
* Remove a forward method in dnn::Layer
* Add a test
* Fix tests
* Mark multiple dnn::Layer::finalize methods as deprecated
* Replace back dnn's inputBlobs to vector of pointers
* Remove Layer::forward_fallback from CV_OCL_RUN scopes
2018-09-06 13:26:47 +03:00
woody.chow
07c6b0a8df
Replace naive normL2Sqr with hal::normL2Sqr_ for better performance
2018-09-06 17:43:07 +09:00
Alexander Alekhin
43b64140ae
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-05 19:54:09 +03:00
Alexander Alekhin
8e8315abfd
Merge pull request #12434 from alalek:pr12414_rebased
2018-09-05 16:46:36 +00:00
Alexander Alekhin
a18da0c55e
Merge pull request #12355 from sturkmen72:update_samples
2018-09-05 16:24:02 +00:00
Zhenqing Hu
d621a99e73
To fix bug #12389 , which is a validation for the potential null pointer.
...
Signed-off-by: Zhenqing Hu <huzq85@gmail.com>
2018-09-05 19:14:34 +03:00
Alexander Alekhin
107660c7ba
Merge pull request #12433 from alalek:fix_contrib_1746
2018-09-05 16:09:27 +00:00
Suleyman TURKMEN
b33cb2e3f2
Update samples
2018-09-05 18:16:40 +03:00
Alexander Alekhin
e70526625f
imgproc: fix Subdiv2D::getTriangleList()
2018-09-05 16:24:27 +03:00
Alexander Alekhin
8a328e393d
Merge pull request #12408 from dkurt:dnn_myriad_batch_tests
2018-09-05 10:04:04 +00:00
Alexander Alekhin
9fae8070dc
Merge pull request #12424 from alalek:fix_build_avoid_nullptr
2018-09-05 09:46:26 +00:00
Dmitry Kurtaev
6ec230480d
Enable Myriad tests with batch size > 1
2018-09-05 10:45:09 +03:00
Alexander Alekhin
c441ad36c8
build: don't use nullptr without C++11 guard
2018-09-05 06:19:02 +00:00
Alexander Alekhin
59cd636ad7
Merge pull request #12420 from cv3d:fix/gtest_vc12
2018-09-05 06:12:09 +00:00
Hamdi Sahloul
3f3d805663
Workaround for GTest v1.8.1 + Visual Studio 2013 (vc12)
2018-09-05 12:16:47 +09:00
Alexander Alekhin
d74b98c3d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-04 18:39:03 +00:00
Alexander Alekhin
351ee2e3a5
Merge pull request #12409 from dkurt:fix_12407
2018-09-04 16:34:30 +00:00
Alexander Alekhin
7f7f30a08b
Merge pull request #12406 from alalek:backport_12357_12391
2018-09-04 16:09:44 +00:00
Alexander Alekhin
e0bfe44cac
Merge pull request #12400 from alalek:dnn_update_inline_namespace_master
2018-09-04 15:17:15 +00:00
Alexander Alekhin
fda99c1c6c
Merge pull request #12394 from alalek:imgproc_GaussianBlur_allow_HAL_8U
2018-09-04 15:16:08 +00:00
Alexander Alekhin
71c8de8fa1
Merge pull request #12383 from alalek:ts_qemu_support
2018-09-04 15:15:39 +00:00
Dmitry Kurtaev
27a6be8763
Fix #12407
2018-09-04 17:48:52 +03:00
Alexander Alekhin
acce95f446
backport fixes for static analyzer warnings
...
Commits:
- 09837928d9
- 10fb88d027
Excluded changes with std::atomic (C++98 requirement)
2018-09-04 16:49:42 +03:00
cyy
10fb88d027
Merge pull request #12391 from DEEPIR:master
...
fix some errors found by static analyzer. (#12391 )
* fix possible divided by zero and by negative values
* only 4 elements are used in these arrays
* fix uninitialized member
* use boolean type for semantic boolean variables
* avoid invalid array index
* to avoid exception and because base64_beg is only used in this block
* use std::atomic<bool> to avoid thread control race condition
2018-09-04 16:39:19 +03:00
Alexander Alekhin
a78e5344df
Merge pull request #12382 from alalek:update_gtest_1.8.1
2018-09-04 13:28:55 +00:00
Alexander Alekhin
e5236cecd6
Merge pull request #12405 from todortomov:3.4_cap_v4l_query_conrtols
2018-09-04 12:55:05 +00:00
Alexander Alekhin
6aff916aa5
Merge pull request #12398 from alalek:samples_eliminate_cvconfig
2018-09-04 11:38:34 +00:00