30 Commits

Author	SHA1	Message	Date
Alexander Alekhin	593a376566	Merge branch 4.x	2023-01-09 11:08:02 +00:00
Alexander Alekhin	b5400902a7	Merge pull request #23002 from alalek:issue_22206 ... * obj-c: de-duplicate values of nested enums - prefix with outer class name * obj-c: handle enum names change in assigned values * obj-c: switch on 'const_fix' * obj-c: add NS_SWIFT_NAME	2022-12-22 14:01:21 +00:00
OpenCV Developers	0fbd58bef9	Merge branch 4.x	2022-04-23 22:07:14 +00:00
Giles Payne	9ce0e51305	Objective-C wrapper header fix-ups to avoid clashes with system macros	2022-03-20 18:47:26 +09:00
Alexander Alekhin	a0d5277e0d	Merge branch 4.x	2021-12-30 21:43:45 +00:00
Andrey Senyaev	4d3cf77ad5	Replaced distutils to shutil when copying files in a tree	2021-12-10 11:46:27 +03:00
Alexander Alekhin	fc628014bb	Merge branch 4.x	2021-04-10 18:03:01 +00:00
Alexander Alekhin	81f0b0e0dc	cmake: fix tracking detail headers	2021-04-01 12:21:18 +00:00
Vadim Pisarevsky	d6c699c014	calib3d module in opencv is split into 3 modules: 3d, calib and stereo. ... stereo module in opencv_contrib is renamed to xstereo	2020-12-01 23:42:15 +03:00
Giles Payne	29b453eb86	Objective-C name clash avoidance	2020-12-01 11:22:57 -08:00
Alexander Alekhin	eafe6ccdbe	objc: fix handling of std::vector<std::vector<T>> return type	2020-11-23 19:16:23 +00:00
Alexander Alekhin	4c9e3723e8	objc: skip unsupported inner namespaces	2020-11-16 19:52:16 +00:00
Alexander Alekhin	14aa8affe5	Merge pull request #18811 from alalek:objc_headers_import	2020-11-16 09:52:26 +00:00
Alexander Alekhin	3da1e8b2f8	Merge pull request #18805 from alalek:cmake_objc_generator	2020-11-16 08:44:14 +00:00
Alexander Alekhin	786cecfe66	Merge pull request #18817 from alalek:fixup_objc_tests	2020-11-16 07:58:48 +00:00
Alexander Alekhin	24f2b7dd3f	objc(test): repair binary resource files	2020-11-16 05:22:45 +00:00
Alexander Alekhin	cfbdbffcad	objc: rework headers import ... - 'AdditionalImports' can be removed from misc/objc/gen_dict.json - avoid using of legacy 'opencv.hpp'	2020-11-15 05:24:01 +00:00
Alexander Alekhin	90bea15e35	objc: robust code generation ... - the same generated code from Python2/3 - avoid randomized output due to unpredictable dict/set order	2020-11-14 22:31:47 +00:00
Alexander Alekhin	9e84b860f2	cmake: update objc generator scripts ... - allow to run generator without strong requirement of building 'objc' module	2020-11-14 20:59:55 +00:00
Chris Ballinger	4d00ed8df7	Merge pull request #18771 from chrisballinger:xcode-12-fixes ... Xcode 12 and Python 2/3 fixes * Fix compilation issues using Xcode 12 on macOS Catalina * Fix macOS scripts to work on Python 2 or 3 * Fix additional issues with Python 3 * Fix additional Python 2/3 issue * Fix another Python 2/3 issue * Remove dependency on builtins module	2020-11-13 15:30:53 +00:00
Giles Payne	72dfd4846e	Merge pull request #18637 from komakai:build-for-distribution ... Add support for Swift version independence * Build for distribution (Swift version independence) when new Xcode build system is available * Add module map and set "Defines Modules" flag	2020-10-23 11:19:36 +00:00
Alexander Alekhin	9c8626bf3c	Merge pull request #18605 from komakai:fix-swift-binding	2020-10-17 16:57:04 +00:00
Giles Payne	ef21fd3cf8	Fix handling of properties with enum type	2020-10-17 14:31:24 +09:00
mtfrctl	7de189114b	Merge pull request #18547 from mtfrctl:objc-conversions-macosx ... Mat conversions for macOS/AppKit * Extract CoreGraphics conversion logics from ios_conversions.mm to apple_conversions.h, apple_conversions. Add macosx_conversions.mm * Add macosx.h * Add Mat+Conversions.h and Mat+Conversions.mm * Delete duplicated declaration from apple_conversion.mm * Use short license header * Add compile guard * Delete unused imports * Move precomp.hpp import from header to implementation * Add macosx.h to skip headers * Fix compile guard condition * Use short license header * Remove commented out unused code	2020-10-14 16:58:06 +00:00
Giles Payne	8b61719a9d	Swift native in/out array handling	2020-09-03 21:31:11 +09:00
Giles Payne	bedabc15ae	Obj-C/Swift docs improvements	2020-08-09 16:53:10 +09:00
Giles Payne	4cf76754d3	Add Objective-C/Swift wrappers for opencv_contrib modules	2020-07-21 19:19:08 +09:00
Giles Payne	af9ee90091	Merge pull request #17818 from komakai:documentation-improvements ... Documentation fixes/improvements * Documentation fixes/improvements * Remove HASH_UTILS defines	2020-07-15 18:42:05 +00:00
Giles Payne	13962b8533	Use cv::Ptr instead of raw pointers	2020-06-15 23:20:45 +09:00
Giles Payne	02385472b6	Merge pull request #17165 from komakai:objc-binding ... Objc binding * Initial work on Objective-C wrapper * Objective-C generator script; update manually generated wrappers * Add Mat tests * Core Tests * Imgproc wrapper generation and tests * Fixes for Imgcodecs wrapper * Miscellaneous fixes. Swift build support * Objective-C wrapper build/install * Add Swift wrappers for videoio/objdetect/feature2d * Framework build;iOS support * Fix toArray functions;Use enum types whenever possible * Use enum types where possible;prepare test build * Update test * Add test runner scripts for iOS and macOS * Add test scripts and samples * Build fixes * Fix build (cmake 3.17.x compatibility) * Fix warnings * Fix enum name conflicting handling * Add support for document generation with Jazzy * Swift/Native fast accessor functions * Add Objective-C wrapper for calib3d, dnn, ml, photo and video modules * Remove IntOut/FloatOut/DoubleOut classes * Fix iOS default test platform value * Fix samples * Revert default framework name to opencv2 * Add converter util functions * Fix failing test * Fix whitespace * Add handling for deprecated methods;fix warnings;define __OPENCV_BUILD * Suppress cmake warnings * Reduce severity of "jazzy not found" log message * Fix incorrect #include of compatibility header in ios.h * Use explicit returns in subscript/get implementation * Reduce minimum required cmake version to 3.15 for Objective-C/Swift binding	2020-06-08 18:32:53 +00:00