opencv
diff --git a/‎.gitignore
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎.gitignore
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎CMakeLists.txt
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎CMakeLists.txt
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎cmake/OpenCVGenConfig.cmake
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎cmake/OpenCVGenConfig.cmake
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎cmake/OpenCVModule.cmake
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎cmake/OpenCVModule.cmake
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎modules/calib3d/CMakeLists.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎modules/calib3d/CMakeLists.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎modules/calib3d/misc/objc/gen_dict.json
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎modules/calib3d/misc/objc/gen_dict.json
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
@@ -24,3 +24,4 @@ bin/
 build
 node_modules
 CMakeSettings.json
+xcuserdata/
@@ -452,6 +452,7 @@ OCV_OPTION(BUILD_FAT_JAVA_LIB       "Create Java wrapper exporting all functions
 OCV_OPTION(BUILD_ANDROID_SERVICE    "Build OpenCV Manager for Google Play" OFF IF ANDROID )
 OCV_OPTION(BUILD_CUDA_STUBS         "Build CUDA modules stubs when no CUDA SDK" OFF  IF (NOT APPLE_FRAMEWORK) )
 OCV_OPTION(BUILD_JAVA               "Enable Java support"                         (ANDROID OR NOT CMAKE_CROSSCOMPILING)  IF (ANDROID OR (NOT APPLE_FRAMEWORK AND NOT WINRT)) )
+OCV_OPTION(BUILD_OBJC               "Enable Objective-C support"                  ON  IF APPLE_FRAMEWORK )
 
 # OpenCV installation options
 # ===================================================
@@ -1595,6 +1596,12 @@ if(BUILD_JAVA)
   status("    Java tests:"    BUILD_TESTS AND opencv_test_java_BINARY_DIR                                 THEN YES ELSE NO)
 endif()
 
+# ========================== Objective-C =======================
+if(BUILD_OBJC)
+  status("")
+  status("  Objective-C wrappers:" HAVE_opencv_objc                                                       THEN YES ELSE NO)
+endif()
+
 ocv_cmake_hook(STATUS_DUMP_EXTRA)
 
 # ========================== auxiliary ==========================
 
@@ -30,6 +30,11 @@ if(BUILD_FAT_JAVA_LIB AND HAVE_opencv_java)
   list(APPEND OPENCV_MODULES_CONFIGCMAKE opencv_java)
 endif()
 
+if(BUILD_OBJC AND HAVE_opencv_objc)
+  list(APPEND OPENCV_MODULES_CONFIGCMAKE opencv_objc)
+endif()
+
+
 # -------------------------------------------------------------------------------------------
 #  Part 1/3: ${BIN_DIR}/OpenCVConfig.cmake              -> For use *without* "make install"
 # -------------------------------------------------------------------------------------------
 
@@ -788,6 +788,7 @@ macro(ocv_glob_module_sources)
   if (APPLE)
     file(GLOB_RECURSE lib_srcs_apple
          "${CMAKE_CURRENT_LIST_DIR}/src/*.mm"
+         "${CMAKE_CURRENT_LIST_DIR}/src/*.swift"
     )
     list(APPEND lib_srcs ${lib_srcs_apple})
   endif()
 
@@ -7,5 +7,5 @@ if(DEBUG_opencv_calib3d)
   list(APPEND debug_modules opencv_highgui)
 endif()
 ocv_define_module(calib3d opencv_imgproc opencv_features2d opencv_flann ${debug_modules}
-    WRAP java python js
+    WRAP java objc python js
 )
@@ -0,0 +1,5 @@
+{
+    "func_arg_fix" : {
+        "findCirclesGrid" : { "blobDetector" : {"defval" : "cv::SimpleBlobDetector::create()"} }
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -788,6 +788,7 @@ macro(ocv_glob_module_sources)`
`788`	`788`	`if (APPLE)`
`789`	`789`	`file(GLOB_RECURSE lib_srcs_apple`
`790`	`790`	`"${CMAKE_CURRENT_LIST_DIR}/src/*.mm"`
	`791`	`+ "${CMAKE_CURRENT_LIST_DIR}/src/*.swift"`
`791`	`792`	`)`
`792`	`793`	`list(APPEND lib_srcs ${lib_srcs_apple})`
`793`	`794`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ if(DEBUG_opencv_calib3d)`
`7`	`7`	`list(APPEND debug_modules opencv_highgui)`
`8`	`8`	`endif()`
`9`	`9`	`ocv_define_module(calib3d opencv_imgproc opencv_features2d opencv_flann ${debug_modules}`
`10`		`- WRAP java python js`
	`10`	`+ WRAP java objc python js`
`11`	`11`	`)`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "func_arg_fix" : {
 +        "findCirclesGrid" : { "blobDetector" : {"defval" : "cv::SimpleBlobDetector::create()"} }
 +    }
 +}