potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-28 23:03:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2025-07-17 18:23:51 +03:00
parent 06a78c2390 4813d1cd32
commit bd67770dcb
140 changed files with 2891 additions and 1208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/python/src2/hdr_parser.py
+6 -2
View File
@@ -99,7 +99,8 @@ def evaluate_conditional_inclusion_directive(directive, preprocessor_definitions
...
ValueError: Failed to evaluate '#if strangedefinedvar' directive, stripped down to 'strangedefinedvar'
"""
OPERATORS = { "!": "not ", "&&": "and", "&": "and", "||": "or", "|": "or" }
OPERATORS1 = {"&&": "and", "||": "or"}
OPERATORS2 = { "!": "not ", "&": "and", "|": "or" }
input_directive = directive
@@ -136,7 +137,10 @@ def evaluate_conditional_inclusion_directive(directive, preprocessor_definitions
directive
)
for src_op, dst_op in OPERATORS.items():
for src_op, dst_op in OPERATORS1.items():
directive = directive.replace(src_op, dst_op)
for src_op, dst_op in OPERATORS2.items():
directive = directive.replace(src_op, dst_op)
try: