Merge branch 4.x

modules/python/src2/typing_stubs_generation/api_refinement.py

@@ -340,6 +340,7 @@ NODES_TO_REFINE = {
     SymbolName(("cv", ), (), "resize"): make_optional_arg("dsize"),
     SymbolName(("cv", ), (), "calcHist"): make_optional_arg("mask"),
     SymbolName(("cv", ), (), "floodFill"): make_optional_arg("mask"),
+    SymbolName(("cv", ), ("Feature2D", ), "detectAndCompute"): make_optional_arg("mask"),
     SymbolName(("cv", ), (), "imread"): make_optional_none_return,
     SymbolName(("cv", ), (), "imdecode"): make_optional_none_return,
 }

modules/python/src2/typing_stubs_generation/predefined_types.py

@@ -265,6 +265,7 @@ _PREDEFINED_TYPES = (
         export_name="ExtractMetaCallback",
         required_modules=("gapi",)
     ),
+    PrimitiveTypeNode("NativeByteArray", "bytes"),
 )
 
 PREDEFINED_TYPES = dict(