Sayed Adel [Thu, 6 Sep 2018 20:04:05 +0000 (20:04 +0000)]
python:ppc64 Add missing support for PyLongObject
Rostislav Vasilikhin [Thu, 6 Sep 2018 10:28:24 +0000 (13:28 +0300)]
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
Alexander Alekhin [Wed, 5 Sep 2018 16:52:16 +0000 (19:52 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 5 Sep 2018 16:46:36 +0000 (16:46 +0000)]
Merge pull request #12434 from alalek:pr12414_rebased
Alexander Alekhin [Wed, 5 Sep 2018 16:24:02 +0000 (16:24 +0000)]
Merge pull request #12355 from sturkmen72:update_samples
Zhenqing Hu [Tue, 4 Sep 2018 18:35:57 +0000 (14:35 -0400)]
To fix bug #12389, which is a validation for the potential null pointer.
Signed-off-by: Zhenqing Hu <huzq85@gmail.com>
Alexander Alekhin [Wed, 5 Sep 2018 16:09:27 +0000 (16:09 +0000)]
Merge pull request #12433 from alalek:fix_contrib_1746
Suleyman TURKMEN [Sat, 25 Aug 2018 02:37:54 +0000 (05:37 +0300)]
Update samples
Alexander Alekhin [Wed, 5 Sep 2018 13:16:53 +0000 (16:16 +0300)]
imgproc: fix Subdiv2D::getTriangleList()
Alexander Alekhin [Wed, 5 Sep 2018 10:04:04 +0000 (10:04 +0000)]
Merge pull request #12408 from dkurt:dnn_myriad_batch_tests
Alexander Alekhin [Wed, 5 Sep 2018 09:46:26 +0000 (09:46 +0000)]
Merge pull request #12424 from alalek:fix_build_avoid_nullptr
Dmitry Kurtaev [Tue, 4 Sep 2018 14:33:34 +0000 (17:33 +0300)]
Enable Myriad tests with batch size > 1
Alexander Alekhin [Wed, 5 Sep 2018 06:19:02 +0000 (06:19 +0000)]
build: don't use nullptr without C++11 guard
Alexander Alekhin [Wed, 5 Sep 2018 06:12:09 +0000 (06:12 +0000)]
Merge pull request #12420 from cv3d:fix/gtest_vc12
Hamdi Sahloul [Wed, 5 Sep 2018 02:44:30 +0000 (11:44 +0900)]
Workaround for GTest v1.8.1 + Visual Studio 2013 (vc12)
Alexander Alekhin [Tue, 4 Sep 2018 16:35:38 +0000 (19:35 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 4 Sep 2018 16:34:30 +0000 (16:34 +0000)]
Merge pull request #12409 from dkurt:fix_12407
Alexander Alekhin [Tue, 4 Sep 2018 16:09:43 +0000 (16:09 +0000)]
Merge pull request #12406 from alalek:backport_12357_12391
Alexander Alekhin [Tue, 4 Sep 2018 15:17:15 +0000 (15:17 +0000)]
Merge pull request #12400 from alalek:dnn_update_inline_namespace_master
Alexander Alekhin [Tue, 4 Sep 2018 15:16:08 +0000 (15:16 +0000)]
Merge pull request #12394 from alalek:imgproc_GaussianBlur_allow_HAL_8U
Alexander Alekhin [Tue, 4 Sep 2018 15:15:39 +0000 (15:15 +0000)]
Merge pull request #12383 from alalek:ts_qemu_support
Dmitry Kurtaev [Tue, 4 Sep 2018 14:48:52 +0000 (17:48 +0300)]
Fix #12407
Alexander Alekhin [Tue, 4 Sep 2018 13:44:47 +0000 (16:44 +0300)]
backport fixes for static analyzer warnings
Commits:
-
09837928d934d104b3f327ce42122b7b8f35fff3
-
10fb88d02791b33d83a3756c62e21aa1c5a1e68d
Excluded changes with std::atomic (C++98 requirement)
cyy [Tue, 4 Sep 2018 13:39:19 +0000 (21:39 +0800)]
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
Alexander Alekhin [Tue, 4 Sep 2018 13:28:55 +0000 (13:28 +0000)]
Merge pull request #12382 from alalek:update_gtest_1.8.1
Alexander Alekhin [Tue, 4 Sep 2018 12:55:05 +0000 (12:55 +0000)]
Merge pull request #12405 from todortomov:3.4_cap_v4l_query_conrtols
Alexander Alekhin [Tue, 4 Sep 2018 11:38:34 +0000 (11:38 +0000)]
Merge pull request #12398 from alalek:samples_eliminate_cvconfig
Alexander Alekhin [Tue, 4 Sep 2018 11:29:23 +0000 (11:29 +0000)]
Merge pull request #12377 from alalek:inputarray_raw_wrapper_customtype
Todor Tomov [Tue, 4 Sep 2018 08:33:08 +0000 (11:33 +0300)]
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>
Alexander Alekhin [Mon, 3 Sep 2018 18:56:04 +0000 (18:56 +0000)]
samples: eliminate cvconfig.h usage
- don't use TBB in samples
Alexander Alekhin [Tue, 4 Sep 2018 06:39:20 +0000 (06:39 +0000)]
Merge pull request #12402 from alalek:fix_build_dnn_tests
Alexander Alekhin [Mon, 3 Sep 2018 23:11:25 +0000 (23:11 +0000)]
dnn: fix tests build with disabled OpenCL
Alexander Alekhin [Mon, 3 Sep 2018 20:57:11 +0000 (20:57 +0000)]
Merge pull request #12303 from cv3d:improvements/binding_python
Alexander Alekhin [Mon, 3 Sep 2018 20:20:02 +0000 (20:20 +0000)]
dnn: update "guard" inline namespace
- differ from 3.4 branch
Alexander Alekhin [Mon, 3 Sep 2018 20:26:14 +0000 (20:26 +0000)]
Merge pull request #12396 from LaurentBerger:I12392
Alexander Alekhin [Mon, 3 Sep 2018 20:25:45 +0000 (20:25 +0000)]
Merge pull request #12397 from terfendail:resize_wintr_fix
Alexander Alekhin [Sun, 2 Sep 2018 03:31:05 +0000 (03:31 +0000)]
CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement
Alexander Alekhin [Sun, 2 Sep 2018 01:04:31 +0000 (01:04 +0000)]
core: wrap custom types via _RawArray (raw() call)
- support passing of `std::vector<KeyPoint>` via InputArray
Vitaly Tuzov [Mon, 3 Sep 2018 16:57:11 +0000 (19:57 +0300)]
Fixed bit-exact resize wide intrinsics implementation for 16U
LaurentBerger [Mon, 3 Sep 2018 17:30:49 +0000 (19:30 +0200)]
Solves issue 12392
Alexander Alekhin [Mon, 3 Sep 2018 16:16:48 +0000 (16:16 +0000)]
Merge pull request #12393 from peterjozsa:issue_12301
Alexander Alekhin [Mon, 3 Sep 2018 15:39:42 +0000 (18:39 +0300)]
imgproc(GaussianBlur): restore processing order
Vadim Pisarevsky [Mon, 3 Sep 2018 14:30:16 +0000 (14:30 +0000)]
Merge pull request #12371 from alalek:issue_12366
yuki takehara [Mon, 3 Sep 2018 14:18:10 +0000 (23:18 +0900)]
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
Dmitry Kurtaev [Mon, 3 Sep 2018 14:08:40 +0000 (17:08 +0300)]
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
Peter Jozsa [Mon, 3 Sep 2018 12:56:38 +0000 (14:56 +0200)]
Fix https://github.com/opencv/opencv/issues/12301
Alexander Alekhin [Mon, 3 Sep 2018 10:17:56 +0000 (10:17 +0000)]
Merge pull request #12376 from alalek:issue_12337
Alexander Alekhin [Mon, 3 Sep 2018 10:17:09 +0000 (10:17 +0000)]
Merge pull request #12374 from alalek:issue_12368
Alexander Alekhin [Mon, 3 Sep 2018 10:16:51 +0000 (10:16 +0000)]
Merge pull request #12373 from alalek:issue_12365
Alexander Alekhin [Mon, 3 Sep 2018 09:33:00 +0000 (09:33 +0000)]
Merge pull request #12386 from wzw-intel:redundant_code
Wu Zhiwen [Mon, 3 Sep 2018 00:51:26 +0000 (08:51 +0800)]
dnn: Remove a duplicated code snippet for flatten layer
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
Alexander Alekhin [Sun, 2 Sep 2018 21:48:10 +0000 (21:48 +0000)]
cmake: drop unconditional forcing of CMAKE_SKIP_RPATH=TRUE
CMake "cache" entry for CMAKE_SKIP_RPATH is in the end of this file
Alexander Alekhin [Fri, 31 Aug 2018 14:28:27 +0000 (17:28 +0300)]
ts: support QEMU launcher
Alexander Alekhin [Sun, 2 Sep 2018 12:40:49 +0000 (12:40 +0000)]
ts: re-apply OpenCV-specific patch on googletest 1.8.1
cyy [Sun, 2 Sep 2018 13:34:43 +0000 (21:34 +0800)]
Merge pull request #12357 from DEEPIR:master
* fix some static analyzer warnings
* fix some static analyzer warnings
* fix race condition of workthread control
Alexander Alekhin [Sun, 2 Sep 2018 12:21:29 +0000 (12:21 +0000)]
ts: update Google Test 1.8.1
Helper script from googletest: ./scripts/fuse_gtest_files.py
Alexander Alekhin [Sun, 2 Sep 2018 12:07:15 +0000 (12:07 +0000)]
ts: restore Google Test 1.8.0 (capture OpenCV specific patch)
Alexander Alekhin [Sun, 2 Sep 2018 11:50:32 +0000 (11:50 +0000)]
Merge pull request #12379 from alalek:fix_warning_win32
Alexander Alekhin [Sun, 2 Sep 2018 09:53:41 +0000 (09:53 +0000)]
imgcodecs(webp): use safe cast to size_t on Win32
Alexander Alekhin [Sun, 2 Sep 2018 04:17:34 +0000 (04:17 +0000)]
Merge pull request #12372 from cv3d:fix/python_phantom
Alexander Alekhin [Sun, 2 Sep 2018 04:15:16 +0000 (04:15 +0000)]
Merge pull request #12362 from alalek:fix_js_headers
Hamdi Sahloul [Sat, 1 Sep 2018 14:56:40 +0000 (23:56 +0900)]
Improves a UMat unit test
Alexander Alekhin [Sat, 1 Sep 2018 14:31:15 +0000 (14:31 +0000)]
core: add solveLP type checks for output
to forbid Mat1f
Checks are not reliable: empty uninitialized `cv::Mat` has `CV_8UC1` type
Alexander Alekhin [Sat, 1 Sep 2018 13:18:08 +0000 (13:18 +0000)]
calib3d: use `Mat::reserveBuffer()` instead of `.create()`
to allocate memory >2Gb
Alexander Alekhin [Sat, 1 Sep 2018 12:25:10 +0000 (12:25 +0000)]
imgproc: small code refactoring (findContours -> l_cinfo)
Alexander Alekhin [Sat, 1 Sep 2018 12:38:57 +0000 (12:38 +0000)]
imgproc(segmentation): don't increase mask NULL pointer
Avoid manual address arithmetic
Hamdi Sahloul [Mon, 27 Aug 2018 19:39:24 +0000 (04:39 +0900)]
Support enum arguments for Java binding
Hamdi Sahloul [Mon, 27 Aug 2018 19:38:26 +0000 (04:38 +0900)]
Support enum arguments for Python binding
Hamdi Sahloul [Sun, 26 Aug 2018 09:38:07 +0000 (18:38 +0900)]
Support parsing C++11 `enum struct` and `enum class`
Alexander Alekhin [Fri, 31 Aug 2018 20:25:30 +0000 (20:25 +0000)]
Merge pull request #12180 from cv3d:cleanup/python_umat
Hamdi Sahloul [Fri, 24 Aug 2018 22:19:14 +0000 (07:19 +0900)]
Rewrite the UMat Python wrapper
Vadim Pisarevsky [Fri, 31 Aug 2018 14:57:14 +0000 (14:57 +0000)]
Merge pull request #12350 from dkurt:dnn_ie_caffe_faster_rcnn
Vlad Karpushin [Fri, 31 Aug 2018 14:41:22 +0000 (21:41 +0700)]
doc: add new tutorial motion deblur filter (#12215)
* doc: add new tutorial motion deblur filter
* Update motion_deblur_filter.markdown
a few minor changes
Vlad Karpushin [Fri, 31 Aug 2018 14:24:37 +0000 (21:24 +0700)]
doc: fix English gramma in tutorial out-of-focus-deblur filter (#12214)
* doc: fix English gramma in tutorial out-of-focus-deblur filter
* Update out_of_focus_deblur_filter.markdown
slightly modified one sentence
Peter Leitzen [Fri, 31 Aug 2018 14:09:40 +0000 (16:09 +0200)]
Use secure URLs in README (#12160)
Saves a redirect from HTTP -> HTTPS each.
[ci skip]
Vitaly Tuzov [Fri, 31 Aug 2018 14:05:00 +0000 (17:05 +0300)]
Bit-exact GaussianBlur reworked to use wide intrinsics (#12073)
* Bit-exact GaussianBlur reworked to use wide intrinsics
* Added v_mul_hi universal intrinsic
* Removed custom SSE2 branch from bit-exact GaussianBlur
* Removed loop unrolling for gaussianBlur horizontal smoothing
Vitaly Tuzov [Fri, 31 Aug 2018 13:54:05 +0000 (16:54 +0300)]
Bit-exact resize reworked to use wide intrinsics (#12038)
* Bit-exact resize reworked to use wide intrinsics
* Reworked bit-exact resize row data loading
* Added bit-exact resize row data loaders for SIMD256 and SIMD512
* Fixed type punned pointer dereferencing warning
* Reworked loading of source data for SIMD256 and SIMD512 bit-exact resize
Alexander Alekhin [Fri, 31 Aug 2018 13:27:56 +0000 (13:27 +0000)]
Merge pull request #12361 from alalek:fix_12359
Alexander Alekhin [Fri, 31 Aug 2018 13:27:14 +0000 (13:27 +0000)]
Merge pull request #12142 from alalek:dnn_ocl_fix_convolution_perf_tests
Jakub Golinowski [Fri, 31 Aug 2018 13:23:26 +0000 (15:23 +0200)]
Merge pull request #11897 from Jakub-Golinowski:hpx_backend
* Add HPX backend for OpenCV implementation
Adds hpx backend for cv::parallel_for_() calls respecting the nstripes chunking parameter. C++ code for the backend is added to modules/core/parallel.cpp. Also, the necessary changes to cmake files are introduced.
Backend can operate in 2 versions (selectable by cmake build option WITH_HPX_STARTSTOP): hpx (runtime always on) and hpx_startstop (start and stop the backend for each cv::parallel_for_() call)
* WIP: Conditionally include hpx_main.hpp to tests in core module
Header hpx_main.hpp is included to both core/perf/perf_main.cpp and core/test/test_main.cpp.
The changes to cmake files for linking hpx library to above mentioned test executalbles are proposed but have issues.
* Add coditional iclusion of hpx_main.hpp to cpp cpu modules
* Remove start/stop version of hpx backend
berak [Fri, 31 Aug 2018 13:07:53 +0000 (15:07 +0200)]
ml: fix adjusting K in KNearest (#12358)
Vadim Pisarevsky [Fri, 31 Aug 2018 13:03:10 +0000 (13:03 +0000)]
Merge pull request #12353 from alalek:imgcodecs_fix_webp
Vadim Pisarevsky [Fri, 31 Aug 2018 13:01:15 +0000 (13:01 +0000)]
Merge pull request #12348 from take1014:subdiv_getTriangleList_5788
Vadim Pisarevsky [Fri, 31 Aug 2018 12:58:25 +0000 (12:58 +0000)]
Merge pull request #12341 from terfendail:countnonzero_wintr
Dmitry Kurtaev [Fri, 31 Aug 2018 12:41:56 +0000 (15:41 +0300)]
Include preprocessing nodes to object detection TensorFlow networks (#12211)
* Include preprocessing nodes to object detection TensorFlow networks
* Enable more fusion
* faster_rcnn_resnet50_coco_2018_01_28 test
Alexander Alekhin [Fri, 31 Aug 2018 12:16:50 +0000 (12:16 +0000)]
Merge pull request #12360 from alalek:issue_12356
Alexander Alekhin [Thu, 30 Aug 2018 14:53:41 +0000 (17:53 +0300)]
dnn(test): use dnnBackendsAndTargets() param generator
Alexander Alekhin [Thu, 2 Aug 2018 14:59:45 +0000 (17:59 +0300)]
dnn(perf): fix and merge Convolution tests
- OpenCL tests didn't run any OpenCL kernels
- use real configuration from existed models (the first 100 cases)
- batch size = 1
Alexander Alekhin [Fri, 31 Aug 2018 11:48:44 +0000 (14:48 +0300)]
js: use generated list of OpenCV headers
- replaces hand-written list
Alexander Alekhin [Fri, 31 Aug 2018 11:26:36 +0000 (14:26 +0300)]
build: fix js build (make video->calib3d dependency optional)
- estimateRigidTransform() is excluded from JS bindings
Alexander Alekhin [Fri, 31 Aug 2018 09:56:02 +0000 (12:56 +0300)]
imgcodecs: add null pointer check
Hamdi Sahloul [Sat, 25 Aug 2018 05:15:50 +0000 (14:15 +0900)]
Support non-static phantom methods for binding generator
Hamdi Sahloul [Fri, 24 Aug 2018 22:18:33 +0000 (07:18 +0900)]
Enable the binding generator to parse shadow files
Alexander Alekhin [Thu, 30 Aug 2018 19:12:01 +0000 (19:12 +0000)]
imgcodecs(webp): multiple fixes
- don't reallocate passed 'img' (test fixed - must use IMREAD_UNCHANGED / IMREAD_ANYCOLOR)
- avoid memory DDOS
- avoid reading of whole file during header processing
- avoid data access after allocated buffer during header processing (missing checks)
- use WebPFree() to free allocated buffers (libwebp >= 0.5.0)
- drop unused & undefined `.close()` method
- added checks for channels >= 5 in encoder
Alexander Alekhin [Thu, 30 Aug 2018 20:29:42 +0000 (20:29 +0000)]
Merge pull request #12189 from alalek:ippa_cleanup_3.4
Alexander Alekhin [Thu, 30 Aug 2018 20:23:37 +0000 (20:23 +0000)]
Merge pull request #12234 from cv3d:python/cuda/wrapping_functionalities
Alexander Alekhin [Thu, 30 Aug 2018 18:10:01 +0000 (21:10 +0300)]
Merge pull request #12351 from NobuoTsukamoto:3.4
Vitaly Tuzov [Wed, 29 Aug 2018 17:31:15 +0000 (20:31 +0300)]
countNonZero function reworked to use wide universal intrinsics instead of SSE2 intrinsics
take1014 [Thu, 30 Aug 2018 15:59:00 +0000 (00:59 +0900)]
resolve #5788
Alexander Alekhin [Thu, 30 Aug 2018 15:53:07 +0000 (18:53 +0300)]
cleanup: IPP Async (IPP_A)
except header file with conversion routines (will be removed in OpenCV 4.0)