Merged
Conversation
misused 'optional' mode
Removed constants from legacy C api and switched out header with shorter version. Removed blank line that was failing CI.
* Support Eltwise3d * Refactoring * Fix test
requires CMake 3.14+
* tensorflow support mirror pad * revert macro define * revert macro define * reduce code duplication * revert macro define
…llPoly_and_fillConvexPoly_js_binding
- ReadProtoFromTextFile - ReadProtoFromTextBuffer
Old flag resulted in software implementation being selected when the Intel decoder is not the primary adapter.
…s-and-4376 Keep a local copy of `features` from `flann::GenericIndex ` constructor (opencv#14898) * Fix warnings on Windows * Fix opencv#4376
* dnn: fix BNLLLayer implementation details: https://github.com/BVLC/caffe/blame/1.0/src/caffe/layers/bnll_layer.cpp#L17 * dnn: enable OCV/OpenCL BNLL layer
This was referenced Jun 26, 2019
Member
Author
|
👍 |
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.
#13252 from take1014:filter2d_13179
#14305 from cameron-martin:calib3d-js
#14775 from cudawarped:master
#14814 from alalek:dnn_skip_test_tags
#14833 from l-bat:ocv_eltwise3d
#14845 from vonchenplus:ocv_mirrorpad
#14847 from alalek:dnn_fix_test_data_searching
#14849 from thangktran:thangktran/feature/fillPoly_and_fillConvexPoly_js_binding
#14864 from dkurt:fix_js_face_recognition
#14869 from alalek:samples_msvs2019_support
#14875 from Legoless:master
#14876 from dkurt:fix_js_face_recognition_v2
#14886 from alalek:fix_grabcut_kmeans_call_14879
#14889 from alalek:issue_14863
#14890 from alalek:dnn_consistent_protobuf_readers
#14895 from alalek:dnn_ie_extensions_path
#14898 from UnderscoreAsterisk:flann-warnings-and-4376
#14899 from alalek:dnn_fix_bnll_layer
#14900 from dkurt:dnn_fix_js_sample_v3
Previous "Merge 3.4": #14857