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

Merge branch 4.x

Browse Source
This commit is contained in:
OpenCV Developers
2022-04-23 21:42:17 +00:00
parent 3d12581798 767857c516
commit 0fbd58bef9
324 changed files with 34982 additions and 9803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/misc/objc/gen_dict.json
+20
View File
@@ -78,6 +78,26 @@
"(void)divide:(double)scale src2:(Mat*)src2 dst:(Mat*)dst dtype:(int)dtype" : { "src2" : {"name" : "src"} }
}
},
"header_fix" : {
"Core": {
"pow" : {
"prolog" : "#pragma push_macro(\"pow\")\n#undef pow",
"epilog" : "#pragma pop_macro(\"pow\")"
},
"sqrt" : {
"prolog" : "#pragma push_macro(\"sqrt\")\n#undef sqrt",
"epilog" : "#pragma pop_macro(\"sqrt\")"
},
"exp" : {
"prolog" : "#pragma push_macro(\"exp\")\n#undef exp",
"epilog" : "#pragma pop_macro(\"exp\")"
},
"log" : {
"prolog" : "#pragma push_macro(\"log\")\n#undef log",
"epilog" : "#pragma pop_macro(\"log\")"
}
}
},
"type_dict" : {
"Algorithm": {
"objc_type": "Algorithm*"