Merge 3.4 #12412
Merged
Merge 3.4 #12412
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
resolves opencv#12307
- The size of second channel should be size[2] of output tensor,
- The Scalar should be {variance[0], variance[0], variance[0], variance[0]}
for _variance.size() == 1 case.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* Added a mall note describing BUILD_opencv_world cmake option to the Installation in Windows tutorial. * Made slight changes in BUILD_opencv_world documentation. * Update windows_install.markdown improved grammar
except header file with conversion routines (will be removed in OpenCV 4.0)
…ad of SSE2 intrinsics
- 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
- replaces hand-written list
- OpenCL tests didn't run any OpenCL kernels - use real configuration from existed models (the first 100 cases) - batch size = 1
…pencv#12211) * Include preprocessing nodes to object detection TensorFlow networks * Enable more fusion * faster_rcnn_resnet50_coco_2018_01_28 test
* 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
- support passing of `std::vector<KeyPoint>` via InputArray
- don't use TBB in samples
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>
|
👍 |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
e345cb0 Bit-exact resize reworked to use wide intrinsics (#12038)
0f2b535 Bit-exact GaussianBlur reworked to use wide intrinsics (#12073)
#12142 from alalek:dnn_ocl_fix_convolution_perf_tests
c7cf8fb Import SSDs from TensorFlow by training config (#12188)
#12189 from alalek:ippa_cleanup_3.4
50bceea Include preprocessing nodes to object detection TensorFlow networks (#12211)
f36790d doc: fix English gramma in tutorial out-of-focus-deblur filter (#12214)
7d3a165 doc: add new tutorial motion deblur filter (#12215)
cb7ee27 Fix bug in distanceTransform (#12278)
#12314 from sturkmen72:patch-2
#12327 from take1014:distanceTransform_type
8ef2d19 Adds a small note describing BUILD_opencv_world (#12332)
#12333 from wzw-intel:prior_box
#12336 from dkurt:dnn_ie_fix_net_lifetime
#12341 from terfendail:countnonzero_wintr
#12345 from berak:fix_java_list_string
#12346 from mshabunin:test-data-check
#12348 from take1014:subdiv_getTriangleList_5788
#12350 from dkurt:dnn_ie_caffe_faster_rcnn
#12351 from NobuoTsukamoto:3.4
#12353 from alalek:imgcodecs_fix_webp
e13f6de ml: fix adjusting K in KNearest (#12358)
#12360 from alalek:issue_12356
#12362 from alalek:fix_js_headers
#12371 from alalek:issue_12366
#12373 from alalek:issue_12365
#12374 from alalek:issue_12368
#12376 from alalek:issue_12337
#12377 from alalek:inputarray_raw_wrapper_customtype
#12379 from alalek:fix_warning_win32
#12382 from alalek:update_gtest_1.8.1
#12383 from alalek:ts_qemu_support
#12386 from wzw-intel:redundant_code
#12393 from peterjozsa:issue_12301
#12394 from alalek:imgproc_GaussianBlur_allow_HAL_8U
#12396 from LaurentBerger:I12392
#12397 from terfendail:resize_wintr_fix
#12398 from alalek:samples_eliminate_cvconfig
#12402 from alalek:fix_build_dnn_tests
#12405 from todortomov:3.4_cap_v4l_query_conrtols
-12406 from alalek:backport_12357_12391
#12409 from dkurt:fix_12407
Previous "Merge 3.4": #12339