Merged
Conversation
* jas_stream: Add definition for L_tmpnam if missing uClibc-ng for some reason does not provide a definition when some deprecated APIs are disabled. Value taken from the musl libc. * 3rdparty: move uClibc-ng workaround into config file
* fix broken code link resolves opencv#15344 * Update stitcher.markdown * update 3.4 link
The deprecated flag ENABLE_VSX should not be used to enable this feature. Instead, use the baseline cpu feature set to determine.
* Add debug build option to MacOs and iOS build scripts * osx: allow selection of MACOSX_DEPLOYMENT_TARGET * Add --debug_info flag to iOS and macOS builds for building with debug info
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
12 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.
#15279 from neheb:patch-1
#15303 from dkurt:fix_15296
#15316 from sturkmen72:update_seamless_cloning_cpp
#15329 from craterkamath:fixTypoCamshift
#15335 from lixit:master
#15345 from prakhar9998:patch-1
#15350 from komakai:apple-debug-build
#15353 from alalek:cmake_check_atomic
#15365 from Zyrin:3.4
#15368 from dab0bby:patch-2
#15370 from alalek:core_fastmath_hpp_update
#15372 from alalek:core_stat_fix_intrin
#15373 from pmur:libpng-vsx-fix
#15376 from ilya-lavrenov:detect_openvino
#15380 from alalek:fix_build_icc
#15382 from alalek:fix_15287
#15383 from alalek:fix_15379
Previous "Merge 3.4": #15323