Skip to content

Merge 3.4#16327

Merged
alalek merged 16 commits intoopencv:masterfrom
alalek:merge-3.4
Jan 12, 2020
Merged

Merge 3.4#16327
alalek merged 16 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jan 12, 2020

#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

force_builders=Custom
buildworker:Custom=linux-1
build_image:Custom=simd-emulator

alalek and others added 16 commits December 26, 2019 00:02
- 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
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jan 12, 2020

👍

@alalek alalek merged commit fb61f88 into opencv:master Jan 12, 2020
@alalek alalek mentioned this pull request Jan 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants