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
6 years ago
Alexander Alekhin
43b64140ae
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
6 years ago
Alexander Alekhin
8e8315abfd
Merge pull request #12434 from alalek:pr12414_rebased
6 years ago
Alexander Alekhin
a18da0c55e
Merge pull request #12355 from sturkmen72:update_samples
6 years ago
Zhenqing Hu
d621a99e73
To fix bug #12389 , which is a validation for the potential null pointer.
...
Signed-off-by: Zhenqing Hu <huzq85@gmail.com>
6 years ago
Alexander Alekhin
107660c7ba
Merge pull request #12433 from alalek:fix_contrib_1746
6 years ago
Suleyman TURKMEN
b33cb2e3f2
Update samples
6 years ago
Alexander Alekhin
e70526625f
imgproc: fix Subdiv2D::getTriangleList()
6 years ago
Alexander Alekhin
8a328e393d
Merge pull request #12408 from dkurt:dnn_myriad_batch_tests
6 years ago
Alexander Alekhin
9fae8070dc
Merge pull request #12424 from alalek:fix_build_avoid_nullptr
6 years ago
Dmitry Kurtaev
6ec230480d
Enable Myriad tests with batch size > 1
6 years ago
Alexander Alekhin
c441ad36c8
build: don't use nullptr without C++11 guard
6 years ago
Alexander Alekhin
59cd636ad7
Merge pull request #12420 from cv3d:fix/gtest_vc12
6 years ago
Hamdi Sahloul
3f3d805663
Workaround for GTest v1.8.1 + Visual Studio 2013 (vc12)
6 years ago
Alexander Alekhin
d74b98c3d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
6 years ago
Alexander Alekhin
351ee2e3a5
Merge pull request #12409 from dkurt:fix_12407
6 years ago
Alexander Alekhin
7f7f30a08b
Merge pull request #12406 from alalek:backport_12357_12391
6 years ago
Alexander Alekhin
e0bfe44cac
Merge pull request #12400 from alalek:dnn_update_inline_namespace_master
6 years ago
Alexander Alekhin
fda99c1c6c
Merge pull request #12394 from alalek:imgproc_GaussianBlur_allow_HAL_8U
6 years ago
Alexander Alekhin
71c8de8fa1
Merge pull request #12383 from alalek:ts_qemu_support
6 years ago
Dmitry Kurtaev
27a6be8763
Fix #12407
6 years ago
Alexander Alekhin
acce95f446
backport fixes for static analyzer warnings
...
Commits:
- 09837928d9
- 10fb88d027
Excluded changes with std::atomic (C++98 requirement)
6 years ago
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
6 years ago
Alexander Alekhin
a78e5344df
Merge pull request #12382 from alalek:update_gtest_1.8.1
6 years ago
Alexander Alekhin
e5236cecd6
Merge pull request #12405 from todortomov:3.4_cap_v4l_query_conrtols
6 years ago
Alexander Alekhin
6aff916aa5
Merge pull request #12398 from alalek:samples_eliminate_cvconfig
6 years ago
Alexander Alekhin
4f9db2c03a
Merge pull request #12377 from alalek:inputarray_raw_wrapper_customtype
6 years ago
Todor Tomov
9988e1b6ee
cap_v4l: Fix private control enumeration end condition
...
Currently the private control enumeration will be stopped when QUERYCTRL
returns -EINVAL only. It is possible however that other errors occur.
One particular case is when the v4l2 device doesn't support any controls
and doesn't implement the QUERYCTRL ioctl. In that case the v4l2
framework returns -ENOTTY. In that case the current control enumeration
will go in an endless loop.
To fix this change the control enumeration stop condition. If any errors
occur, end the control enumeration.
Signed-off-by: Todor Tomov <todor.tomov@linaro.org>
6 years ago
Alexander Alekhin
afb81ba6e6
samples: eliminate cvconfig.h usage
...
- don't use TBB in samples
6 years ago
Alexander Alekhin
0f0a82b619
Merge pull request #12402 from alalek:fix_build_dnn_tests
6 years ago
Alexander Alekhin
2cf34c0fe5
dnn: fix tests build with disabled OpenCL
6 years ago
Alexander Alekhin
f826709452
Merge pull request #12303 from cv3d:improvements/binding_python
6 years ago
Alexander Alekhin
f10fd64630
dnn: update "guard" inline namespace
...
- differ from 3.4 branch
6 years ago
Alexander Alekhin
49a1328046
Merge pull request #12396 from LaurentBerger:I12392
6 years ago
Alexander Alekhin
2877f17372
Merge pull request #12397 from terfendail:resize_wintr_fix
6 years ago
Alexander Alekhin
00cbb894ec
CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement
6 years ago
Alexander Alekhin
a0f86479e0
core: wrap custom types via _RawArray (raw() call)
...
- support passing of `std::vector<KeyPoint>` via InputArray
6 years ago
Vitaly Tuzov
f9a5c4d181
Fixed bit-exact resize wide intrinsics implementation for 16U
6 years ago
LaurentBerger
d71812425a
Solves issue 12392
6 years ago
Alexander Alekhin
aa5c45339c
Merge pull request #12393 from peterjozsa:issue_12301
6 years ago
Alexander Alekhin
1e362ff5c3
imgproc(GaussianBlur): restore processing order
6 years ago
Vadim Pisarevsky
fc71316690
Merge pull request #12371 from alalek:issue_12366
6 years ago
yuki takehara
cb7ee27cd9
Fix bug in distanceTransform ( #12278 )
...
* fix 12218
* Update test_distancetransform.cpp
marked the test as "BIGDATA_TEST" in order to skip it on low-mem platforms
* modify test
* use a smaller image in the test
* fix test code
6 years ago
Dmitry Kurtaev
c7cf8fb35c
Import SSDs from TensorFlow by training config ( #12188 )
...
* Remove TensorFlow and protobuf dependencies from object detection scripts
* Create text graphs for TensorFlow object detection networks from sample
6 years ago
Peter Jozsa
8b0e1c7fcb
Fix https://github.com/opencv/opencv/issues/12301
6 years ago
Alexander Alekhin
e3af72bb68
Merge pull request #12376 from alalek:issue_12337
6 years ago
Alexander Alekhin
ec3492a22a
Merge pull request #12374 from alalek:issue_12368
6 years ago
Alexander Alekhin
07808c8d5d
Merge pull request #12373 from alalek:issue_12365
6 years ago
Alexander Alekhin
436e330642
Merge pull request #12386 from wzw-intel:redundant_code
6 years ago
Wu Zhiwen
a11d944f51
dnn: Remove a duplicated code snippet for flatten layer
...
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
6 years ago