Merged
Conversation
- some of `icvCvt_BGR*` functions have R with B channels swapped what leads to the wrong conversion - renames misleading `rgb` variable name to `bgr` - swap back the conversion coefficients, `cB` should be the first Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
When building OpenCV as a sub-project using cmake's add_subdirectory() the OpenCV's build options would be overwritten to its default state. With cmake 3.13+ the CMP0077 policy, option() honors previous definitions via set().
* Changed plus operator to os.path.join() * Remove '/' from PATH
* core: fix intrin_cpp, allow to build modules with SIMD emulator * core(arithm): fix v_zero initialization * core(simd): 'strict' types for binary/bitwise operations * features2d: avoid aligned load issue in GCC 5.4 with emulated SIMD * core(simd): alignment checks in SIMD emulator
Python code examples for file IO in xml and yml format * Initial "Pythonization" of file_input_output.cpp * Moved file_input_output.py to correct location * Nearly done Pythonizing file_input_output.cpp * Python equivalent of file_input_output.py created * Started Pythonizing camera_calibration.cpp * Completed Python tutorial/sample code for file_input_output * Resolved whitespace issues * Removed tabs in file_input_output.cpp * Patched import order and wrapped code in main function * Changed string to docstring format in help file * Updated link to Python example code
* Added java code for meanshift and optical_flow * added java code for module video * added appropriate spaces in codes * converted absolute path to command line arguments * added spaces at appropriate places
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
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.
#14666 from ihsan314:file_io_xml_yml
#16236 from alalek:fix_core_simd_emulator
#16238 from alalek:imgproc_resize_fix_types
#16240 from olramde:olramde
#16265 from JanuszL:fix_bgr
#16270 from dkurt:dnn_sort_tf_text_graphs
#16276 from themechanicalcoder:video-tutorial
#16289 from Nuzhny007:3.4
#16300 from Palmitoxico:cmake-cmp0077
Previous "Merge 3.4": #16271