Merge 3.4 #11515
Merged
Merge 3.4 #11515
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
__ridx__ is an _undefined name_ in this context but __self.ridx__ is used three other times in this method and nine times in this class. Undefined names may raise [NameError](https://docs.python.org/3/library/exceptions.html#NameError) at runtime. flake8 testing of https://github.com/opencv/opencv $ __flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics__ ``` ./modules/ts/misc/table_formatter.py:50:23: F821 undefined name 'ridx' self.rows[ridx + 1].props = properties ^ ```
Fix publication date of "Computer Vision Face Tracking for Use in a Perceptual User Interface" from 1988 to 1998.
Repo: https://github.com/libjpeg-turbo/libjpeg-turbo.git Tag: 1.5.3 excluded libjpeg-turbo files: - bmp.c - bmp.h - cderror.h - cdjpeg.c - cdjpeg.h - cjpeg.c - djpeg.c - example.c - jcstest.c - jdatadst-tj.c - jdatasrc-tj.c - jpegtran.c - rdbmp.c - rdcolmap.c - rdgif.c - rdjpgcom.c - rdppm.c - rdrle.c - rdswitch.c - rdtarga.c - tjbench.c - tjunittest.c - tjutil.c - tjutil.h - transupp.c - transupp.h - turbojpeg-jni.c - turbojpeg.c - turbojpeg.h - wrbmp.c - wrgif.c - wrjpgcom.c - wrppm.c - wrrle.c - wrtarga.c
…with matrix transpose.
|
👍 |
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.
#11442 from cclauss:print-function
#11443 from cclauss:fix-Python-string-format
#11444 from cclauss:patch-2
#11445 from cclauss:file-long-raw_input-xrange
#11459 from dkurt:dnn_mobilenet_v2
#11461 from dkurt:dnn_reduce_mem_consumption
#11497 from alalek:libjpeg-turbo
#11498 from matech96:camshift_publication_date
#11502 from berak:fix_knearest
#11504 from alalek:check_flake8
#11506 from catree:tutorial_euler_angles_doc
Previous "Merge 3.4": #11495