third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21227 from sbwilson:fix_framework_unicode_headers

Browse Source 
* fix unicode errors for framework headers

This would crash if the header file included non-ASCII characters. This change ensures that headers are read and written as UTF-8 encoded files instead of ascii.

* Adds spaces after commas
This commit is contained in:
Simon Wilson 2021-12-10 22:36:14 +11:00 committed by GitHub
parent 7ba56a4b88
commit c08954c18b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platforms/ios/build_framework.py
View File

@ -406,11 +406,11 @@ class Builder:
for dirname, dirs, files in os.walk(os.path.join(dstdir, "Headers")): for dirname, dirs, files in os.walk(os.path.join(dstdir, "Headers")):
for filename in files: for filename in files:
filepath = os.path.join(dirname, filename) filepath = os.path.join(dirname, filename)
with open(filepath) as file: with codecs.open(filepath, "r", "utf-8") as file:
body = file.read() body = file.read()
body = body.replace("include \"opencv2/", "include \"" + name + "/") body = body.replace("include \"opencv2/", "include \"" + name + "/")
body = body.replace("include <opencv2/", "include <" + name + "/") body = body.replace("include <opencv2/", "include <" + name + "/")
with open(filepath, "w") as file: with codecs.open(filepath, "w", "utf-8") as file:
file.write(body) file.write(body)
if self.build_objc_wrapper: if self.build_objc_wrapper:
copy_tree(os.path.join(builddirs[0], "install", "lib", name + ".framework", "Headers"), os.path.join(dstdir, "Headers")) copy_tree(os.path.join(builddirs[0], "install", "lib", name + ".framework", "Headers"), os.path.join(dstdir, "Headers"))