diff --git a/modules/aruco/CMakeLists.txt b/modules/aruco/CMakeLists.txt index 568a10a16..d3c7eaa66 100644 --- a/modules/aruco/CMakeLists.txt +++ b/modules/aruco/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "ArUco Marker Detection") -ocv_define_module(aruco opencv_core opencv_imgproc opencv_calib3d WRAP python java) +ocv_define_module(aruco opencv_core opencv_imgproc opencv_calib3d WRAP python java objc) diff --git a/modules/aruco/misc/objc/gen_dict.json b/modules/aruco/misc/objc/gen_dict.json new file mode 100644 index 000000000..15b22ed2c --- /dev/null +++ b/modules/aruco/misc/objc/gen_dict.json @@ -0,0 +1,7 @@ +{ + "AdditionalImports" : { + "*" : [ "\"aruco.hpp\"" ], + "CharucoBoard" : [ "\"aruco/charuco.hpp\"" ], + "Dictionary" : [ "\"aruco/dictionary.hpp\"" ] + } +} diff --git a/modules/bgsegm/CMakeLists.txt b/modules/bgsegm/CMakeLists.txt index 74ce51ff4..692f796c5 100644 --- a/modules/bgsegm/CMakeLists.txt +++ b/modules/bgsegm/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Background Segmentation Algorithms") -ocv_define_module(bgsegm opencv_core opencv_imgproc opencv_video opencv_calib3d WRAP python java) +ocv_define_module(bgsegm opencv_core opencv_imgproc opencv_video opencv_calib3d WRAP python java objc) diff --git a/modules/bgsegm/misc/objc/gen_dict.json b/modules/bgsegm/misc/objc/gen_dict.json new file mode 100644 index 000000000..07becc8ec --- /dev/null +++ b/modules/bgsegm/misc/objc/gen_dict.json @@ -0,0 +1,11 @@ +{ + "AdditionalImports" : { + "*" : [ "\"bgsegm.hpp\"" ] + }, + "func_arg_fix" : { + "Bgsegm" : { + "createBackgroundSubtractorGSOC" : { "mc" : {"ctype" : "LSBPCameraMotionCompensation"} }, + "createBackgroundSubtractorLSBP" : { "mc" : {"ctype" : "LSBPCameraMotionCompensation"} } + } + } +} diff --git a/modules/bioinspired/CMakeLists.txt b/modules/bioinspired/CMakeLists.txt index b0599a671..99575bcd8 100644 --- a/modules/bioinspired/CMakeLists.txt +++ b/modules/bioinspired/CMakeLists.txt @@ -1,3 +1,3 @@ set(the_description "Biologically inspired algorithms") ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) -ocv_define_module(bioinspired opencv_core OPTIONAL opencv_highgui WRAP java python) +ocv_define_module(bioinspired opencv_core OPTIONAL opencv_highgui WRAP java objc python) diff --git a/modules/bioinspired/misc/objc/gen_dict.json b/modules/bioinspired/misc/objc/gen_dict.json new file mode 100644 index 000000000..94cd6b56c --- /dev/null +++ b/modules/bioinspired/misc/objc/gen_dict.json @@ -0,0 +1,5 @@ +{ + "AdditionalImports" : { + "*" : [ "\"bioinspired.hpp\"" ] + } +} diff --git a/modules/face/CMakeLists.txt b/modules/face/CMakeLists.txt index ce3d88874..4616515fa 100644 --- a/modules/face/CMakeLists.txt +++ b/modules/face/CMakeLists.txt @@ -4,7 +4,7 @@ ocv_define_module(face opencv_core opencv_objdetect opencv_calib3d # estimateAffinePartial2D() (trainFacemark) opencv_photo # seamlessClone() (face_swap sample) - WRAP python java + WRAP python java objc ) # NOTE: objdetect module is needed for one of the samples diff --git a/modules/face/misc/objc/gen_dict.json b/modules/face/misc/objc/gen_dict.json new file mode 100644 index 000000000..f9c3e3f5b --- /dev/null +++ b/modules/face/misc/objc/gen_dict.json @@ -0,0 +1,6 @@ +{ + "AdditionalImports" : { + "*" : [ "\"face.hpp\"" ], + "BIF" : [ "\"face/bif.hpp\"" ] + } +} diff --git a/modules/img_hash/CMakeLists.txt b/modules/img_hash/CMakeLists.txt index 3231b3a9f..fe75c22cd 100644 --- a/modules/img_hash/CMakeLists.txt +++ b/modules/img_hash/CMakeLists.txt @@ -1,3 +1,3 @@ set(the_description "Image hash algorithms") set(OPENCV_MODULE_IS_PART_OF_WORLD OFF) -ocv_define_module(img_hash opencv_imgproc opencv_core WRAP python java) +ocv_define_module(img_hash opencv_imgproc opencv_core WRAP python java objc) diff --git a/modules/img_hash/misc/objc/gen_dict.json b/modules/img_hash/misc/objc/gen_dict.json new file mode 100644 index 000000000..98a57ed59 --- /dev/null +++ b/modules/img_hash/misc/objc/gen_dict.json @@ -0,0 +1,11 @@ +{ + "AdditionalImports" : { + "*" : [ "\"img_hash.hpp\"" ] + }, + "func_arg_fix" : { + "BlockMeanHash" : { + "create" : { "mode" : {"ctype" : "BlockMeanHashMode"} }, + "setMode" : { "mode" : {"ctype" : "BlockMeanHashMode"} } + } + } +} diff --git a/modules/phase_unwrapping/CMakeLists.txt b/modules/phase_unwrapping/CMakeLists.txt index 906e86afb..96b8219cc 100644 --- a/modules/phase_unwrapping/CMakeLists.txt +++ b/modules/phase_unwrapping/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Phase Unwrapping API") -ocv_define_module(phase_unwrapping opencv_core opencv_imgproc WRAP python java) +ocv_define_module(phase_unwrapping opencv_core opencv_imgproc WRAP python java objc) diff --git a/modules/phase_unwrapping/misc/objc/gen_dict.json b/modules/phase_unwrapping/misc/objc/gen_dict.json new file mode 100644 index 000000000..0508ba0ce --- /dev/null +++ b/modules/phase_unwrapping/misc/objc/gen_dict.json @@ -0,0 +1,6 @@ +{ + "AdditionalImports" : { + "*" : [ "\"phase_unwrapping.hpp\"" ], + "HistogramPhaseUnwrapping" : [ "\"phase_unwrapping/histogramphaseunwrapping.hpp\"" ] + } +} diff --git a/modules/plot/CMakeLists.txt b/modules/plot/CMakeLists.txt index db5ff1f1d..118254f75 100644 --- a/modules/plot/CMakeLists.txt +++ b/modules/plot/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Plot function for Mat data.") -ocv_define_module(plot opencv_core opencv_imgproc WRAP python java) +ocv_define_module(plot opencv_core opencv_imgproc WRAP python java objc) diff --git a/modules/plot/misc/objc/gen_dict.json b/modules/plot/misc/objc/gen_dict.json new file mode 100644 index 000000000..3f83ca48c --- /dev/null +++ b/modules/plot/misc/objc/gen_dict.json @@ -0,0 +1,5 @@ +{ + "AdditionalImports" : { + "*" : [ "\"plot.hpp\"" ] + } +} diff --git a/modules/structured_light/CMakeLists.txt b/modules/structured_light/CMakeLists.txt index ca06f1aee..d6ec6098f 100644 --- a/modules/structured_light/CMakeLists.txt +++ b/modules/structured_light/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Structured Light API") -ocv_define_module(structured_light opencv_core opencv_imgproc opencv_calib3d opencv_phase_unwrapping OPTIONAL opencv_viz WRAP python java) +ocv_define_module(structured_light opencv_core opencv_imgproc opencv_calib3d opencv_phase_unwrapping OPTIONAL opencv_viz WRAP python java objc) diff --git a/modules/structured_light/misc/objc/gen_dict.json b/modules/structured_light/misc/objc/gen_dict.json new file mode 100644 index 000000000..f57779267 --- /dev/null +++ b/modules/structured_light/misc/objc/gen_dict.json @@ -0,0 +1,5 @@ +{ + "AdditionalImports" : { + "*" : [ "\"structured_light.hpp\"" ] + } +} diff --git a/modules/text/CMakeLists.txt b/modules/text/CMakeLists.txt index 73bf6a2f8..0fe7e6fb2 100644 --- a/modules/text/CMakeLists.txt +++ b/modules/text/CMakeLists.txt @@ -10,6 +10,7 @@ ocv_define_module(text WRAP python java + objc ) if(TARGET ocv.3rdparty.tesseract) diff --git a/modules/text/misc/objc/gen_dict.json b/modules/text/misc/objc/gen_dict.json new file mode 100644 index 000000000..e33c6bdcb --- /dev/null +++ b/modules/text/misc/objc/gen_dict.json @@ -0,0 +1,28 @@ +{ + "AdditionalImports" : { + "*" : [ "\"text.hpp\"" ] + }, + "func_arg_fix" : { + "Text" : { + "detectRegions" : { "method" : {"ctype" : "erGrouping_Modes"} }, + "erGrouping" : { "method" : {"ctype" : "erGrouping_Modes"} }, + "loadOCRHMMClassifier" : { "classifier" : {"ctype" : "classifier_type"} }, + "(ERFilter*)createERFilterNM1:(NSString*)filename thresholdDelta:(int)thresholdDelta minArea:(float)minArea maxArea:(float)maxArea minProbability:(float)minProbability nonMaxSuppression:(BOOL)nonMaxSuppression minProbabilityDiff:(float)minProbabilityDiff" : { "createERFilterNM1" : {"name" : "createERFilterNM1FromFile"} }, + "(ERFilter*)createERFilterNM2:(NSString*)filename minProbability:(float)minProbability" : { "createERFilterNM2" : {"name" : "createERFilterNM2FromFile"} } + }, + "OCRBeamSearchDecoder" : { + "(OCRBeamSearchDecoder*)create:(NSString*)filename vocabulary:(NSString*)vocabulary transition_probabilities_table:(Mat*)transition_probabilities_table emission_probabilities_table:(Mat*)emission_probabilities_table mode:(decoder_mode)mode beam_size:(int)beam_size" : { "create" : {"name" : "createFromFile"} }, + "create" : { "mode" : {"ctype" : "decoder_mode", + "defval" : "" + } } + }, + "OCRHMMDecoder" : { + "(OCRHMMDecoder*)create:(NSString*)filename vocabulary:(NSString*)vocabulary transition_probabilities_table:(Mat*)transition_probabilities_table emission_probabilities_table:(Mat*)emission_probabilities_table mode:(decoder_mode)mode classifier:(int)classifier" : { "create" : {"name" : "createFromFile"} }, + "create" : { "mode" : {"ctype" : "decoder_mode"} } + }, + "OCRTesseract" : { + "create" : { "oem" : {"ctype" : "ocr_engine_mode"}, + "psmode" : {"ctype" : "page_seg_mode"} } + } + } +} diff --git a/modules/tracking/CMakeLists.txt b/modules/tracking/CMakeLists.txt index 6fa88af29..055a0593e 100644 --- a/modules/tracking/CMakeLists.txt +++ b/modules/tracking/CMakeLists.txt @@ -1,3 +1,3 @@ set(the_description "Tracking API") -ocv_define_module(tracking opencv_imgproc opencv_core opencv_video opencv_plot OPTIONAL opencv_dnn opencv_datasets WRAP java python) +ocv_define_module(tracking opencv_imgproc opencv_core opencv_video opencv_plot OPTIONAL opencv_dnn opencv_datasets WRAP java python objc) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-shadow /wd4458) diff --git a/modules/tracking/misc/objc/gen_dict.json b/modules/tracking/misc/objc/gen_dict.json new file mode 100644 index 000000000..6cefc5f55 --- /dev/null +++ b/modules/tracking/misc/objc/gen_dict.json @@ -0,0 +1,8 @@ +{ + "const_fix" : { + "TrackerKCF" : { "MODE": { "CUSTOM": "MODE_CUSTOM" } } + }, + "AdditionalImports" : { + "*" : [ "\"tracking.hpp\"" ] + } +} diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt index f1b0fd2fc..b6663eda9 100644 --- a/modules/xfeatures2d/CMakeLists.txt +++ b/modules/xfeatures2d/CMakeLists.txt @@ -3,7 +3,7 @@ set(the_description "Contributed/Experimental Algorithms for Salient 2D Features if(HAVE_CUDA) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) endif() -ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_shape opencv_ml opencv_cudaarithm WRAP python java) +ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_shape opencv_ml opencv_cudaarithm WRAP python java objc) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake) diff --git a/modules/xfeatures2d/misc/objc/gen_dict.json b/modules/xfeatures2d/misc/objc/gen_dict.json new file mode 100644 index 000000000..cd0be0a96 --- /dev/null +++ b/modules/xfeatures2d/misc/objc/gen_dict.json @@ -0,0 +1,20 @@ +{ + "class_ignore_list" : [ + "SURF_CUDA" + ], + "const_fix" : { + "PCTSignatures" : { "SimilarityFunction": { "GAUSSIAN": "SIMFUN_GAUSSIAN" } } + }, + "AdditionalImports" : { + "*" : [ "\"xfeatures2d.hpp\"" ] + }, + "func_arg_fix" : { + "DAISY" : { + "create" : { "norm" : { "ctype" : "NormalizationType", + "defval" : "cv::xfeatures2d::DAISY::NRM_NONE"} } + }, + "PCTSignatures" : { + "(PCTSignatures*)create:(NSArray*)initSamplingPoints initSeedCount:(int)initSeedCount" : { "create" : {"name" : "create2"} } + } + } +} diff --git a/modules/ximgproc/CMakeLists.txt b/modules/ximgproc/CMakeLists.txt index cff0191b4..58f9f257f 100644 --- a/modules/ximgproc/CMakeLists.txt +++ b/modules/ximgproc/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Extended image processing module. It includes edge-aware filters and etc.") -ocv_define_module(ximgproc opencv_core opencv_imgproc opencv_calib3d opencv_imgcodecs opencv_video WRAP python java) +ocv_define_module(ximgproc opencv_core opencv_imgproc opencv_calib3d opencv_imgcodecs opencv_video WRAP python java objc) diff --git a/modules/ximgproc/misc/objc/gen_dict.json b/modules/ximgproc/misc/objc/gen_dict.json new file mode 100644 index 000000000..5ae07b20b --- /dev/null +++ b/modules/ximgproc/misc/objc/gen_dict.json @@ -0,0 +1,28 @@ +{ + "AdditionalImports" : { + "*" : [ "\"ximgproc.hpp\"" ] + }, + "missing_consts" : { + "Ximgproc" : { + "private" : [], + "public" : [ + ["RO_IGNORE_BORDERS", 1], ["RO_STRICT", 0] + ] + } + }, + "func_arg_fix" : { + "Ximgproc" : { + "niBlackThreshold" : { "binarizationMethod" : {"ctype" : "LocalBinarizationMethods"} }, + "HoughPoint2Line" : { "angleRange" : {"ctype" : "AngleRangeOption"}, + "makeSkew" : {"ctype" : "HoughDeskewOption"} }, + "weightedMedianFilter" : { "weightType" : {"ctype" : "WMFWeightType"} }, + "createDTFilter" : { "mode" : {"ctype" : "EdgeAwareFiltersList"} }, + "dtFilter" : { "mode" : {"ctype" : "EdgeAwareFiltersList"} }, + "thinning" : { "thinningType" : {"ctype" : "ThinningTypes"} }, + "FastHoughTransform" : { "angleRange" : {"ctype" : "AngleRangeOption"}, + "makeSkew" : {"ctype" : "HoughDeskewOption"}, + "op" : {"ctype" : "HoughOp"} }, + "createSuperpixelSLIC" : { "algorithm" : {"ctype" : "SLICType"} } + } + } +} diff --git a/modules/xphoto/CMakeLists.txt b/modules/xphoto/CMakeLists.txt index a05848d38..b456ce38f 100644 --- a/modules/xphoto/CMakeLists.txt +++ b/modules/xphoto/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Addon to basic photo module") -ocv_define_module(xphoto opencv_core opencv_imgproc opencv_photo WRAP python java) +ocv_define_module(xphoto opencv_core opencv_imgproc opencv_photo WRAP python java objc) diff --git a/modules/xphoto/misc/objc/gen_dict.json b/modules/xphoto/misc/objc/gen_dict.json new file mode 100644 index 000000000..1b9e54a40 --- /dev/null +++ b/modules/xphoto/misc/objc/gen_dict.json @@ -0,0 +1,5 @@ +{ + "AdditionalImports" : { + "*" : [ "\"xphoto.hpp\"" ] + } +}