From eaf268dc5010e17cfecc26257417bcab0943ab38 Mon Sep 17 00:00:00 2001 From: Mads Marquart Date: Tue, 10 Dec 2024 01:46:23 +0100 Subject: [PATCH] Add the CoreGraphics framework --- .github/workflows/ci.yml | 26 +- Cargo.lock | 28 ++ crates/header-translator/src/availability.rs | 4 +- crates/header-translator/src/id.rs | 2 +- crates/header-translator/src/method.rs | 2 +- crates/header-translator/src/rust_type.rs | 18 ++ crates/header-translator/src/stmt.rs | 9 + .../header-translator/src/unexposed_attr.rs | 6 +- .../src/topics/about_generated/CHANGELOG.md | 1 + .../src/topics/about_generated/list_data.md | 1 + .../objc2-accessibility/Cargo.toml | 19 +- .../translation-config.toml | 6 - framework-crates/objc2-app-kit/Cargo.toml | 31 +- .../objc2-app-kit/translation-config.toml | 36 +-- framework-crates/objc2-class-kit/Cargo.toml | 10 +- .../objc2-class-kit/translation-config.toml | 4 - .../objc2-core-graphics/Cargo.toml | 267 ++++++++++++++++++ .../objc2-core-graphics/README.md | 14 + .../objc2-core-graphics/src/generated | 1 + .../objc2-core-graphics/src/lib.rs | 35 +++ .../translation-config.toml | 40 +++ framework-crates/objc2-core-image/Cargo.toml | 37 ++- .../objc2-core-image/translation-config.toml | 65 +---- framework-crates/objc2-core-ml/Cargo.toml | 14 +- .../objc2-core-ml/translation-config.toml | 4 +- framework-crates/objc2-core-video/Cargo.toml | 22 +- .../objc2-core-video/translation-config.toml | 9 - framework-crates/objc2-event-kit/Cargo.toml | 12 +- .../objc2-event-kit/translation-config.toml | 4 - framework-crates/objc2-map-kit/Cargo.toml | 20 +- .../objc2-map-kit/translation-config.toml | 30 -- framework-crates/objc2-metal-kit/Cargo.toml | 13 +- .../objc2-metal-kit/translation-config.toml | 8 - framework-crates/objc2-quartz-core/Cargo.toml | 41 ++- .../objc2-quartz-core/translation-config.toml | 47 +-- .../objc2-screen-capture-kit/Cargo.toml | 24 +- .../translation-config.toml | 11 - .../Cargo.toml | 10 +- .../translation-config.toml | 3 - framework-crates/objc2-ui-kit/Cargo.toml | 31 +- .../objc2-ui-kit/translation-config.toml | 59 ---- framework-crates/objc2-vision/Cargo.toml | 17 +- .../objc2-vision/translation-config.toml | 21 +- generated | 2 +- 44 files changed, 688 insertions(+), 376 deletions(-) create mode 100644 framework-crates/objc2-core-graphics/Cargo.toml create mode 100644 framework-crates/objc2-core-graphics/README.md create mode 120000 framework-crates/objc2-core-graphics/src/generated create mode 100644 framework-crates/objc2-core-graphics/src/lib.rs create mode 100644 framework-crates/objc2-core-graphics/translation-config.toml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 457f83aec..3f8b26ee1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,19 +45,19 @@ env: --package=objc2-exception-helper # BEGIN AUTOMATICALLY GENERATED - FRAMEWORKS_MACOS_10_12: --package=objc2-accounts --package=objc2-automator --package=objc2-av-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-image --package=objc2-core-location --package=objc2-core-video --package=objc2-core-wlan --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-input-method-kit --package=objc2-local-authentication --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-multipeer-connectivity --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-saver --package=objc2-service-management --package=objc2-social --package=objc2-store-kit --package=objc2-web-kit - FRAMEWORKS_MACOS_10_13: --package=objc2-accounts --package=objc2-automator --package=objc2-av-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-video --package=objc2-core-wlan --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-external-accessory --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-input-method-kit --package=objc2-local-authentication --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-multipeer-connectivity --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-saver --package=objc2-service-management --package=objc2-social --package=objc2-store-kit --package=objc2-vision --package=objc2-web-kit - FRAMEWORKS_MACOS_11: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-business-chat --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-core-wlan --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-identity-lookup --package=objc2-input-method-kit --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-saver --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-system-extensions --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-virtualization --package=objc2-vision --package=objc2-web-kit - FRAMEWORKS_MACOS_12: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-business-chat --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-core-wlan --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-identity-lookup --package=objc2-input-method-kit --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-mail-kit --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-saver --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-system-extensions --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-virtualization --package=objc2-vision --package=objc2-web-kit - FRAMEWORKS_MACOS_13: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-background-assets --package=objc2-business-chat --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-core-wlan --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-input-method-kit --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-mail-kit --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-fx --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-capture-kit --package=objc2-screen-saver --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-system-extensions --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-virtualization --package=objc2-vision --package=objc2-web-kit - FRAMEWORKS_MACOS_14: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-background-assets --package=objc2-business-chat --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-core-wlan --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-input-method-kit --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-mail-kit --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-fx --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-capture-kit --package=objc2-screen-saver --package=objc2-sensitive-content-analysis --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-symbols --package=objc2-system-extensions --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-virtualization --package=objc2-vision --package=objc2-web-kit - FRAMEWORKS_MACOS_15: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-background-assets --package=objc2-business-chat --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-core-wlan --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-input-method-kit --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-mail-kit --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-fx --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-capture-kit --package=objc2-screen-saver --package=objc2-sensitive-content-analysis --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-symbols --package=objc2-system-extensions --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-virtualization --package=objc2-vision --package=objc2-web-kit - FRAMEWORKS_IOS_10: --package=objc2-accounts --package=objc2-ad-support --package=objc2-av-kit --package=objc2-call-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-image --package=objc2-core-location --package=objc2-core-motion --package=objc2-core-video --package=objc2-event-kit --package=objc2-external-accessory --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-local-authentication --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-multipeer-connectivity --package=objc2-network-extension --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-social --package=objc2-speech --package=objc2-store-kit --package=objc2-ui-kit --package=objc2-user-notifications - FRAMEWORKS_IOS_17: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-av-kit --package=objc2-background-assets --package=objc2-background-tasks --package=objc2-business-chat --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-sensitive-content-analysis --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-symbols --package=objc2-ui-kit --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-vision --package=objc2-web-kit - FRAMEWORKS_TVOS_17: --package=objc2-accessibility --package=objc2-ad-support --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-av-kit --package=objc2-background-tasks --package=objc2-cloud-kit --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-video --package=objc2-data-detection --package=objc2-device-check --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-link-presentation --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-network-extension --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-sound-analysis --package=objc2-store-kit --package=objc2-symbols --package=objc2-ui-kit --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-vision - FRAMEWORKS_MAC_CATALYST_17: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-background-assets --package=objc2-background-tasks --package=objc2-business-chat --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-core-wlan --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider-ui --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-fx --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-sensitive-content-analysis --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-symbols --package=objc2-ui-kit --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-vision --package=objc2-web-kit - FRAMEWORKS_VISIONOS_1: --package=objc2-accessibility --package=objc2-ad-services --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-av-kit --package=objc2-background-assets --package=objc2-background-tasks --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-fx --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-network-extension --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-symbols --package=objc2-ui-kit --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-vision --package=objc2-web-kit - FRAMEWORKS_WATCHOS_10: --package=objc2-accessibility --package=objc2-authentication-services --package=objc2-av-kit --package=objc2-call-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-extension-kit --package=objc2-foundation --package=objc2-game-kit --package=objc2-health-kit --package=objc2-local-authentication --package=objc2-map-kit --package=objc2-media-player --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-photos-ui --package=objc2-sound-analysis --package=objc2-store-kit --package=objc2-symbols --package=objc2-ui-kit --package=objc2-uniform-type-identifiers --package=objc2-user-notifications + FRAMEWORKS_MACOS_10_12: --package=objc2-accounts --package=objc2-automator --package=objc2-av-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-graphics --package=objc2-core-image --package=objc2-core-location --package=objc2-core-video --package=objc2-core-wlan --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-input-method-kit --package=objc2-local-authentication --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-multipeer-connectivity --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-saver --package=objc2-service-management --package=objc2-social --package=objc2-store-kit --package=objc2-web-kit + FRAMEWORKS_MACOS_10_13: --package=objc2-accounts --package=objc2-automator --package=objc2-av-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-graphics --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-video --package=objc2-core-wlan --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-external-accessory --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-input-method-kit --package=objc2-local-authentication --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-multipeer-connectivity --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-saver --package=objc2-service-management --package=objc2-social --package=objc2-store-kit --package=objc2-vision --package=objc2-web-kit + FRAMEWORKS_MACOS_11: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-business-chat --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-graphics --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-core-wlan --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-identity-lookup --package=objc2-input-method-kit --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-saver --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-system-extensions --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-virtualization --package=objc2-vision --package=objc2-web-kit + FRAMEWORKS_MACOS_12: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-business-chat --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-graphics --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-core-wlan --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-identity-lookup --package=objc2-input-method-kit --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-mail-kit --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-saver --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-system-extensions --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-virtualization --package=objc2-vision --package=objc2-web-kit + FRAMEWORKS_MACOS_13: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-background-assets --package=objc2-business-chat --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-graphics --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-core-wlan --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-input-method-kit --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-mail-kit --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-fx --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-capture-kit --package=objc2-screen-saver --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-system-extensions --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-virtualization --package=objc2-vision --package=objc2-web-kit + FRAMEWORKS_MACOS_14: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-background-assets --package=objc2-business-chat --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-graphics --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-core-wlan --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-input-method-kit --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-mail-kit --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-fx --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-capture-kit --package=objc2-screen-saver --package=objc2-sensitive-content-analysis --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-symbols --package=objc2-system-extensions --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-virtualization --package=objc2-vision --package=objc2-web-kit + FRAMEWORKS_MACOS_15: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-background-assets --package=objc2-business-chat --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-graphics --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-core-wlan --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-input-method-kit --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-mail-kit --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-fx --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-capture-kit --package=objc2-screen-saver --package=objc2-sensitive-content-analysis --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-symbols --package=objc2-system-extensions --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-virtualization --package=objc2-vision --package=objc2-web-kit + FRAMEWORKS_IOS_10: --package=objc2-accounts --package=objc2-ad-support --package=objc2-av-kit --package=objc2-call-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-graphics --package=objc2-core-image --package=objc2-core-location --package=objc2-core-motion --package=objc2-core-video --package=objc2-event-kit --package=objc2-external-accessory --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-local-authentication --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-multipeer-connectivity --package=objc2-network-extension --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-social --package=objc2-speech --package=objc2-store-kit --package=objc2-ui-kit --package=objc2-user-notifications + FRAMEWORKS_IOS_17: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-av-kit --package=objc2-background-assets --package=objc2-background-tasks --package=objc2-business-chat --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-graphics --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-sensitive-content-analysis --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-symbols --package=objc2-ui-kit --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-vision --package=objc2-web-kit + FRAMEWORKS_TVOS_17: --package=objc2-accessibility --package=objc2-ad-support --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-av-kit --package=objc2-background-tasks --package=objc2-cloud-kit --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-graphics --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-video --package=objc2-data-detection --package=objc2-device-check --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-link-presentation --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-network-extension --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-sound-analysis --package=objc2-store-kit --package=objc2-symbols --package=objc2-ui-kit --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-vision + FRAMEWORKS_MAC_CATALYST_17: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-background-assets --package=objc2-background-tasks --package=objc2-business-chat --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-graphics --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-core-wlan --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider-ui --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-fx --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-sensitive-content-analysis --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-symbols --package=objc2-ui-kit --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-vision --package=objc2-web-kit + FRAMEWORKS_VISIONOS_1: --package=objc2-accessibility --package=objc2-ad-services --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-av-kit --package=objc2-background-assets --package=objc2-background-tasks --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-graphics --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-fx --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-network-extension --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-symbols --package=objc2-ui-kit --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-vision --package=objc2-web-kit + FRAMEWORKS_WATCHOS_10: --package=objc2-accessibility --package=objc2-authentication-services --package=objc2-av-kit --package=objc2-call-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-core-audio-types --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-foundation --package=objc2-core-graphics --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-video --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-extension-kit --package=objc2-foundation --package=objc2-game-kit --package=objc2-health-kit --package=objc2-local-authentication --package=objc2-map-kit --package=objc2-media-player --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-photos-ui --package=objc2-sound-analysis --package=objc2-store-kit --package=objc2-symbols --package=objc2-ui-kit --package=objc2-uniform-type-identifiers --package=objc2-user-notifications FRAMEWORKS_GNUSTEP: --package=objc2-app-kit --package=objc2-foundation # END AUTOMATICALLY GENERATED diff --git a/Cargo.lock b/Cargo.lock index c4651768e..a4d7e923a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -391,6 +391,7 @@ dependencies = [ "block2", "objc2", "objc2-core-foundation", + "objc2-core-graphics", "objc2-foundation", ] @@ -430,6 +431,7 @@ dependencies = [ "objc2-cloud-kit", "objc2-core-data", "objc2-core-foundation", + "objc2-core-graphics", "objc2-core-image", "objc2-foundation", "objc2-quartz-core", @@ -531,6 +533,7 @@ version = "0.2.2" dependencies = [ "block2", "objc2", + "objc2-core-graphics", "objc2-foundation", ] @@ -603,6 +606,18 @@ dependencies = [ "objc2", ] +[[package]] +name = "objc2-core-graphics" +version = "0.2.2" +dependencies = [ + "bitflags", + "block2", + "libc", + "objc2", + "objc2-core-foundation", + "objc2-metal", +] + [[package]] name = "objc2-core-image" version = "0.2.2" @@ -610,6 +625,7 @@ dependencies = [ "block2", "objc2", "objc2-core-foundation", + "objc2-core-graphics", "objc2-core-video", "objc2-foundation", "objc2-metal", @@ -632,6 +648,7 @@ dependencies = [ "bitflags", "block2", "objc2", + "objc2-core-graphics", "objc2-core-video", "objc2-foundation", "objc2-metal", @@ -656,6 +673,7 @@ dependencies = [ "block2", "objc2", "objc2-core-foundation", + "objc2-core-graphics", "objc2-metal", ] @@ -698,6 +716,7 @@ dependencies = [ "block2", "objc2", "objc2-app-kit", + "objc2-core-graphics", "objc2-core-location", "objc2-foundation", "objc2-map-kit", @@ -889,6 +908,7 @@ dependencies = [ "objc2-app-kit", "objc2-contacts", "objc2-core-foundation", + "objc2-core-graphics", "objc2-core-location", "objc2-foundation", ] @@ -936,6 +956,7 @@ dependencies = [ "objc2", "objc2-app-kit", "objc2-core-foundation", + "objc2-core-graphics", "objc2-foundation", "objc2-metal", "objc2-quartz-core", @@ -1051,8 +1072,11 @@ version = "0.2.2" dependencies = [ "bitflags", "block2", + "libc", "objc2", "objc2-core-foundation", + "objc2-core-graphics", + "objc2-core-video", "objc2-foundation", "objc2-metal", ] @@ -1066,6 +1090,7 @@ dependencies = [ "libc", "objc2", "objc2-core-foundation", + "objc2-core-graphics", "objc2-foundation", ] @@ -1085,6 +1110,7 @@ version = "0.2.2" dependencies = [ "block2", "objc2", + "objc2-core-graphics", "objc2-foundation", ] @@ -1165,6 +1191,7 @@ dependencies = [ "objc2-cloud-kit", "objc2-core-data", "objc2-core-foundation", + "objc2-core-graphics", "objc2-core-image", "objc2-core-location", "objc2-foundation", @@ -1213,6 +1240,7 @@ dependencies = [ "block2", "objc2", "objc2-core-foundation", + "objc2-core-graphics", "objc2-core-image", "objc2-core-ml", "objc2-core-video", diff --git a/crates/header-translator/src/availability.rs b/crates/header-translator/src/availability.rs index 2d48a6d2c..8234da51c 100644 --- a/crates/header-translator/src/availability.rs +++ b/crates/header-translator/src/availability.rs @@ -55,9 +55,9 @@ impl Availability { *introduced = availability.introduced; *deprecated = availability.deprecated; - // TODO: Unsure how we would handle these if they exist if availability.obsoleted.is_some() { - error!("availability attribute contained `obsoleted`"); + // TODO: Handle obsoletions somehow, maybe by cfg-ing + // obsoleted things out? } if let Some(m) = availability.message { diff --git a/crates/header-translator/src/id.rs b/crates/header-translator/src/id.rs index e4a7002d4..80a07f776 100644 --- a/crates/header-translator/src/id.rs +++ b/crates/header-translator/src/id.rs @@ -241,7 +241,7 @@ impl ItemIdentifier { pub fn with_name(name: N, entity: &Entity<'_>, context: &Context<'_>) -> Self { let location = context.get_location(entity).unwrap_or_else(|| { - warn!(?entity, "ItemIdentifier from unknown header"); + error!(?entity, "ItemIdentifier from unknown header"); Location::from_components(vec!["__Unknown__".into()]) }); diff --git a/crates/header-translator/src/method.rs b/crates/header-translator/src/method.rs index cc4c712ac..1660091cc 100644 --- a/crates/header-translator/src/method.rs +++ b/crates/header-translator/src/method.rs @@ -237,7 +237,7 @@ impl MemoryManagement { { Self::Normal } else { - error!(?modifiers, "invalid MemoryManagement attributes"); + warn!(?modifiers, "invalid MemoryManagement attributes"); Self::Normal } } diff --git a/crates/header-translator/src/rust_type.rs b/crates/header-translator/src/rust_type.rs index 6410b64a7..f3806073a 100644 --- a/crates/header-translator/src/rust_type.rs +++ b/crates/header-translator/src/rust_type.rs @@ -1723,11 +1723,29 @@ impl Ty { }) } + fn fn_contains_bool_argument(&self) -> bool { + if let Self::Pointer { pointee, .. } = self { + if let Self::Fn { arguments, .. } = &**pointee { + if arguments + .iter() + .any(|arg| matches!(arg, Self::Primitive(Primitive::C99Bool))) + { + return true; + } + } + } + false + } + pub(crate) fn struct_encoding(&self) -> impl fmt::Display + '_ { FormatterFn(move |f| match self { Self::Primitive(Primitive::C99Bool) => write!(f, "Encoding::Bool"), Self::Primitive(Primitive::Long) => write!(f, "Encoding::C_LONG"), Self::Primitive(Primitive::ULong) => write!(f, "Encoding::C_ULONG"), + // TODO: Make all function pointers be encode, regardless of arguments + Self::TypeDef { to, .. } if to.fn_contains_bool_argument() => { + write!(f, "Encoding::Pointer(&Encoding::Unknown)") + } _ => write!(f, "<{}>::ENCODING", self.struct_()), }) } diff --git a/crates/header-translator/src/stmt.rs b/crates/header-translator/src/stmt.rs index 3715e68ad..bedd4e4dc 100644 --- a/crates/header-translator/src/stmt.rs +++ b/crates/header-translator/src/stmt.rs @@ -554,6 +554,8 @@ fn parse_fn_param_children(parent: &Entity<'_>, context: &Context<'_>) -> Option EntityKind::NSConsumed => { error!("found NSConsumed, which requires manual handling"); } + // For some reason we recurse into array types + EntityKind::IntegerLiteral => {} kind => error!(?parent, ?kind, "unknown"), }); @@ -1385,6 +1387,13 @@ impl Stmt { let ty = Ty::parse_function_argument(ty, attr, context); arguments.push((name, ty)) } + EntityKind::WarnUnusedResultAttr => { + // TODO: Emit `#[must_use]` on this + } + EntityKind::PureAttr => { + // Ignore, we currently have no way of marking + // external functions as pure in Rust. + } EntityKind::VisibilityAttr => { // CG_EXTERN or UIKIT_EXTERN } diff --git a/crates/header-translator/src/unexposed_attr.rs b/crates/header-translator/src/unexposed_attr.rs index 6f729b9e6..d4cdb0e87 100644 --- a/crates/header-translator/src/unexposed_attr.rs +++ b/crates/header-translator/src/unexposed_attr.rs @@ -176,6 +176,7 @@ impl UnexposedAttr { | "OBJC_SWIFT_UNAVAILABLE" | "OPENGL_DEPRECATED" | "OPENGLES_DEPRECATED" + | "SCREEN_CAPTURE_OBSOLETE" | "SOCIAL_CLASS_AVAILABLE" | "SOCIAL_CLASS_AVAILABLE_IOS" | "SOCIAL_CLASS_AVAILABLE_MAC" @@ -193,7 +194,9 @@ impl UnexposedAttr { // For some reason we don't need to extract the arguments for // these, perhaps because they simply delegate to other macros. "AS_API_AVAILABLE" | "AS_HEADER_AUDIT_BEGIN" => None, - "__IOS_PROHIBITED" + "__CG_DEPRECATED_ENUMERATOR" + | "__CG_DEPRECATED" + | "__IOS_PROHIBITED" | "__IOS_UNAVAILABLE" | "__OSX_UNAVAILABLE" | "__TVOS_PROHIBITED" @@ -206,6 +209,7 @@ impl UnexposedAttr { | "CB_CM_API_AVAILABLE" | "MP_INIT_UNAVAILABLE" | "CF_AUTOMATED_REFCOUNT_UNAVAILABLE" + | "CG_OBSOLETE" | "NS_AUTOMATED_REFCOUNT_UNAVAILABLE" | "NS_AUTOMATED_REFCOUNT_WEAK_UNAVAILABLE" | "NS_UNAVAILABLE" diff --git a/crates/objc2/src/topics/about_generated/CHANGELOG.md b/crates/objc2/src/topics/about_generated/CHANGELOG.md index 98b08ac08..2374ec68f 100644 --- a/crates/objc2/src/topics/about_generated/CHANGELOG.md +++ b/crates/objc2/src/topics/about_generated/CHANGELOG.md @@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). querying the underlying data. * Added new framework crates: - `CoreAudioTypes` / `objc2-core-audio-types`. + - `CoreGraphics` / `objc2-core-graphics`. - `CoreFoundation` / `objc2-core-foundation`. - `CoreVideo` / `objc2-core-video`. - `ScreenSaver` / `objc2-screen-saver`. diff --git a/crates/objc2/src/topics/about_generated/list_data.md b/crates/objc2/src/topics/about_generated/list_data.md index e2da3a23e..fe0d5c914 100644 --- a/crates/objc2/src/topics/about_generated/list_data.md +++ b/crates/objc2/src/topics/about_generated/list_data.md @@ -22,6 +22,7 @@ | `CoreBluetooth` | [![`objc2-core-bluetooth`](https://badgen.net/crates/v/objc2-core-bluetooth)](https://crates.io/crates/objc2-core-bluetooth) | [![docs.rs](https://docs.rs/objc2-core-bluetooth/badge.svg)](https://docs.rs/objc2-core-bluetooth/) | | `CoreData` | [![`objc2-core-data`](https://badgen.net/crates/v/objc2-core-data)](https://crates.io/crates/objc2-core-data) | [![docs.rs](https://docs.rs/objc2-core-data/badge.svg)](https://docs.rs/objc2-core-data/) | | `CoreFoundation` | [![`objc2-core-foundation`](https://badgen.net/crates/v/objc2-core-foundation)](https://crates.io/crates/objc2-core-foundation) | [![docs.rs](https://docs.rs/objc2-core-foundation/badge.svg)](https://docs.rs/objc2-core-foundation/) | +| `CoreGraphics` | [![`objc2-core-graphics`](https://badgen.net/crates/v/objc2-core-graphics)](https://crates.io/crates/objc2-core-graphics) | [![docs.rs](https://docs.rs/objc2-core-graphics/badge.svg)](https://docs.rs/objc2-core-graphics/) | | `CoreImage` | [![`objc2-core-image`](https://badgen.net/crates/v/objc2-core-image)](https://crates.io/crates/objc2-core-image) | [![docs.rs](https://docs.rs/objc2-core-image/badge.svg)](https://docs.rs/objc2-core-image/) | | `CoreLocation` | [![`objc2-core-location`](https://badgen.net/crates/v/objc2-core-location)](https://crates.io/crates/objc2-core-location) | [![docs.rs](https://docs.rs/objc2-core-location/badge.svg)](https://docs.rs/objc2-core-location/) | | `CoreML` | [![`objc2-core-ml`](https://badgen.net/crates/v/objc2-core-ml)](https://crates.io/crates/objc2-core-ml) | [![docs.rs](https://docs.rs/objc2-core-ml/badge.svg)](https://docs.rs/objc2-core-ml/) | diff --git a/framework-crates/objc2-accessibility/Cargo.toml b/framework-crates/objc2-accessibility/Cargo.toml index c4d3c980f..2581f91f4 100644 --- a/framework-crates/objc2-accessibility/Cargo.toml +++ b/framework-crates/objc2-accessibility/Cargo.toml @@ -20,6 +20,7 @@ bitflags = { version = "2.5.0", default-features = false, optional = true } block2 = { path = "../../crates/block2", version = "0.5.1", default-features = false, optional = true } objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false } objc2-core-foundation = { path = "../objc2-core-foundation", version = "0.2.2", default-features = false, optional = true } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-features = false } [package.metadata.docs.rs] @@ -38,11 +39,12 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "bitflags?/std", "block2?/std", "objc2/std", "objc2-core-foundation?/std", "objc2-foundation/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-foundation?/alloc", "objc2-foundation/alloc"] -bitflags = ["dep:bitflags", "objc2-core-foundation?/bitflags", "objc2-foundation/bitflags"] -block2 = ["dep:block2", "objc2-core-foundation?/block2", "objc2-foundation/block2"] -objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-foundation/objc2-core-foundation"] +std = ["alloc", "bitflags?/std", "block2?/std", "objc2/std", "objc2-core-foundation?/std", "objc2-core-graphics?/std", "objc2-foundation/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-foundation?/alloc", "objc2-core-graphics?/alloc", "objc2-foundation/alloc"] +bitflags = ["dep:bitflags", "objc2-core-foundation?/bitflags", "objc2-core-graphics?/bitflags", "objc2-foundation/bitflags"] +block2 = ["dep:block2", "objc2-core-foundation?/block2", "objc2-core-graphics?/block2", "objc2-foundation/block2"] +objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-core-graphics?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation"] +objc2-core-graphics = ["dep:objc2-core-graphics"] AXAudiograph = [ "objc2-core-foundation?/CFCGTypes", @@ -54,9 +56,13 @@ AXAudiograph = [ ] AXBrailleMap = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGImage", "objc2-foundation/NSObject", ] -AXColorUtilities = [] +AXColorUtilities = [ + "objc2-core-graphics?/CGColor", + "objc2-foundation/NSString", +] AXCustomContent = [ "objc2-foundation/NSArray", "objc2-foundation/NSAttributedString", @@ -94,4 +100,5 @@ all = [ "bitflags", "block2", "objc2-core-foundation", + "objc2-core-graphics", ] diff --git a/framework-crates/objc2-accessibility/translation-config.toml b/framework-crates/objc2-accessibility/translation-config.toml index d705e5267..045312d60 100644 --- a/framework-crates/objc2-accessibility/translation-config.toml +++ b/framework-crates/objc2-accessibility/translation-config.toml @@ -7,9 +7,3 @@ ios = "14.0" tvos = "14.0" watchos = "7.0" visionos = "1.0" - -# Needs `CGImageRef` -class.AXBrailleMap.methods."presentImage:".skipped = true - -# Needs `CGColorRef` -fn.AXNameFromColor.skipped = true diff --git a/framework-crates/objc2-app-kit/Cargo.toml b/framework-crates/objc2-app-kit/Cargo.toml index 6c59e0bb3..295ea5575 100644 --- a/framework-crates/objc2-app-kit/Cargo.toml +++ b/framework-crates/objc2-app-kit/Cargo.toml @@ -26,6 +26,7 @@ objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-fe [target.'cfg(target_vendor = "apple")'.dependencies] objc2-cloud-kit = { path = "../objc2-cloud-kit", version = "0.2.2", default-features = false, optional = true } objc2-core-data = { path = "../objc2-core-data", version = "0.2.2", default-features = false, optional = true } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } objc2-core-image = { path = "../objc2-core-image", version = "0.2.2", default-features = false, optional = true } objc2-quartz-core = { path = "../objc2-quartz-core", version = "0.2.2", default-features = false, optional = true } objc2-uniform-type-identifiers = { path = "../objc2-uniform-type-identifiers", version = "0.2.2", default-features = false, optional = true } @@ -45,20 +46,21 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "bitflags?/std", "block2?/std", "libc?/std", "objc2/std", "objc2-cloud-kit?/std", "objc2-core-data?/std", "objc2-core-foundation?/std", "objc2-core-image?/std", "objc2-foundation/std", "objc2-quartz-core?/std", "objc2-uniform-type-identifiers?/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-cloud-kit?/alloc", "objc2-core-data?/alloc", "objc2-core-foundation?/alloc", "objc2-core-image?/alloc", "objc2-foundation/alloc", "objc2-quartz-core?/alloc", "objc2-uniform-type-identifiers?/alloc"] +std = ["alloc", "bitflags?/std", "block2?/std", "libc?/std", "objc2/std", "objc2-cloud-kit?/std", "objc2-core-data?/std", "objc2-core-foundation?/std", "objc2-core-graphics?/std", "objc2-core-image?/std", "objc2-foundation/std", "objc2-quartz-core?/std", "objc2-uniform-type-identifiers?/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-cloud-kit?/alloc", "objc2-core-data?/alloc", "objc2-core-foundation?/alloc", "objc2-core-graphics?/alloc", "objc2-core-image?/alloc", "objc2-foundation/alloc", "objc2-quartz-core?/alloc", "objc2-uniform-type-identifiers?/alloc"] apple = [] gnustep-1-7 = ["objc2/gnustep-1-7", "block2?/gnustep-1-7", "objc2-foundation/gnustep-1-7", "objc2-core-data?/gnustep-1-7", "objc2-quartz-core?/gnustep-1-7"] gnustep-1-8 = ["gnustep-1-7", "objc2/gnustep-1-8", "block2?/gnustep-1-8", "objc2-foundation/gnustep-1-8", "objc2-core-data?/gnustep-1-8", "objc2-quartz-core?/gnustep-1-8"] gnustep-1-9 = ["gnustep-1-8", "objc2/gnustep-1-9", "block2?/gnustep-1-9", "objc2-foundation/gnustep-1-9", "objc2-core-data?/gnustep-1-9", "objc2-quartz-core?/gnustep-1-9"] gnustep-2-0 = ["gnustep-1-9", "objc2/gnustep-2-0", "block2?/gnustep-2-0", "objc2-foundation/gnustep-2-0", "objc2-core-data?/gnustep-2-0", "objc2-quartz-core?/gnustep-2-0"] gnustep-2-1 = ["gnustep-2-0", "objc2/gnustep-2-1", "block2?/gnustep-2-1", "objc2-foundation/gnustep-2-1", "objc2-core-data?/gnustep-2-1", "objc2-quartz-core?/gnustep-2-1"] -bitflags = ["dep:bitflags", "objc2-cloud-kit?/bitflags", "objc2-core-data?/bitflags", "objc2-core-foundation?/bitflags", "objc2-foundation/bitflags", "objc2-quartz-core?/bitflags"] -block2 = ["dep:block2", "objc2-cloud-kit?/block2", "objc2-core-data?/block2", "objc2-core-foundation?/block2", "objc2-core-image?/block2", "objc2-foundation/block2", "objc2-quartz-core?/block2", "objc2-uniform-type-identifiers?/block2"] -libc = ["dep:libc", "objc2-core-foundation?/libc", "objc2-foundation/libc"] +bitflags = ["dep:bitflags", "objc2-cloud-kit?/bitflags", "objc2-core-data?/bitflags", "objc2-core-foundation?/bitflags", "objc2-core-graphics?/bitflags", "objc2-foundation/bitflags", "objc2-quartz-core?/bitflags"] +block2 = ["dep:block2", "objc2-cloud-kit?/block2", "objc2-core-data?/block2", "objc2-core-foundation?/block2", "objc2-core-graphics?/block2", "objc2-core-image?/block2", "objc2-foundation/block2", "objc2-quartz-core?/block2", "objc2-uniform-type-identifiers?/block2"] +libc = ["dep:libc", "objc2-core-foundation?/libc", "objc2-core-graphics?/libc", "objc2-foundation/libc", "objc2-quartz-core?/libc"] objc2-cloud-kit = ["dep:objc2-cloud-kit"] objc2-core-data = ["dep:objc2-core-data"] -objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-core-image?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation", "objc2-quartz-core?/objc2-core-foundation"] +objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-core-graphics?/objc2-core-foundation", "objc2-core-image?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation", "objc2-quartz-core?/objc2-core-foundation"] +objc2-core-graphics = ["dep:objc2-core-graphics", "objc2-core-image?/objc2-core-graphics", "objc2-quartz-core?/objc2-core-graphics"] objc2-core-image = ["dep:objc2-core-image"] objc2-quartz-core = ["dep:objc2-quartz-core"] objc2-uniform-type-identifiers = ["dep:objc2-uniform-type-identifiers"] @@ -200,6 +202,8 @@ NSAttributedString = [ ] NSBezierPath = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGFont", + "objc2-core-graphics?/CGPath", "objc2-foundation/NSAffineTransform", "objc2-foundation/NSGeometry", "objc2-foundation/NSObject", @@ -207,6 +211,7 @@ NSBezierPath = [ NSBitmapImageRep = [ "bitflags", "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGImage", "objc2-core-image?/CIImage", "objc2-foundation/NSArray", "objc2-foundation/NSCoder", @@ -361,6 +366,7 @@ NSCollectionViewTransitionLayout = [ ] NSColor = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColor", "objc2-core-image?/CIColor", "objc2-foundation/NSArray", "objc2-foundation/NSBundle", @@ -406,6 +412,7 @@ NSColorPicking = [ ] NSColorSampler = [] NSColorSpace = [ + "objc2-core-graphics?/CGColorSpace", "objc2-foundation/NSArray", "objc2-foundation/NSData", "objc2-foundation/NSObject", @@ -595,6 +602,7 @@ NSErrors = [ NSEvent = [ "bitflags", "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGEventTypes", "objc2-foundation/NSArray", "objc2-foundation/NSDate", "objc2-foundation/NSGeometry", @@ -619,6 +627,7 @@ NSFilePromiseReceiver = [ NSFileWrapperExtensions = ["objc2-foundation/NSFileWrapper"] NSFont = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGFont", "objc2-foundation/NSAffineTransform", "objc2-foundation/NSCharacterSet", "objc2-foundation/NSDictionary", @@ -691,6 +700,7 @@ NSGestureRecognizer = [ ] NSGlyphGenerator = ["objc2-foundation/NSAttributedString"] NSGlyphInfo = [ + "objc2-core-graphics?/CGFont", "objc2-foundation/NSObject", "objc2-foundation/NSString", ] @@ -709,6 +719,7 @@ NSGraphics = [ ] NSGraphicsContext = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGContext", "objc2-core-image?/CIContext", "objc2-foundation/NSDictionary", "objc2-foundation/NSGeometry", @@ -740,6 +751,7 @@ NSHelpManager = [ ] NSImage = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGImage", "objc2-foundation/NSArray", "objc2-foundation/NSBundle", "objc2-foundation/NSCoder", @@ -759,6 +771,7 @@ NSImageCell = [ ] NSImageRep = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGImage", "objc2-foundation/NSArray", "objc2-foundation/NSCoder", "objc2-foundation/NSData", @@ -829,6 +842,9 @@ NSLayoutGuide = [ NSLayoutManager = [ "bitflags", "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGContext", + "objc2-core-graphics?/CGFont", + "objc2-foundation/NSAffineTransform", "objc2-foundation/NSArray", "objc2-foundation/NSAttributedString", "objc2-foundation/NSCoder", @@ -1691,6 +1707,7 @@ NSTextInsertionIndicator = [ NSTextLayoutFragment = [ "bitflags", "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGContext", "objc2-foundation/NSArray", "objc2-foundation/NSCoder", "objc2-foundation/NSObject", @@ -1709,6 +1726,7 @@ NSTextLayoutManager = [ ] NSTextLineFragment = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGContext", "objc2-foundation/NSAttributedString", "objc2-foundation/NSCoder", "objc2-foundation/NSDictionary", @@ -2294,6 +2312,7 @@ all = [ "objc2-cloud-kit", "objc2-core-data", "objc2-core-foundation", + "objc2-core-graphics", "objc2-core-image", "objc2-quartz-core", "objc2-uniform-type-identifiers", diff --git a/framework-crates/objc2-app-kit/translation-config.toml b/framework-crates/objc2-app-kit/translation-config.toml index 5be5bc06c..4354852b8 100644 --- a/framework-crates/objc2-app-kit/translation-config.toml +++ b/framework-crates/objc2-app-kit/translation-config.toml @@ -75,42 +75,8 @@ class.NSGestureRecognizer.methods.state.skipped = true # Needs `Symbols` framework class.NSImageView.categories.NSSymbolEffect.skipped = true -# Needs CoreGraphics -class.NSColor.methods.CGColor.skipped = true -class.NSColor.methods."colorWithCGColor:".skipped = true -class.NSColorSpace.methods."initWithCGColorSpace:".skipped = true -class.NSColorSpace.methods.CGColorSpace.skipped = true -class.NSLayoutManager.methods."CGGlyphAtIndex:isValidIndex:".skipped = true -class.NSLayoutManager.methods."CGGlyphAtIndex:".skipped = true -class.NSLayoutManager.methods."showCGGlyphs:positions:count:font:textMatrix:attributes:inContext:".skipped = true -class.NSLayoutManager.methods."showCGGlyphs:positions:count:font:matrix:attributes:inContext:".skipped = true -class.NSImage.methods."initWithCGImage:size:".skipped = true -class.NSImage.methods."CGImageForProposedRect:context:hints:".skipped = true +# Needs IconRef from HIServices / Carbon class.NSImage.methods."initWithIconRef:".skipped = true -class.NSImageRep.methods."CGImageForProposedRect:context:hints:".skipped = true -class.NSBitmapImageRep.methods."initWithCGImage:".skipped = true -class.NSBitmapImageRep.methods.CGImage.skipped = true -class.NSEvent.methods.CGEvent.skipped = true -class.NSEvent.methods."eventWithCGEvent:".skipped = true -class.NSBezierPath.methods."appendBezierPathWithCGGlyph:inFont:".skipped = true -class.NSBezierPath.methods."appendBezierPathWithCGGlyphs:count:inFont:".skipped = true -class.NSBezierPath.methods."bezierPathWithCGPath:".skipped = true -class.NSBezierPath.methods.CGPath.skipped = true -class.NSBezierPath.methods."setCGPath:".skipped = true -class.NSFont.methods."boundingRectForCGGlyph:".skipped = true -class.NSFont.methods."advancementForCGGlyph:".skipped = true -class.NSFont.methods."getBoundingRects:forCGGlyphs:count:".skipped = true -class.NSFont.methods."getAdvancements:forCGGlyphs:count:".skipped = true -class.NSGlyphInfo.methods."glyphInfoWithCGGlyph:forFont:baseString:".skipped = true -class.NSGraphicsContext.methods."graphicsContextWithCGContext:flipped:".skipped = true -class.NSGraphicsContext.methods.CGContext.skipped = true -class.NSLayoutManager.methods."setGlyphs:properties:characterIndexes:font:forGlyphRange:".skipped = true -class.NSLayoutManager.methods."getGlyphsInRange:glyphs:properties:characterIndexes:bidiLevels:".skipped = true -class.NSLayoutManager.methods."glyphIndexForPoint:inTextContainer:fractionOfDistanceThroughGlyph:".skipped = true -protocol.NSLayoutManagerDelegate.methods."layoutManager:shouldGenerateGlyphs:properties:characterIndexes:font:forGlyphRange:".skipped = true -class.NSTextLayoutFragment.methods."drawAtPoint:inContext:".skipped = true -class.NSTextLineFragment.methods."drawAtPoint:inContext:".skipped = true -class.NSGlyphInfo.methods.glyphID.skipped = true # OpenGL class.NSOpenGLContext.skipped = true diff --git a/framework-crates/objc2-class-kit/Cargo.toml b/framework-crates/objc2-class-kit/Cargo.toml index 21e9b7284..983ed3da0 100644 --- a/framework-crates/objc2-class-kit/Cargo.toml +++ b/framework-crates/objc2-class-kit/Cargo.toml @@ -18,6 +18,7 @@ workspace = true [dependencies] block2 = { path = "../../crates/block2", version = "0.5.1", default-features = false, optional = true } objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-features = false } [package.metadata.docs.rs] @@ -34,9 +35,10 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "block2?/std", "objc2/std", "objc2-foundation/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-foundation/alloc"] -block2 = ["dep:block2", "objc2-foundation/block2"] +std = ["alloc", "block2?/std", "objc2/std", "objc2-core-graphics?/std", "objc2-foundation/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-graphics?/alloc", "objc2-foundation/alloc"] +block2 = ["dep:block2", "objc2-core-graphics?/block2", "objc2-foundation/block2"] +objc2-core-graphics = ["dep:objc2-core-graphics"] CLSActivity = [ "objc2-foundation/NSArray", @@ -52,6 +54,7 @@ CLSBinaryItem = [ "objc2-foundation/NSString", ] CLSContext = [ + "objc2-core-graphics?/CGImage", "objc2-foundation/NSArray", "objc2-foundation/NSError", "objc2-foundation/NSObject", @@ -104,4 +107,5 @@ all = [ "CLSScoreItem", "NSUserActivity_CLSDeepLinks", "block2", + "objc2-core-graphics", ] diff --git a/framework-crates/objc2-class-kit/translation-config.toml b/framework-crates/objc2-class-kit/translation-config.toml index 5d54d67f6..ddf3ad430 100644 --- a/framework-crates/objc2-class-kit/translation-config.toml +++ b/framework-crates/objc2-class-kit/translation-config.toml @@ -5,7 +5,3 @@ macos = "11.0" maccatalyst = "14.0" ios = "11.4" visionos = "1.0" - -# Needs `CGImageRef` -class.CLSContext.methods.thumbnail.skipped = true -class.CLSContext.methods."setThumbnail:".skipped = true diff --git a/framework-crates/objc2-core-graphics/Cargo.toml b/framework-crates/objc2-core-graphics/Cargo.toml new file mode 100644 index 000000000..08a2d9d31 --- /dev/null +++ b/framework-crates/objc2-core-graphics/Cargo.toml @@ -0,0 +1,267 @@ +# This file has been automatically generated by `objc2`'s `header-translator`. +# DO NOT EDIT + +[package] +name = "objc2-core-graphics" +version.workspace = true +description = "Bindings to the CoreGraphics framework" +edition.workspace = true +rust-version.workspace = true +keywords = ["cocoa", "apple", "framework", "macos", "ios"] +categories.workspace = true +repository.workspace = true +license.workspace = true + +[lints] +workspace = true + +[dependencies] +bitflags = { version = "2.5.0", default-features = false, optional = true } +block2 = { path = "../../crates/block2", version = "0.5.1", default-features = false, optional = true } +libc = { version = "0.2.80", default-features = false, optional = true } +objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false } +objc2-core-foundation = { path = "../objc2-core-foundation", version = "0.2.2", default-features = false, optional = true } + +[target.'cfg(not(target_os = "watchos"))'.dependencies] +objc2-metal = { path = "../objc2-metal", version = "0.2.2", default-features = false, optional = true } + +[package.metadata.docs.rs] +default-target = "aarch64-apple-darwin" +features = ["all"] +targets = [ + "aarch64-apple-darwin", + "x86_64-apple-darwin", + "aarch64-apple-ios", + "aarch64-apple-tvos", + "aarch64-apple-watchos", + "aarch64-apple-ios-macabi", +] + +[features] +default = ["std"] + +# Currently not possible to turn off, put here for forwards compatibility. +std = ["alloc", "bitflags?/std", "block2?/std", "libc?/std", "objc2/std", "objc2-core-foundation?/std", "objc2-metal?/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-foundation?/alloc", "objc2-metal?/alloc"] +bitflags = ["dep:bitflags", "objc2-core-foundation?/bitflags", "objc2-metal?/bitflags"] +block2 = ["dep:block2", "objc2-core-foundation?/block2", "objc2-metal?/block2"] +libc = ["dep:libc", "objc2-core-foundation?/libc"] +objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-metal?/objc2-core-foundation"] +objc2-metal = ["dep:objc2-metal"] + +CGAffineTransform = ["objc2-core-foundation?/CFCGTypes"] +CGBase = [] +CGBitmapContext = [] +CGColor = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFDictionary", +] +CGColorConversionInfo = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFDictionary", + "objc2-core-foundation?/CFError", +] +CGColorSpace = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFData", + "objc2-core-foundation?/CFDictionary", +] +CGContext = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFDictionary", +] +CGConvertColorDataWithFormat = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFDictionary", +] +CGDataConsumer = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFData", + "objc2-core-foundation?/CFURL", +] +CGDataProvider = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFData", + "objc2-core-foundation?/CFURL", +] +CGDirectDisplay = [ + "bitflags", + "objc2-core-foundation?/CFArray", + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFDictionary", +] +CGDirectDisplayMetal = ["objc2-metal?/MTLDevice"] +CGDirectPalette = [] +CGDisplayConfiguration = [ + "bitflags", + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFDictionary", +] +CGDisplayFade = [] +CGDisplayStream = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFRunLoop", +] +CGError = [] +CGEvent = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFData", + "objc2-core-foundation?/CFMachPort", +] +CGEventSource = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFDate", +] +CGEventTypes = ["bitflags"] +CGFont = [ + "objc2-core-foundation?/CFArray", + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFData", + "objc2-core-foundation?/CFDictionary", +] +CGFunction = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", +] +CGGeometry = [ + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFDictionary", +] +CGGradient = [ + "bitflags", + "objc2-core-foundation?/CFArray", + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", +] +CGImage = [ + "bitflags", + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", +] +CGLayer = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFDictionary", +] +CGPDFArray = ["objc2-core-foundation?/CFCGTypes"] +CGPDFContentStream = ["objc2-core-foundation?/CFArray"] +CGPDFContext = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFData", + "objc2-core-foundation?/CFDictionary", + "objc2-core-foundation?/CFURL", +] +CGPDFDictionary = ["objc2-core-foundation?/CFCGTypes"] +CGPDFDocument = [ + "bitflags", + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFDictionary", + "objc2-core-foundation?/CFURL", +] +CGPDFObject = ["objc2-core-foundation?/CFCGTypes"] +CGPDFOperatorTable = [] +CGPDFPage = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", +] +CGPDFScanner = ["objc2-core-foundation?/CFCGTypes"] +CGPDFStream = ["objc2-core-foundation?/CFData"] +CGPDFString = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFDate", +] +CGPSConverter = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFDictionary", +] +CGPath = [ + "objc2-core-foundation?/CFArray", + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", +] +CGPattern = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", +] +CGRemoteOperation = [ + "bitflags", + "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFDate", + "objc2-core-foundation?/CFMachPort", +] +CGSession = ["objc2-core-foundation?/CFDictionary"] +CGShading = [ + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", +] +CGToneMapping = ["objc2-core-foundation?/CFBase"] +CGWindow = [ + "bitflags", + "objc2-core-foundation?/CFArray", + "objc2-core-foundation?/CFBase", + "objc2-core-foundation?/CFCGTypes", +] +CGWindowLevel = [] +all = [ + "CGAffineTransform", + "CGBase", + "CGBitmapContext", + "CGColor", + "CGColorConversionInfo", + "CGColorSpace", + "CGContext", + "CGConvertColorDataWithFormat", + "CGDataConsumer", + "CGDataProvider", + "CGDirectDisplay", + "CGDirectDisplayMetal", + "CGDirectPalette", + "CGDisplayConfiguration", + "CGDisplayFade", + "CGDisplayStream", + "CGError", + "CGEvent", + "CGEventSource", + "CGEventTypes", + "CGFont", + "CGFunction", + "CGGeometry", + "CGGradient", + "CGImage", + "CGLayer", + "CGPDFArray", + "CGPDFContentStream", + "CGPDFContext", + "CGPDFDictionary", + "CGPDFDocument", + "CGPDFObject", + "CGPDFOperatorTable", + "CGPDFPage", + "CGPDFScanner", + "CGPDFStream", + "CGPDFString", + "CGPSConverter", + "CGPath", + "CGPattern", + "CGRemoteOperation", + "CGSession", + "CGShading", + "CGToneMapping", + "CGWindow", + "CGWindowLevel", + "bitflags", + "block2", + "libc", + "objc2-core-foundation", + "objc2-metal", +] diff --git a/framework-crates/objc2-core-graphics/README.md b/framework-crates/objc2-core-graphics/README.md new file mode 100644 index 000000000..c803ebe36 --- /dev/null +++ b/framework-crates/objc2-core-graphics/README.md @@ -0,0 +1,14 @@ +# `objc2-core-graphics` + +[![Latest version](https://badgen.net/crates/v/objc2-core-graphics)](https://crates.io/crates/objc2-core-graphics) +[![License](https://badgen.net/badge/license/MIT/blue)](../LICENSE.txt) +[![Documentation](https://docs.rs/objc2-core-graphics/badge.svg)](https://docs.rs/objc2-core-graphics/) +[![CI](https://github.com/madsmtm/objc2/actions/workflows/ci.yml/badge.svg)](https://github.com/madsmtm/objc2/actions/workflows/ci.yml) + +Rust bindings to Apple's framework CoreGraphics. + +This README is kept intentionally small to consolidate the documentation, see +[the Rust docs](https://docs.rs/objc2-core-graphics/) for more details on this crate. + +This crate is part of the [`objc2` project](https://github.com/madsmtm/objc2), +see that for related crates. diff --git a/framework-crates/objc2-core-graphics/src/generated b/framework-crates/objc2-core-graphics/src/generated new file mode 120000 index 000000000..e6080a65d --- /dev/null +++ b/framework-crates/objc2-core-graphics/src/generated @@ -0,0 +1 @@ +../../../generated/CoreGraphics \ No newline at end of file diff --git a/framework-crates/objc2-core-graphics/src/lib.rs b/framework-crates/objc2-core-graphics/src/lib.rs new file mode 100644 index 000000000..f63e10ea1 --- /dev/null +++ b/framework-crates/objc2-core-graphics/src/lib.rs @@ -0,0 +1,35 @@ +//! # Bindings to the `CoreGraphics` framework +//! +//! See [Apple's docs][apple-doc] and [the general docs on framework crates][framework-crates] for more information. +//! +//! [apple-doc]: https://developer.apple.com/documentation/coregraphics/ +//! [framework-crates]: https://docs.rs/objc2/latest/objc2/topics/about_generated/index.html +#![no_std] +#![cfg_attr(docsrs, feature(doc_auto_cfg))] +// Update in Cargo.toml as well. +#![doc(html_root_url = "https://docs.rs/objc2-core-graphics/0.2.2")] + +#[cfg(feature = "alloc")] +extern crate alloc; + +#[cfg(feature = "std")] +extern crate std; + +mod generated; +#[allow(unused_imports, unreachable_pub)] +pub use self::generated::*; + +/// [Apple's documentation](https://developer.apple.com/documentation/coregraphics/kcgfontindexmax?language=objc) +#[allow(non_upper_case_globals)] +#[cfg(feature = "CGFont")] +pub static kCGFontIndexMax: CGFontIndex = ((1u32 << 16) - 2) as CGFontIndex; + +/// [Apple's documentation](https://developer.apple.com/documentation/coregraphics/kcgfontindexinvalid?language=objc) +#[allow(non_upper_case_globals)] +#[cfg(feature = "CGFont")] +pub static kCGFontIndexInvalid: CGFontIndex = ((1u32 << 16) - 1) as CGFontIndex; + +#[allow(dead_code)] +pub(crate) type UniCharCount = core::ffi::c_ulong; +#[allow(dead_code)] +pub(crate) type UniChar = u16; diff --git a/framework-crates/objc2-core-graphics/translation-config.toml b/framework-crates/objc2-core-graphics/translation-config.toml new file mode 100644 index 000000000..1d83bff42 --- /dev/null +++ b/framework-crates/objc2-core-graphics/translation-config.toml @@ -0,0 +1,40 @@ +framework = "CoreGraphics" +crate = "objc2-core-graphics" +required-dependencies = [] +custom-lib-rs = true +macos = "10.8" +maccatalyst = "13.0" +ios = "2.0" +tvos = "9.0" +watchos = "2.0" +visionos = "1.0" + +# Needs dispatch_queue_t from libdispatch +fn.CGDisplayStreamCreateWithDispatchQueue.skipped = true + +# CF_RELEASES_ARGUMENT / cf_consumed, requires manual handling +fn.CGColorSpaceRelease.skipped = true + +# CoreGraphics defines this for some reason? +typedef.IOSurfaceRef.skipped = true + +# Needs IOSurfaceRef from IOSurface +typedef.CGDisplayStreamFrameAvailableHandler.skipped = true +fn.CGDisplayStreamCreate.skipped = true + +# Needs io_service_t from the kernel +fn.CGDisplayIOServicePort.skipped = true + +# Needs std::ffi::VaList, currently unstable +fn.CGColorConversionInfoCreateFromListWithArguments.skipped = true + +# Unknown how to handle the calling convention here? +fn.CGColorSpaceCreateCalibratedGray.skipped = true +fn.CGColorSpaceCreateCalibratedRGB.skipped = true +fn.CGColorSpaceCreateLab.skipped = true +fn.CGFontCreatePostScriptSubset.skipped = true +fn.CGFontCreatePostScriptEncoding.skipped = true + +# Calculation of these constants overflow, so we must use a larger type. +static.kCGFontIndexMax.skipped = true +static.kCGFontIndexInvalid.skipped = true diff --git a/framework-crates/objc2-core-image/Cargo.toml b/framework-crates/objc2-core-image/Cargo.toml index 5920b90ee..c1c2d5db2 100644 --- a/framework-crates/objc2-core-image/Cargo.toml +++ b/framework-crates/objc2-core-image/Cargo.toml @@ -19,6 +19,7 @@ workspace = true block2 = { path = "../../crates/block2", version = "0.5.1", default-features = false, optional = true } objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false } objc2-core-foundation = { path = "../objc2-core-foundation", version = "0.2.2", default-features = false, optional = true } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } objc2-core-video = { path = "../objc2-core-video", version = "0.2.2", default-features = false, optional = true } objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-features = false } objc2-metal = { path = "../objc2-metal", version = "0.2.2", default-features = false, optional = true } @@ -38,18 +39,19 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "block2?/std", "objc2/std", "objc2-core-foundation?/std", "objc2-core-video?/std", "objc2-foundation/std", "objc2-metal?/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-foundation?/alloc", "objc2-core-video?/alloc", "objc2-foundation/alloc", "objc2-metal?/alloc"] +std = ["alloc", "block2?/std", "objc2/std", "objc2-core-foundation?/std", "objc2-core-graphics?/std", "objc2-core-video?/std", "objc2-foundation/std", "objc2-metal?/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-foundation?/alloc", "objc2-core-graphics?/alloc", "objc2-core-video?/alloc", "objc2-foundation/alloc", "objc2-metal?/alloc"] apple = [] gnustep-1-7 = ["objc2/gnustep-1-7", "block2?/gnustep-1-7", "objc2-foundation/gnustep-1-7"] gnustep-1-8 = ["gnustep-1-7", "objc2/gnustep-1-8", "block2?/gnustep-1-8", "objc2-foundation/gnustep-1-8"] gnustep-1-9 = ["gnustep-1-8", "objc2/gnustep-1-9", "block2?/gnustep-1-9", "objc2-foundation/gnustep-1-9"] gnustep-2-0 = ["gnustep-1-9", "objc2/gnustep-2-0", "block2?/gnustep-2-0", "objc2-foundation/gnustep-2-0"] gnustep-2-1 = ["gnustep-2-0", "objc2/gnustep-2-1", "block2?/gnustep-2-1", "objc2-foundation/gnustep-2-1"] -block2 = ["dep:block2", "objc2-core-foundation?/block2", "objc2-core-video?/block2", "objc2-foundation/block2", "objc2-metal?/block2"] -objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-core-video?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation", "objc2-metal?/objc2-core-foundation"] +block2 = ["dep:block2", "objc2-core-foundation?/block2", "objc2-core-graphics?/block2", "objc2-core-video?/block2", "objc2-foundation/block2", "objc2-metal?/block2"] +objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-core-graphics?/objc2-core-foundation", "objc2-core-video?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation", "objc2-metal?/objc2-core-foundation"] +objc2-core-graphics = ["dep:objc2-core-graphics", "objc2-core-video?/objc2-core-graphics"] objc2-core-video = ["dep:objc2-core-video"] -objc2-metal = ["dep:objc2-metal", "objc2-core-video?/objc2-metal"] +objc2-metal = ["dep:objc2-metal", "objc2-core-graphics?/objc2-metal", "objc2-core-video?/objc2-metal"] CIBarcodeDescriptor = [ "objc2-foundation/NSData", @@ -58,11 +60,15 @@ CIBarcodeDescriptor = [ ] CIColor = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColor", + "objc2-core-graphics?/CGColorSpace", "objc2-foundation/NSObject", "objc2-foundation/NSString", ] CIContext = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColorSpace", + "objc2-core-graphics?/CGContext", "objc2-core-video?/CVBuffer", "objc2-core-video?/CVImageBuffer", "objc2-core-video?/CVPixelBuffer", @@ -71,8 +77,12 @@ CIContext = [ "objc2-foundation/NSError", "objc2-foundation/NSString", "objc2-foundation/NSURL", + "objc2-metal?/MTLAllocation", + "objc2-metal?/MTLCommandBuffer", "objc2-metal?/MTLCommandQueue", "objc2-metal?/MTLDevice", + "objc2-metal?/MTLResource", + "objc2-metal?/MTLTexture", ] CIDetector = [ "objc2-foundation/NSArray", @@ -107,6 +117,9 @@ CIFilterShape = [ ] CIImage = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColorSpace", + "objc2-core-graphics?/CGImage", + "objc2-core-graphics?/CGLayer", "objc2-core-video?/CVBuffer", "objc2-core-video?/CVImageBuffer", "objc2-core-video?/CVPixelBuffer", @@ -120,7 +133,10 @@ CIImage = [ "objc2-metal?/MTLResource", "objc2-metal?/MTLTexture", ] -CIImageAccumulator = ["objc2-core-foundation?/CFCGTypes"] +CIImageAccumulator = [ + "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColorSpace", +] CIImageProcessor = [ "objc2-core-foundation?/CFCGTypes", "objc2-core-video?/CVBuffer", @@ -135,9 +151,14 @@ CIImageProcessor = [ "objc2-metal?/MTLResource", "objc2-metal?/MTLTexture", ] -CIImageProvider = ["objc2-foundation/NSString"] +CIImageProvider = [ + "objc2-core-graphics?/CGColorSpace", + "objc2-foundation/NSDictionary", + "objc2-foundation/NSString", +] CIKernel = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColorSpace", "objc2-foundation/NSArray", "objc2-foundation/NSData", "objc2-foundation/NSError", @@ -170,6 +191,7 @@ CIRAWFilter_Deprecated = [ ] CIRenderDestination = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColorSpace", "objc2-core-video?/CVBuffer", "objc2-core-video?/CVImageBuffer", "objc2-core-video?/CVPixelBuffer", @@ -219,6 +241,7 @@ all = [ "CoreImageDefines", "block2", "objc2-core-foundation", + "objc2-core-graphics", "objc2-core-video", "objc2-metal", ] diff --git a/framework-crates/objc2-core-image/translation-config.toml b/framework-crates/objc2-core-image/translation-config.toml index d01ffe386..559ae57e3 100644 --- a/framework-crates/objc2-core-image/translation-config.toml +++ b/framework-crates/objc2-core-image/translation-config.toml @@ -44,66 +44,21 @@ class.CIImage.methods."initWithIOSurface:plane:format:options:".skipped = true class.CIContext.methods."contextWithEAGLContext:".skipped = true class.CIContext.methods."contextWithEAGLContext:options:".skipped = true -# Needs CoreGraphics -class.CIColor.methods."colorWithCGColor:".skipped = true -class.CIColor.methods."colorWithRed:green:blue:alpha:colorSpace:".skipped = true -class.CIColor.methods."colorWithRed:green:blue:colorSpace:".skipped = true -class.CIColor.methods."initWithCGColor:".skipped = true -class.CIColor.methods."initWithRed:green:blue:alpha:colorSpace:".skipped = true -class.CIColor.methods."initWithRed:green:blue:colorSpace:".skipped = true -class.CIContext.methods."contextWithCGLContext:pixelFormat:colorSpace:options:".skipped = true -class.CIContext.methods."contextWithCGLContext:pixelFormat:options:".skipped = true -class.CIContext.methods."contextWithCGContext:options:".skipped = true -class.CIContext.methods.workingColorSpace.skipped = true -class.CIContext.methods."render:toBitmap:rowBytes:bounds:format:colorSpace:".skipped = true -class.CIContext.methods."render:toCVPixelBuffer:bounds:colorSpace:".skipped = true -class.CIContext.methods."render:toMTLTexture:commandBuffer:bounds:colorSpace:".skipped = true -class.CIContext.methods."contextForOfflineGPUAtIndex:colorSpace:options:sharedContext:".skipped = true -class.CIContext.methods."TIFFRepresentationOfImage:format:colorSpace:options:".skipped = true -class.CIContext.methods."JPEGRepresentationOfImage:colorSpace:options:".skipped = true -class.CIContext.methods."HEIFRepresentationOfImage:format:colorSpace:options:".skipped = true -class.CIContext.methods."HEIF10RepresentationOfImage:colorSpace:options:error:".skipped = true -class.CIContext.methods."PNGRepresentationOfImage:format:colorSpace:options:".skipped = true -class.CIContext.methods."writeTIFFRepresentationOfImage:toURL:format:colorSpace:options:error:".skipped = true -class.CIContext.methods."writePNGRepresentationOfImage:toURL:format:colorSpace:options:error:".skipped = true -class.CIContext.methods."writeJPEGRepresentationOfImage:toURL:colorSpace:options:error:".skipped = true -class.CIContext.methods."writeHEIFRepresentationOfImage:toURL:format:colorSpace:options:error:".skipped = true -class.CIContext.methods."writeHEIF10RepresentationOfImage:toURL:colorSpace:options:error:".skipped = true +# Needs CGImagePropertyOrientation from ImageIO class.CIContext.methods."depthBlurEffectFilterForImage:disparityImage:portraitEffectsMatte:orientation:options:".skipped = true class.CIContext.methods."depthBlurEffectFilterForImage:disparityImage:portraitEffectsMatte:hairSemanticSegmentation:orientation:options:".skipped = true class.CIContext.methods."depthBlurEffectFilterForImage:disparityImage:portraitEffectsMatte:hairSemanticSegmentation:glassesMatte:gainMap:orientation:options:".skipped = true -class.CIFilterShape.methods."transformBy:interior:".skipped = true -class.CIImage.methods."imageWithCGImage:".skipped = true -class.CIImage.methods."imageWithCGImage:options:".skipped = true -class.CIImage.methods."imageWithCGImageSource:index:options:".skipped = true -class.CIImage.methods."imageWithCGLayer:".skipped = true -class.CIImage.methods."imageWithCGLayer:options:".skipped = true -class.CIImage.methods."imageWithBitmapData:bytesPerRow:size:format:colorSpace:".skipped = true -class.CIImage.methods."imageWithTexture:size:flipped:colorSpace:".skipped = true -class.CIImage.methods."initWithCGImage:".skipped = true -class.CIImage.methods."initWithCGImage:options:".skipped = true -class.CIImage.methods."initWithCGImageSource:index:options:".skipped = true -class.CIImage.methods."initWithCGLayer:".skipped = true -class.CIImage.methods."initWithCGLayer:options:".skipped = true -class.CIImage.methods."initWithBitmapData:bytesPerRow:size:format:colorSpace:".skipped = true -class.CIImage.methods."initWithTexture:size:flipped:colorSpace:".skipped = true -class.CIImage.methods."imageByApplyingTransform:".skipped = true -class.CIImage.methods."imageByApplyingTransform:highQualityDownsample:".skipped = true class.CIImage.methods."imageTransformForOrientation:".skipped = true class.CIImage.methods."imageByApplyingCGOrientation:".skipped = true class.CIImage.methods."imageTransformForCGOrientation:".skipped = true -class.CIImage.methods."imageByColorMatchingColorSpaceToWorkingSpace:".skipped = true -class.CIImage.methods."imageByColorMatchingWorkingSpaceToColorSpace:".skipped = true -class.CIImage.methods.CGImage.skipped = true -class.CIImageAccumulator.methods."imageAccumulatorWithExtent:format:colorSpace:".skipped = true -class.CIImageAccumulator.methods."initWithExtent:format:colorSpace:".skipped = true -class.CIImage.methods."imageWithImageProvider:size::format:colorSpace:options:".skipped = true -class.CIImage.methods."initWithImageProvider:size::format:colorSpace:options:".skipped = true -class.CIBlendKernel.methods."applyWithForeground:background:colorSpace:".skipped = true class.CIRAWFilter.methods.orientation.skipped = true class.CIRAWFilter.methods."setOrientation:".skipped = true -class.CIRenderDestination.methods.colorSpace.skipped = true -class.CIRenderDestination.methods."setColorSpace:".skipped = true -class.CIVector.methods."vectorWithCGAffineTransform:".skipped = true -class.CIVector.methods."initWithCGAffineTransform:".skipped = true -class.CIVector.methods.CGAffineTransformValue.skipped = true + +# Needs CGImageSourceRef from ImageIO +class.CIImage.methods."imageWithCGImageSource:index:options:".skipped = true +class.CIImage.methods."initWithCGImageSource:index:options:".skipped = true + +# Needs CGLContextObj from OpenGL +class.CIContext.methods."contextWithCGLContext:pixelFormat:colorSpace:options:".skipped = true +class.CIContext.methods."contextWithCGLContext:pixelFormat:options:".skipped = true +class.CIContext.methods."contextForOfflineGPUAtIndex:colorSpace:options:sharedContext:".skipped = true diff --git a/framework-crates/objc2-core-ml/Cargo.toml b/framework-crates/objc2-core-ml/Cargo.toml index 47a25681a..373e268d6 100644 --- a/framework-crates/objc2-core-ml/Cargo.toml +++ b/framework-crates/objc2-core-ml/Cargo.toml @@ -19,6 +19,7 @@ workspace = true bitflags = { version = "2.5.0", default-features = false, optional = true } block2 = { path = "../../crates/block2", version = "0.5.1", default-features = false, optional = true } objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } objc2-core-video = { path = "../objc2-core-video", version = "0.2.2", default-features = false, optional = true } objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-features = false } @@ -41,12 +42,13 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "bitflags?/std", "block2?/std", "objc2/std", "objc2-core-video?/std", "objc2-foundation/std", "objc2-metal?/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-video?/alloc", "objc2-foundation/alloc", "objc2-metal?/alloc"] -bitflags = ["dep:bitflags", "objc2-core-video?/bitflags", "objc2-foundation/bitflags", "objc2-metal?/bitflags"] -block2 = ["dep:block2", "objc2-core-video?/block2", "objc2-foundation/block2", "objc2-metal?/block2"] +std = ["alloc", "bitflags?/std", "block2?/std", "objc2/std", "objc2-core-graphics?/std", "objc2-core-video?/std", "objc2-foundation/std", "objc2-metal?/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-graphics?/alloc", "objc2-core-video?/alloc", "objc2-foundation/alloc", "objc2-metal?/alloc"] +bitflags = ["dep:bitflags", "objc2-core-graphics?/bitflags", "objc2-core-video?/bitflags", "objc2-foundation/bitflags", "objc2-metal?/bitflags"] +block2 = ["dep:block2", "objc2-core-graphics?/block2", "objc2-core-video?/block2", "objc2-foundation/block2", "objc2-metal?/block2"] +objc2-core-graphics = ["dep:objc2-core-graphics", "objc2-core-video?/objc2-core-graphics"] objc2-core-video = ["dep:objc2-core-video"] -objc2-metal = ["dep:objc2-metal", "objc2-core-video?/objc2-metal"] +objc2-metal = ["dep:objc2-metal", "objc2-core-graphics?/objc2-metal", "objc2-core-video?/objc2-metal"] MLAllComputeDevices = ["objc2-foundation/NSArray"] MLArrayBatchProvider = [ @@ -110,6 +112,7 @@ MLFeatureValue = [ "objc2-foundation/NSValue", ] MLFeatureValue_MLImageConversion = [ + "objc2-core-graphics?/CGImage", "objc2-foundation/NSDictionary", "objc2-foundation/NSError", "objc2-foundation/NSString", @@ -348,6 +351,7 @@ all = [ "MLWritable", "bitflags", "block2", + "objc2-core-graphics", "objc2-core-video", "objc2-metal", ] diff --git a/framework-crates/objc2-core-ml/translation-config.toml b/framework-crates/objc2-core-ml/translation-config.toml index 5d8fda049..f1576685c 100644 --- a/framework-crates/objc2-core-ml/translation-config.toml +++ b/framework-crates/objc2-core-ml/translation-config.toml @@ -8,9 +8,7 @@ tvos = "11.0" watchos = "4.0" visionos = "1.0" -# Needs CoreGraphics -class.MLFeatureValue.methods."featureValueWithCGImage:pixelsWide:pixelsHigh:pixelFormatType:options:error:".skipped = true -class.MLFeatureValue.methods."featureValueWithCGImage:constraint:options:error:".skipped = true +# Needs CGImagePropertyOrientation from ImageIO class.MLFeatureValue.methods."featureValueWithCGImage:orientation:pixelsWide:pixelsHigh:pixelFormatType:options:error:".skipped = true class.MLFeatureValue.methods."featureValueWithCGImage:orientation:constraint:options:error:".skipped = true class.MLFeatureValue.methods."featureValueWithImageAtURL:orientation:pixelsWide:pixelsHigh:pixelFormatType:options:error:".skipped = true diff --git a/framework-crates/objc2-core-video/Cargo.toml b/framework-crates/objc2-core-video/Cargo.toml index 98dbcb47c..84d4d1e66 100644 --- a/framework-crates/objc2-core-video/Cargo.toml +++ b/framework-crates/objc2-core-video/Cargo.toml @@ -20,6 +20,7 @@ bitflags = { version = "2.5.0", default-features = false, optional = true } block2 = { path = "../../crates/block2", version = "0.5.1", default-features = false, optional = true } objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false } objc2-core-foundation = { path = "../objc2-core-foundation", version = "0.2.2", default-features = false, optional = true } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } [target.'cfg(not(target_os = "watchos"))'.dependencies] objc2-metal = { path = "../objc2-metal", version = "0.2.2", default-features = false, optional = true } @@ -40,23 +41,29 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "bitflags?/std", "block2?/std", "objc2/std", "objc2-core-foundation?/std", "objc2-metal?/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-foundation?/alloc", "objc2-metal?/alloc"] -bitflags = ["dep:bitflags", "objc2-core-foundation?/bitflags", "objc2-metal?/bitflags"] -block2 = ["dep:block2", "objc2-core-foundation?/block2", "objc2-metal?/block2"] -objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-metal?/objc2-core-foundation"] -objc2-metal = ["dep:objc2-metal"] +std = ["alloc", "bitflags?/std", "block2?/std", "objc2/std", "objc2-core-foundation?/std", "objc2-core-graphics?/std", "objc2-metal?/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-foundation?/alloc", "objc2-core-graphics?/alloc", "objc2-metal?/alloc"] +bitflags = ["dep:bitflags", "objc2-core-foundation?/bitflags", "objc2-core-graphics?/bitflags", "objc2-metal?/bitflags"] +block2 = ["dep:block2", "objc2-core-foundation?/block2", "objc2-core-graphics?/block2", "objc2-metal?/block2"] +objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-core-graphics?/objc2-core-foundation", "objc2-metal?/objc2-core-foundation"] +objc2-core-graphics = ["dep:objc2-core-graphics"] +objc2-metal = ["dep:objc2-metal", "objc2-core-graphics?/objc2-metal"] CVBase = ["bitflags"] CVBuffer = [ "objc2-core-foundation?/CFBase", "objc2-core-foundation?/CFDictionary", ] -CVDisplayLink = ["objc2-core-foundation?/CFBase"] +CVDisplayLink = [ + "objc2-core-foundation?/CFBase", + "objc2-core-graphics?/CGDirectDisplay", +] CVHostTime = [] CVImageBuffer = [ "objc2-core-foundation?/CFBase", "objc2-core-foundation?/CFCGTypes", + "objc2-core-foundation?/CFDictionary", + "objc2-core-graphics?/CGColorSpace", ] CVMetalBuffer = [ "objc2-core-foundation?/CFBase", @@ -134,5 +141,6 @@ all = [ "bitflags", "block2", "objc2-core-foundation", + "objc2-core-graphics", "objc2-metal", ] diff --git a/framework-crates/objc2-core-video/translation-config.toml b/framework-crates/objc2-core-video/translation-config.toml index 46c7a7643..88c818146 100644 --- a/framework-crates/objc2-core-video/translation-config.toml +++ b/framework-crates/objc2-core-video/translation-config.toml @@ -33,15 +33,6 @@ fn.CVOpenGLESTextureCacheCreateTextureFromImage.skipped = true fn.CVOpenGLESTextureGetTarget.skipped = true fn.CVOpenGLESTextureGetName.skipped = true -# Needs CoreGraphics -fn.CVDisplayLinkCreateWithOpenGLDisplayMask.skipped = true -fn.CVDisplayLinkCreateWithCGDisplays.skipped = true -fn.CVDisplayLinkCreateWithCGDisplay.skipped = true -fn.CVDisplayLinkSetCurrentCGDisplay.skipped = true -fn.CVDisplayLinkGetCurrentCGDisplay.skipped = true -fn.CVImageBufferGetColorSpace.skipped = true -fn.CVImageBufferCreateColorSpaceFromAttachments.skipped = true - # Needs IOSurfaceRef from IOSurface fn.CVPixelBufferGetIOSurface.skipped = true fn.CVPixelBufferCreateWithIOSurface.skipped = true diff --git a/framework-crates/objc2-event-kit/Cargo.toml b/framework-crates/objc2-event-kit/Cargo.toml index 2ab52cd24..eae7aae09 100644 --- a/framework-crates/objc2-event-kit/Cargo.toml +++ b/framework-crates/objc2-event-kit/Cargo.toml @@ -19,6 +19,7 @@ workspace = true bitflags = { version = "2.5.0", default-features = false, optional = true } block2 = { path = "../../crates/block2", version = "0.5.1", default-features = false, optional = true } objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } objc2-core-location = { path = "../objc2-core-location", version = "0.2.2", default-features = false, optional = true } objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-features = false } objc2-map-kit = { path = "../objc2-map-kit", version = "0.2.2", default-features = false, optional = true } @@ -41,11 +42,12 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "bitflags?/std", "block2?/std", "objc2/std", "objc2-app-kit?/std", "objc2-core-location?/std", "objc2-foundation/std", "objc2-map-kit?/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-app-kit?/alloc", "objc2-core-location?/alloc", "objc2-foundation/alloc", "objc2-map-kit?/alloc"] -bitflags = ["dep:bitflags", "objc2-app-kit?/bitflags", "objc2-foundation/bitflags", "objc2-map-kit?/bitflags"] -block2 = ["dep:block2", "objc2-app-kit?/block2", "objc2-core-location?/block2", "objc2-foundation/block2", "objc2-map-kit?/block2"] +std = ["alloc", "bitflags?/std", "block2?/std", "objc2/std", "objc2-app-kit?/std", "objc2-core-graphics?/std", "objc2-core-location?/std", "objc2-foundation/std", "objc2-map-kit?/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-app-kit?/alloc", "objc2-core-graphics?/alloc", "objc2-core-location?/alloc", "objc2-foundation/alloc", "objc2-map-kit?/alloc"] +bitflags = ["dep:bitflags", "objc2-app-kit?/bitflags", "objc2-core-graphics?/bitflags", "objc2-foundation/bitflags", "objc2-map-kit?/bitflags"] +block2 = ["dep:block2", "objc2-app-kit?/block2", "objc2-core-graphics?/block2", "objc2-core-location?/block2", "objc2-foundation/block2", "objc2-map-kit?/block2"] objc2-app-kit = ["dep:objc2-app-kit", "objc2-map-kit?/objc2-app-kit"] +objc2-core-graphics = ["dep:objc2-core-graphics", "objc2-app-kit?/objc2-core-graphics", "objc2-map-kit?/objc2-core-graphics"] objc2-core-location = ["dep:objc2-core-location", "objc2-map-kit?/objc2-core-location"] objc2-map-kit = ["dep:objc2-map-kit"] @@ -57,6 +59,7 @@ EKAlarm = [ ] EKCalendar = [ "objc2-app-kit?/NSColor", + "objc2-core-graphics?/CGColor", "objc2-foundation/NSString", ] EKCalendarItem = [ @@ -146,6 +149,7 @@ all = [ "bitflags", "block2", "objc2-app-kit", + "objc2-core-graphics", "objc2-core-location", "objc2-map-kit", ] diff --git a/framework-crates/objc2-event-kit/translation-config.toml b/framework-crates/objc2-event-kit/translation-config.toml index 3c1a4aa74..9969b4730 100644 --- a/framework-crates/objc2-event-kit/translation-config.toml +++ b/framework-crates/objc2-event-kit/translation-config.toml @@ -10,9 +10,5 @@ visionos = "1.0" # CF_RETURNS_NOT_RETAINED class.EKParticipant.methods."ABRecordWithAddressBook:".skipped = true -# Needs `CGColorRef` -class.EKCalendar.methods.CGColor.skipped = true -class.EKCalendar.methods."setCGColor:".skipped = true - # Needs the `AddressBook` framework class.EKParticipant.methods."ABPersonInAddressBook:".skipped = true diff --git a/framework-crates/objc2-map-kit/Cargo.toml b/framework-crates/objc2-map-kit/Cargo.toml index 3497a6593..23c12062b 100644 --- a/framework-crates/objc2-map-kit/Cargo.toml +++ b/framework-crates/objc2-map-kit/Cargo.toml @@ -20,6 +20,7 @@ bitflags = { version = "2.5.0", default-features = false, optional = true } block2 = { path = "../../crates/block2", version = "0.5.1", default-features = false, optional = true } objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false } objc2-core-foundation = { path = "../objc2-core-foundation", version = "0.2.2", default-features = false, optional = true } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } objc2-core-location = { path = "../objc2-core-location", version = "0.2.2", default-features = false, optional = true } objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-features = false } @@ -45,13 +46,14 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "bitflags?/std", "block2?/std", "objc2/std", "objc2-app-kit?/std", "objc2-contacts?/std", "objc2-core-foundation?/std", "objc2-core-location?/std", "objc2-foundation/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-app-kit?/alloc", "objc2-contacts?/alloc", "objc2-core-foundation?/alloc", "objc2-core-location?/alloc", "objc2-foundation/alloc"] -bitflags = ["dep:bitflags", "objc2-app-kit?/bitflags", "objc2-core-foundation?/bitflags", "objc2-foundation/bitflags"] -block2 = ["dep:block2", "objc2-app-kit?/block2", "objc2-contacts?/block2", "objc2-core-foundation?/block2", "objc2-core-location?/block2", "objc2-foundation/block2"] +std = ["alloc", "bitflags?/std", "block2?/std", "objc2/std", "objc2-app-kit?/std", "objc2-contacts?/std", "objc2-core-foundation?/std", "objc2-core-graphics?/std", "objc2-core-location?/std", "objc2-foundation/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-app-kit?/alloc", "objc2-contacts?/alloc", "objc2-core-foundation?/alloc", "objc2-core-graphics?/alloc", "objc2-core-location?/alloc", "objc2-foundation/alloc"] +bitflags = ["dep:bitflags", "objc2-app-kit?/bitflags", "objc2-core-foundation?/bitflags", "objc2-core-graphics?/bitflags", "objc2-foundation/bitflags"] +block2 = ["dep:block2", "objc2-app-kit?/block2", "objc2-contacts?/block2", "objc2-core-foundation?/block2", "objc2-core-graphics?/block2", "objc2-core-location?/block2", "objc2-foundation/block2"] objc2-app-kit = ["dep:objc2-app-kit"] objc2-contacts = ["dep:objc2-contacts", "objc2-core-location?/objc2-contacts"] -objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-app-kit?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation"] +objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-app-kit?/objc2-core-foundation", "objc2-core-graphics?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation"] +objc2-core-graphics = ["dep:objc2-core-graphics", "objc2-app-kit?/objc2-core-graphics"] objc2-core-location = ["dep:objc2-core-location"] MKAddressFilter = [ @@ -285,10 +287,15 @@ MKOverlay = ["objc2-core-location?/CLLocation"] MKOverlayPathRenderer = [ "objc2-app-kit?/NSColor", "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGContext", + "objc2-core-graphics?/CGPath", "objc2-foundation/NSArray", "objc2-foundation/NSValue", ] -MKOverlayRenderer = ["objc2-core-foundation?/CFCGTypes"] +MKOverlayRenderer = [ + "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGContext", +] MKPinAnnotationView = [ "objc2-app-kit?/NSAccessibilityProtocols", "objc2-app-kit?/NSAnimation", @@ -468,5 +475,6 @@ all = [ "objc2-app-kit", "objc2-contacts", "objc2-core-foundation", + "objc2-core-graphics", "objc2-core-location", ] diff --git a/framework-crates/objc2-map-kit/translation-config.toml b/framework-crates/objc2-map-kit/translation-config.toml index 109afe41b..8baf45ed3 100644 --- a/framework-crates/objc2-map-kit/translation-config.toml +++ b/framework-crates/objc2-map-kit/translation-config.toml @@ -9,39 +9,9 @@ tvos = "9.2" watchos = "2.0" visionos = "1.0" -# Needs `CGRectEdge` -fn.MKMapRectDivide.skipped = true - -# Needs `CGContextRef` -class.MKOverlayRenderer.methods."drawMapRect:zoomScale:inContext:".skipped = true - -# Needs `CGBlendMode` -class.MKOverlayRenderer.methods.blendMode.skipped = true -class.MKOverlayRenderer.methods."setBlendMode:".skipped = true - # Needs `dispatch_queue_t` class.MKMapSnapshotter.methods."startWithQueue:completionHandler:".skipped = true -# Needs `CGLineJoin` -class.MKOverlayPathRenderer.methods.lineJoin.skipped = true -class.MKOverlayPathRenderer.methods."setLineJoin:".skipped = true - -# Needs `CGLineCap` -class.MKOverlayPathRenderer.methods.lineCap.skipped = true -class.MKOverlayPathRenderer.methods."setLineCap:".skipped = true - -# Needs `CGPathRef` -class.MKOverlayPathRenderer.methods.path.skipped = true -class.MKOverlayPathRenderer.methods."setPath:".skipped = true - -# Needs `CGContextRef` -class.MKOverlayPathRenderer.methods."applyStrokePropertiesToContext:atZoomScale:".skipped = true -class.MKOverlayPathRenderer.methods."applyFillPropertiesToContext:atZoomScale:".skipped = true - -# Needs `CGPathRef` and `CGContextRef` -class.MKOverlayPathRenderer.methods."strokePath:inContext:".skipped = true -class.MKOverlayPathRenderer.methods."fillPath:inContext:".skipped = true - # Needs proper support for iOS class.MKMapItemRequest.methods."initWithMapFeatureAnnotation:".skipped = true class.MKMapItemRequest.methods.mapFeatureAnnotation.skipped = true diff --git a/framework-crates/objc2-metal-kit/Cargo.toml b/framework-crates/objc2-metal-kit/Cargo.toml index bbc7dd5c3..ed4feb6f3 100644 --- a/framework-crates/objc2-metal-kit/Cargo.toml +++ b/framework-crates/objc2-metal-kit/Cargo.toml @@ -19,6 +19,7 @@ workspace = true block2 = { path = "../../crates/block2", version = "0.5.1", default-features = false, optional = true } objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false } objc2-core-foundation = { path = "../objc2-core-foundation", version = "0.2.2", default-features = false, optional = true } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-features = false } objc2-metal = { path = "../objc2-metal", version = "0.2.2", default-features = false } objc2-quartz-core = { path = "../objc2-quartz-core", version = "0.2.2", default-features = false, optional = true, features = ["objc2-metal"] } @@ -41,11 +42,12 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "block2?/std", "objc2/std", "objc2-app-kit?/std", "objc2-core-foundation?/std", "objc2-foundation/std", "objc2-metal/std", "objc2-quartz-core?/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-app-kit?/alloc", "objc2-core-foundation?/alloc", "objc2-foundation/alloc", "objc2-metal/alloc", "objc2-quartz-core?/alloc"] -block2 = ["dep:block2", "objc2-app-kit?/block2", "objc2-core-foundation?/block2", "objc2-foundation/block2", "objc2-metal/block2", "objc2-quartz-core?/block2"] +std = ["alloc", "block2?/std", "objc2/std", "objc2-app-kit?/std", "objc2-core-foundation?/std", "objc2-core-graphics?/std", "objc2-foundation/std", "objc2-metal/std", "objc2-quartz-core?/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-app-kit?/alloc", "objc2-core-foundation?/alloc", "objc2-core-graphics?/alloc", "objc2-foundation/alloc", "objc2-metal/alloc", "objc2-quartz-core?/alloc"] +block2 = ["dep:block2", "objc2-app-kit?/block2", "objc2-core-foundation?/block2", "objc2-core-graphics?/block2", "objc2-foundation/block2", "objc2-metal/block2", "objc2-quartz-core?/block2"] objc2-app-kit = ["dep:objc2-app-kit"] -objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-app-kit?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation", "objc2-metal/objc2-core-foundation", "objc2-quartz-core?/objc2-core-foundation"] +objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-app-kit?/objc2-core-foundation", "objc2-core-graphics?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation", "objc2-metal/objc2-core-foundation", "objc2-quartz-core?/objc2-core-foundation"] +objc2-core-graphics = ["dep:objc2-core-graphics", "objc2-app-kit?/objc2-core-graphics", "objc2-quartz-core?/objc2-core-graphics"] objc2-quartz-core = ["dep:objc2-quartz-core", "objc2-app-kit?/objc2-quartz-core"] MTKDefines = [] @@ -63,6 +65,7 @@ MTKModel = [ MTKTextureLoader = [ "objc2-app-kit?/NSGraphics", "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGImage", "objc2-foundation/NSArray", "objc2-foundation/NSBundle", "objc2-foundation/NSData", @@ -84,6 +87,7 @@ MTKView = [ "objc2-app-kit?/NSUserInterfaceItemIdentification", "objc2-app-kit?/NSView", "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColorSpace", "objc2-foundation/NSCoder", "objc2-foundation/NSGeometry", "objc2-foundation/NSObject", @@ -105,5 +109,6 @@ all = [ "block2", "objc2-app-kit", "objc2-core-foundation", + "objc2-core-graphics", "objc2-quartz-core", ] diff --git a/framework-crates/objc2-metal-kit/translation-config.toml b/framework-crates/objc2-metal-kit/translation-config.toml index c28957fe9..028ce826a 100644 --- a/framework-crates/objc2-metal-kit/translation-config.toml +++ b/framework-crates/objc2-metal-kit/translation-config.toml @@ -24,14 +24,6 @@ class.MTKMeshBuffer.methods.type.skipped = true fn.MTKModelIOVertexFormatFromMetal.skipped = true fn.MTKMetalVertexFormatFromModelIO.skipped = true -# Needs `CGImageRef` -class.MTKTextureLoader.methods."newTextureWithCGImage:options:completionHandler:".skipped = true -class.MTKTextureLoader.methods."newTextureWithCGImage:options:error:".skipped = true - -# Needs `CGColorSpaceRef` -class.MTKView.methods.colorspace.skipped = true -class.MTKView.methods."setColorspace:".skipped = true - # Needs `ModelIO` framework class.MTKMesh.methods."initWithMesh:device:error:".skipped = true class.MTKMesh.methods."newMeshesFromAsset:device:sourceMeshes:error:".skipped = true diff --git a/framework-crates/objc2-quartz-core/Cargo.toml b/framework-crates/objc2-quartz-core/Cargo.toml index 86049037f..cee9e6a8e 100644 --- a/framework-crates/objc2-quartz-core/Cargo.toml +++ b/framework-crates/objc2-quartz-core/Cargo.toml @@ -18,8 +18,11 @@ workspace = true [dependencies] bitflags = { version = "2.5.0", default-features = false, optional = true } block2 = { path = "../../crates/block2", version = "0.5.1", default-features = false, optional = true } +libc = { version = "0.2.80", default-features = false, optional = true } objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false } objc2-core-foundation = { path = "../objc2-core-foundation", version = "0.2.2", default-features = false, optional = true } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } +objc2-core-video = { path = "../objc2-core-video", version = "0.2.2", default-features = false, optional = true } objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-features = false } objc2-metal = { path = "../objc2-metal", version = "0.2.2", default-features = false, optional = true } @@ -38,22 +41,26 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "bitflags?/std", "block2?/std", "objc2/std", "objc2-core-foundation?/std", "objc2-foundation/std", "objc2-metal?/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-foundation?/alloc", "objc2-foundation/alloc", "objc2-metal?/alloc"] +std = ["alloc", "bitflags?/std", "block2?/std", "libc?/std", "objc2/std", "objc2-core-foundation?/std", "objc2-core-graphics?/std", "objc2-core-video?/std", "objc2-foundation/std", "objc2-metal?/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-foundation?/alloc", "objc2-core-graphics?/alloc", "objc2-core-video?/alloc", "objc2-foundation/alloc", "objc2-metal?/alloc"] apple = [] gnustep-1-7 = [] gnustep-1-8 = [] gnustep-1-9 = [] gnustep-2-0 = [] gnustep-2-1 = [] -bitflags = ["dep:bitflags", "objc2-core-foundation?/bitflags", "objc2-foundation/bitflags", "objc2-metal?/bitflags"] -block2 = ["dep:block2", "objc2-core-foundation?/block2", "objc2-foundation/block2", "objc2-metal?/block2"] -objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-foundation/objc2-core-foundation", "objc2-metal?/objc2-core-foundation"] -objc2-metal = ["dep:objc2-metal"] +bitflags = ["dep:bitflags", "objc2-core-foundation?/bitflags", "objc2-core-graphics?/bitflags", "objc2-core-video?/bitflags", "objc2-foundation/bitflags", "objc2-metal?/bitflags"] +block2 = ["dep:block2", "objc2-core-foundation?/block2", "objc2-core-graphics?/block2", "objc2-core-video?/block2", "objc2-foundation/block2", "objc2-metal?/block2"] +libc = ["dep:libc", "objc2-core-foundation?/libc", "objc2-core-graphics?/libc", "objc2-foundation/libc"] +objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-core-graphics?/objc2-core-foundation", "objc2-core-video?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation", "objc2-metal?/objc2-core-foundation"] +objc2-core-graphics = ["dep:objc2-core-graphics", "objc2-core-video?/objc2-core-graphics"] +objc2-core-video = ["dep:objc2-core-video"] +objc2-metal = ["dep:objc2-metal", "objc2-core-graphics?/objc2-metal", "objc2-core-video?/objc2-metal"] CAAnimation = [ "objc2-core-foundation?/CFCGTypes", "objc2-core-foundation?/CFDate", + "objc2-core-graphics?/CGPath", "objc2-foundation/NSArray", "objc2-foundation/NSObject", "objc2-foundation/NSString", @@ -78,6 +85,7 @@ CAEDRMetadata = [ ] CAEmitterCell = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColor", "objc2-foundation/NSArray", "objc2-foundation/NSDictionary", "objc2-foundation/NSObject", @@ -101,6 +109,9 @@ CALayer = [ "bitflags", "objc2-core-foundation?/CFCGTypes", "objc2-core-foundation?/CFDate", + "objc2-core-graphics?/CGColor", + "objc2-core-graphics?/CGContext", + "objc2-core-graphics?/CGPath", "objc2-foundation/NSArray", "objc2-foundation/NSDictionary", "objc2-foundation/NSNull", @@ -124,6 +135,7 @@ CAMetalDisplayLink = [ ] CAMetalLayer = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColorSpace", "objc2-foundation/NSDictionary", "objc2-foundation/NSObject", "objc2-metal?/MTLAllocation", @@ -133,18 +145,26 @@ CAMetalLayer = [ "objc2-metal?/MTLResource", "objc2-metal?/MTLTexture", ] -CAOpenGLLayer = [] +CAOpenGLLayer = [ + "objc2-core-graphics?/CGColorSpace", + "objc2-foundation/NSObject", +] CARemoteLayerClient = [] CARemoteLayerServer = [] CARenderer = [ "objc2-core-foundation?/CFCGTypes", "objc2-core-foundation?/CFDate", + "objc2-core-video?/CVBase", "objc2-foundation/NSDictionary", "objc2-foundation/NSString", + "objc2-metal?/MTLAllocation", + "objc2-metal?/MTLResource", + "objc2-metal?/MTLTexture", ] CAReplicatorLayer = [ "objc2-core-foundation?/CFCGTypes", "objc2-core-foundation?/CFDate", + "objc2-core-graphics?/CGColor", "objc2-foundation/NSObject", ] CAScrollLayer = [ @@ -154,13 +174,17 @@ CAScrollLayer = [ ] CAShapeLayer = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColor", + "objc2-core-graphics?/CGPath", "objc2-foundation/NSArray", "objc2-foundation/NSObject", "objc2-foundation/NSString", "objc2-foundation/NSValue", ] CATextLayer = [ + "objc2-core-foundation?/CFBase", "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColor", "objc2-foundation/NSObject", "objc2-foundation/NSString", ] @@ -218,6 +242,9 @@ all = [ "CoreVideo", "bitflags", "block2", + "libc", "objc2-core-foundation", + "objc2-core-graphics", + "objc2-core-video", "objc2-metal", ] diff --git a/framework-crates/objc2-quartz-core/translation-config.toml b/framework-crates/objc2-quartz-core/translation-config.toml index fa4e35260..f9f7724be 100644 --- a/framework-crates/objc2-quartz-core/translation-config.toml +++ b/framework-crates/objc2-quartz-core/translation-config.toml @@ -9,46 +9,13 @@ ios = "2.0" tvos = "9.0" visionos = "1.0" -# Uses stuff from CoreGraphics -class.CAKeyframeAnimation.methods.path.skipped = true -class.CAKeyframeAnimation.methods."setPath:".skipped = true -class.CAShapeLayer.methods.path.skipped = true -class.CAShapeLayer.methods."setPath:".skipped = true -class.CAShapeLayer.methods.fillColor.skipped = true -class.CAShapeLayer.methods."setFillColor:".skipped = true -class.CAShapeLayer.methods.strokeColor.skipped = true -class.CAShapeLayer.methods."setStrokeColor:".skipped = true -class.CAEmitterCell.methods.color.skipped = true -class.CAEmitterCell.methods."setColor:".skipped = true -class.CALayer.methods."drawInContext:".skipped = true -class.CALayer.methods."renderInContext:".skipped = true -class.CALayer.methods.backgroundColor.skipped = true -class.CALayer.methods."setBackgroundColor:".skipped = true -class.CALayer.methods.borderColor.skipped = true -class.CALayer.methods."setBorderColor:".skipped = true -class.CALayer.methods.shadowColor.skipped = true -class.CALayer.methods."setShadowColor:".skipped = true -class.CALayer.methods.shadowPath.skipped = true -class.CALayer.methods."setShadowPath:".skipped = true -protocol.CALayerDelegate.methods."drawLayer:inContext:".skipped = true - -# Needs `CGColorSpaceRef` -class.CAMetalLayer.methods.colorspace.skipped = true -class.CAMetalLayer.methods."setColorspace:".skipped = true -class.CAOpenGLLayer.skipped = true -class.CARenderer.methods."rendererWithMTLTexture:options:".skipped = true -class.CARenderer.methods."setDestination:".skipped = true -class.CARenderer.methods."beginFrameAtTime:timeStamp:".skipped = true -class.CARemoteLayerClient.methods."initWithServerPort:".skipped = true -class.CARemoteLayerServer.methods.serverPort.skipped = true -class.CAReplicatorLayer.methods.instanceColor.skipped = true -class.CAReplicatorLayer.methods."setInstanceColor:".skipped = true -class.CATextLayer.methods.font.skipped = true -class.CATextLayer.methods."setFont:".skipped = true -class.CATextLayer.methods.foregroundColor.skipped = true -class.CATextLayer.methods."setForegroundColor:".skipped = true -fn.CATransform3DMakeAffineTransform.skipped = true -fn.CATransform3DGetAffineTransform.skipped = true +# Needs CGLContextObj from OpenGL +class.CAOpenGLLayer.methods."canDrawInCGLContext:pixelFormat:forLayerTime:displayTime:".skipped = true +class.CAOpenGLLayer.methods."drawInCGLContext:pixelFormat:forLayerTime:displayTime:".skipped = true +class.CAOpenGLLayer.methods."copyCGLPixelFormatForDisplayMask:".skipped = true +class.CAOpenGLLayer.methods."releaseCGLPixelFormat:".skipped = true +class.CAOpenGLLayer.methods."copyCGLContextForPixelFormat:".skipped = true +class.CAOpenGLLayer.methods."releaseCGLContext:".skipped = true # I'm unsure of the ABI of the array this takes class.CAMediaTimingFunction.methods."getControlPointAtIndex:values:".skipped = true diff --git a/framework-crates/objc2-screen-capture-kit/Cargo.toml b/framework-crates/objc2-screen-capture-kit/Cargo.toml index 7dc5bdf65..3768a6981 100644 --- a/framework-crates/objc2-screen-capture-kit/Cargo.toml +++ b/framework-crates/objc2-screen-capture-kit/Cargo.toml @@ -21,6 +21,7 @@ block2 = { path = "../../crates/block2", version = "0.5.1", default-features = f libc = { version = "0.2.80", default-features = false, optional = true } objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false } objc2-core-foundation = { path = "../objc2-core-foundation", version = "0.2.2", default-features = false, optional = true } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-features = false } [package.metadata.docs.rs] @@ -35,12 +36,13 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "bitflags?/std", "block2?/std", "libc?/std", "objc2/std", "objc2-core-foundation?/std", "objc2-foundation/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-foundation?/alloc", "objc2-foundation/alloc"] -bitflags = ["dep:bitflags", "objc2-core-foundation?/bitflags", "objc2-foundation/bitflags"] -block2 = ["dep:block2", "objc2-core-foundation?/block2", "objc2-foundation/block2"] -libc = ["dep:libc", "objc2-core-foundation?/libc", "objc2-foundation/libc"] -objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-foundation/objc2-core-foundation"] +std = ["alloc", "bitflags?/std", "block2?/std", "libc?/std", "objc2/std", "objc2-core-foundation?/std", "objc2-core-graphics?/std", "objc2-foundation/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-foundation?/alloc", "objc2-core-graphics?/alloc", "objc2-foundation/alloc"] +bitflags = ["dep:bitflags", "objc2-core-foundation?/bitflags", "objc2-core-graphics?/bitflags", "objc2-foundation/bitflags"] +block2 = ["dep:block2", "objc2-core-foundation?/block2", "objc2-core-graphics?/block2", "objc2-foundation/block2"] +libc = ["dep:libc", "objc2-core-foundation?/libc", "objc2-core-graphics?/libc", "objc2-foundation/libc"] +objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-core-graphics?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation"] +objc2-core-graphics = ["dep:objc2-core-graphics"] SCContentSharingPicker = [ "bitflags", @@ -54,15 +56,22 @@ SCRecordingOutput = [ "objc2-foundation/NSError", "objc2-foundation/NSURL", ] -SCScreenshotManager = [] +SCScreenshotManager = [ + "objc2-core-graphics?/CGImage", + "objc2-foundation/NSError", +] SCShareableContent = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGDirectDisplay", + "objc2-core-graphics?/CGWindow", "objc2-foundation/NSArray", "objc2-foundation/NSError", "objc2-foundation/NSString", ] SCStream = [ + "objc2-core-foundation?/CFBase", "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColor", "objc2-foundation/NSArray", "objc2-foundation/NSError", "objc2-foundation/NSString", @@ -78,4 +87,5 @@ all = [ "block2", "libc", "objc2-core-foundation", + "objc2-core-graphics", ] diff --git a/framework-crates/objc2-screen-capture-kit/translation-config.toml b/framework-crates/objc2-screen-capture-kit/translation-config.toml index f0c676f27..ad610bd9d 100644 --- a/framework-crates/objc2-screen-capture-kit/translation-config.toml +++ b/framework-crates/objc2-screen-capture-kit/translation-config.toml @@ -21,14 +21,3 @@ class.SCStreamConfiguration.methods.minimumFrameInterval.skipped = true class.SCStreamConfiguration.methods."setMinimumFrameInterval:".skipped = true class.SCStream.methods.synchronizationClock.skipped = true protocol.SCStreamOutput.methods."stream:didOutputSampleBuffer:ofType:".skipped = true - -# Needs CoreGraphics -class.SCScreenshotManager.methods."captureImageWithFilter:configuration:completionHandler:".skipped = true -class.SCWindow.methods.windowID.skipped = true -class.SCDisplay.methods.displayID.skipped = true -class.SCStreamConfiguration.methods.backgroundColor.skipped = true -class.SCStreamConfiguration.methods."setBackgroundColor:".skipped = true -class.SCStreamConfiguration.methods.colorMatrix.skipped = true -class.SCStreamConfiguration.methods."setColorMatrix:".skipped = true -class.SCStreamConfiguration.methods.colorSpaceName.skipped = true -class.SCStreamConfiguration.methods."setColorSpaceName:".skipped = true diff --git a/framework-crates/objc2-sensitive-content-analysis/Cargo.toml b/framework-crates/objc2-sensitive-content-analysis/Cargo.toml index be984da0a..5ee789087 100644 --- a/framework-crates/objc2-sensitive-content-analysis/Cargo.toml +++ b/framework-crates/objc2-sensitive-content-analysis/Cargo.toml @@ -18,6 +18,7 @@ workspace = true [dependencies] block2 = { path = "../../crates/block2", version = "0.5.1", default-features = false, optional = true } objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-features = false } [package.metadata.docs.rs] @@ -34,11 +35,13 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "block2?/std", "objc2/std", "objc2-foundation/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-foundation/alloc"] -block2 = ["dep:block2", "objc2-foundation/block2"] +std = ["alloc", "block2?/std", "objc2/std", "objc2-core-graphics?/std", "objc2-foundation/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-graphics?/alloc", "objc2-foundation/alloc"] +block2 = ["dep:block2", "objc2-core-graphics?/block2", "objc2-foundation/block2"] +objc2-core-graphics = ["dep:objc2-core-graphics"] SCSensitivityAnalyzer = [ + "objc2-core-graphics?/CGImage", "objc2-foundation/NSError", "objc2-foundation/NSProgress", "objc2-foundation/NSURL", @@ -46,4 +49,5 @@ SCSensitivityAnalyzer = [ all = [ "SCSensitivityAnalyzer", "block2", + "objc2-core-graphics", ] diff --git a/framework-crates/objc2-sensitive-content-analysis/translation-config.toml b/framework-crates/objc2-sensitive-content-analysis/translation-config.toml index bb2085419..d4a5f2638 100644 --- a/framework-crates/objc2-sensitive-content-analysis/translation-config.toml +++ b/framework-crates/objc2-sensitive-content-analysis/translation-config.toml @@ -4,6 +4,3 @@ required-dependencies = ["objc2-foundation"] macos = "14.0" maccatalyst = "17.0" ios = "17.0" - -# Needs `CGImageRef` from CoreGraphics -class.SCSensitivityAnalyzer.methods."analyzeCGImage:completionHandler:".skipped = true diff --git a/framework-crates/objc2-ui-kit/Cargo.toml b/framework-crates/objc2-ui-kit/Cargo.toml index 37690ce77..ba6216df3 100644 --- a/framework-crates/objc2-ui-kit/Cargo.toml +++ b/framework-crates/objc2-ui-kit/Cargo.toml @@ -22,6 +22,7 @@ objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = fal objc2-cloud-kit = { path = "../objc2-cloud-kit", version = "0.2.2", default-features = false, optional = true } objc2-core-data = { path = "../objc2-core-data", version = "0.2.2", default-features = false, optional = true } objc2-core-foundation = { path = "../objc2-core-foundation", version = "0.2.2", default-features = false, optional = true } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } objc2-core-location = { path = "../objc2-core-location", version = "0.2.2", default-features = false, optional = true } objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-features = false } objc2-symbols = { path = "../objc2-symbols", version = "0.2.2", default-features = false, optional = true } @@ -47,13 +48,14 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "bitflags?/std", "block2?/std", "objc2/std", "objc2-cloud-kit?/std", "objc2-core-data?/std", "objc2-core-foundation?/std", "objc2-core-image?/std", "objc2-core-location?/std", "objc2-foundation/std", "objc2-quartz-core?/std", "objc2-symbols?/std", "objc2-uniform-type-identifiers?/std", "objc2-user-notifications?/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-cloud-kit?/alloc", "objc2-core-data?/alloc", "objc2-core-foundation?/alloc", "objc2-core-image?/alloc", "objc2-core-location?/alloc", "objc2-foundation/alloc", "objc2-quartz-core?/alloc", "objc2-symbols?/alloc", "objc2-uniform-type-identifiers?/alloc", "objc2-user-notifications?/alloc"] -bitflags = ["dep:bitflags", "objc2-cloud-kit?/bitflags", "objc2-core-data?/bitflags", "objc2-core-foundation?/bitflags", "objc2-foundation/bitflags", "objc2-quartz-core?/bitflags", "objc2-user-notifications?/bitflags"] -block2 = ["dep:block2", "objc2-cloud-kit?/block2", "objc2-core-data?/block2", "objc2-core-foundation?/block2", "objc2-core-image?/block2", "objc2-core-location?/block2", "objc2-foundation/block2", "objc2-quartz-core?/block2", "objc2-uniform-type-identifiers?/block2", "objc2-user-notifications?/block2"] +std = ["alloc", "bitflags?/std", "block2?/std", "objc2/std", "objc2-cloud-kit?/std", "objc2-core-data?/std", "objc2-core-foundation?/std", "objc2-core-graphics?/std", "objc2-core-image?/std", "objc2-core-location?/std", "objc2-foundation/std", "objc2-quartz-core?/std", "objc2-symbols?/std", "objc2-uniform-type-identifiers?/std", "objc2-user-notifications?/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-cloud-kit?/alloc", "objc2-core-data?/alloc", "objc2-core-foundation?/alloc", "objc2-core-graphics?/alloc", "objc2-core-image?/alloc", "objc2-core-location?/alloc", "objc2-foundation/alloc", "objc2-quartz-core?/alloc", "objc2-symbols?/alloc", "objc2-uniform-type-identifiers?/alloc", "objc2-user-notifications?/alloc"] +bitflags = ["dep:bitflags", "objc2-cloud-kit?/bitflags", "objc2-core-data?/bitflags", "objc2-core-foundation?/bitflags", "objc2-core-graphics?/bitflags", "objc2-foundation/bitflags", "objc2-quartz-core?/bitflags", "objc2-user-notifications?/bitflags"] +block2 = ["dep:block2", "objc2-cloud-kit?/block2", "objc2-core-data?/block2", "objc2-core-foundation?/block2", "objc2-core-graphics?/block2", "objc2-core-image?/block2", "objc2-core-location?/block2", "objc2-foundation/block2", "objc2-quartz-core?/block2", "objc2-uniform-type-identifiers?/block2", "objc2-user-notifications?/block2"] objc2-cloud-kit = ["dep:objc2-cloud-kit"] objc2-core-data = ["dep:objc2-core-data"] -objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-core-image?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation", "objc2-quartz-core?/objc2-core-foundation"] +objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-core-graphics?/objc2-core-foundation", "objc2-core-image?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation", "objc2-quartz-core?/objc2-core-foundation"] +objc2-core-graphics = ["dep:objc2-core-graphics", "objc2-core-image?/objc2-core-graphics", "objc2-quartz-core?/objc2-core-graphics"] objc2-core-image = ["dep:objc2-core-image"] objc2-core-location = ["dep:objc2-core-location", "objc2-cloud-kit?/objc2-core-location", "objc2-user-notifications?/objc2-core-location"] objc2-quartz-core = ["dep:objc2-quartz-core"] @@ -119,11 +121,15 @@ NSLayoutConstraint = [ NSLayoutManager = [ "bitflags", "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGContext", + "objc2-core-graphics?/CGFont", "objc2-foundation/NSArray", "objc2-foundation/NSAttributedString", "objc2-foundation/NSCoder", + "objc2-foundation/NSDictionary", "objc2-foundation/NSObject", "objc2-foundation/NSRange", + "objc2-foundation/NSString", ] NSParagraphStyle = [ "bitflags", @@ -181,6 +187,7 @@ NSTextElement = [ NSTextLayoutFragment = [ "bitflags", "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGContext", "objc2-foundation/NSArray", "objc2-foundation/NSCoder", "objc2-foundation/NSObject", @@ -199,6 +206,7 @@ NSTextLayoutManager = [ ] NSTextLineFragment = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGContext", "objc2-foundation/NSAttributedString", "objc2-foundation/NSCoder", "objc2-foundation/NSDictionary", @@ -434,6 +442,8 @@ UIBarItem = [ UIBehavioralStyle = [] UIBezierPath = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGContext", + "objc2-core-graphics?/CGPath", "objc2-foundation/NSCoder", "objc2-foundation/NSObject", ] @@ -579,6 +589,7 @@ UICollisionBehavior = [ ] UIColor = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGColor", "objc2-core-image?/CIColor", "objc2-foundation/NSBundle", "objc2-foundation/NSItemProvider", @@ -913,6 +924,7 @@ UIGestureRecognizer = [ UIGestureRecognizerSubclass = ["objc2-foundation/NSSet"] UIGraphics = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGContext", "objc2-foundation/NSData", "objc2-foundation/NSDictionary", "objc2-foundation/NSString", @@ -934,9 +946,13 @@ UIGraphicsPDFRenderer = [ ] UIGraphicsRenderer = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGContext", "objc2-foundation/NSObject", ] -UIGraphicsRendererSubclass = ["objc2-foundation/NSError"] +UIGraphicsRendererSubclass = [ + "objc2-core-graphics?/CGContext", + "objc2-foundation/NSError", +] UIGravityBehavior = [ "objc2-core-foundation?/CFCGTypes", "objc2-foundation/NSArray", @@ -961,6 +977,8 @@ UIHoverGestureRecognizer = [ UIHoverStyle = ["objc2-foundation/NSObject"] UIImage = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGContext", + "objc2-core-graphics?/CGImage", "objc2-core-image?/CIImage", "objc2-foundation/NSArray", "objc2-foundation/NSBundle", @@ -2417,6 +2435,7 @@ all = [ "objc2-cloud-kit", "objc2-core-data", "objc2-core-foundation", + "objc2-core-graphics", "objc2-core-image", "objc2-core-location", "objc2-quartz-core", diff --git a/framework-crates/objc2-ui-kit/translation-config.toml b/framework-crates/objc2-ui-kit/translation-config.toml index ccb66cc82..195dc9620 100644 --- a/framework-crates/objc2-ui-kit/translation-config.toml +++ b/framework-crates/objc2-ui-kit/translation-config.toml @@ -82,18 +82,6 @@ static.UITextWritingDirectionNatural.skipped = true static.UITextWritingDirectionLeftToRight.skipped = true static.UITextWritingDirectionRightToLeft.skipped = true -# Needs `CGColorRef` -class.UIColor.methods."colorWithCGColor:".skipped = true -class.UIColor.methods."initWithCGColor:".skipped = true -class.UIColor.methods.CGColor.skipped = true - -# Needs `CGImageRef` -class.UIImage.methods."imageWithCGImage:".skipped = true -class.UIImage.methods."imageWithCGImage:scale:orientation:".skipped = true -class.UIImage.methods."initWithCGImage:".skipped = true -class.UIImage.methods."initWithCGImage:scale:orientation:".skipped = true -class.UIImage.methods.CGImage.skipped = true - # Needs `AVAudioSession` class.UIScene.methods."getDefaultAudioSessionWithCompletionHandler:".skipped = true @@ -105,53 +93,6 @@ protocol.UIApplicationDelegate.methods."application:handleIntent:completionHandl fn.NSTextAlignmentToCTTextAlignment.skipped = true fn.NSTextAlignmentFromCTTextAlignment.skipped = true -# Needs `CGAffineTransform` -class.UIView.methods.transform = { skipped = true } -class.UIView.methods."setTransform:" = { skipped = true } - -# Needs `CGPathRef` -class.UIBezierPath.methods."bezierPathWithCGPath:".skipped = true -class.UIBezierPath.methods.CGPath.skipped = true -class.UIBezierPath.methods."setCGPath:".skipped = true - -# Needs `CGLineCap` -class.UIBezierPath.methods.lineCapStyle.skipped = true -class.UIBezierPath.methods."setLineCapStyle:".skipped = true - -# Needs `CGLineJoin` -class.UIBezierPath.methods.lineJoinStyle.skipped = true -class.UIBezierPath.methods."setLineJoinStyle:".skipped = true - -# Needs `CGBlendMode` -class.UIBezierPath.methods."fillWithBlendMode:alpha:".skipped = true -class.UIBezierPath.methods."strokeWithBlendMode:alpha:".skipped = true -class.UIGraphicsRendererContext.methods."fillRect:blendMode:".skipped = true -class.UIGraphicsRendererContext.methods."strokeRect:blendMode:".skipped = true -class.UIImage.methods."drawAtPoint:blendMode:alpha:".skipped = true -class.UIImage.methods."drawInRect:blendMode:alpha:".skipped = true -fn.UIRectFillUsingBlendMode.skipped = true -fn.UIRectFrameUsingBlendMode.skipped = true - -# Needs `CGGlyph` -class.NSLayoutManager.methods."CGGlyphAtIndex:isValidIndex:".skipped = true -class.NSLayoutManager.methods."CGGlyphAtIndex:".skipped = true -class.NSLayoutManager.methods."glyphAtIndex:isValidIndex:".skipped = true -class.NSLayoutManager.methods."glyphAtIndex:".skipped = true -class.NSLayoutManager.methods."showCGGlyphs:positions:count:font:textMatrix:attributes:inContext:".skipped = true -class.NSLayoutManager.methods."showCGGlyphs:positions:count:font:matrix:attributes:inContext:".skipped = true -class.NSLayoutManager.methods."setGlyphs:properties:characterIndexes:font:forGlyphRange:".skipped = true -class.NSLayoutManager.methods."getGlyphsInRange:glyphs:properties:characterIndexes:bidiLevels:".skipped = true -class.NSLayoutManager.methods."glyphIndexForPoint:inTextContainer:fractionOfDistanceThroughGlyph:".skipped = true -class.NSLayoutManagerDelegate.methods."layoutManager:shouldGenerateGlyphs:properties:characterIndexes:font:forGlyphRange:".skipped = true -protocol.NSLayoutManagerDelegate.methods."layoutManager:shouldGenerateGlyphs:properties:characterIndexes:font:forGlyphRange:".skipped = true - -# Needs `CGContextRef` -class.NSTextLayoutFragment.methods."drawAtPoint:inContext:".skipped = true -class.NSTextLineFragment.methods."drawAtPoint:inContext:".skipped = true -fn.UIGraphicsPushContext.skipped = true -class.UIGraphicsRendererContext.methods.CGContext.skipped = true -class.UIGraphicsRenderer.methods."prepareCGContext:withRendererContext:".skipped = true - # Needs LinkPresentation, which itself depends on UIKit protocol.UIActivityItemSource.methods."activityViewControllerLinkMetadata:".skipped = true class.UIDocumentProperties.methods."initWithMetadata:".skipped = true diff --git a/framework-crates/objc2-vision/Cargo.toml b/framework-crates/objc2-vision/Cargo.toml index 584014af8..924b9e090 100644 --- a/framework-crates/objc2-vision/Cargo.toml +++ b/framework-crates/objc2-vision/Cargo.toml @@ -19,6 +19,7 @@ workspace = true block2 = { path = "../../crates/block2", version = "0.5.1", default-features = false, optional = true } objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false } objc2-core-foundation = { path = "../objc2-core-foundation", version = "0.2.2", default-features = false, optional = true } +objc2-core-graphics = { path = "../objc2-core-graphics", version = "0.2.2", default-features = false, optional = true } objc2-core-image = { path = "../objc2-core-image", version = "0.2.2", default-features = false, optional = true } objc2-core-ml = { path = "../objc2-core-ml", version = "0.2.2", default-features = false, optional = true } objc2-core-video = { path = "../objc2-core-video", version = "0.2.2", default-features = false, optional = true } @@ -39,10 +40,11 @@ targets = [ default = ["std"] # Currently not possible to turn off, put here for forwards compatibility. -std = ["alloc", "block2?/std", "objc2/std", "objc2-core-foundation?/std", "objc2-core-image?/std", "objc2-core-ml?/std", "objc2-core-video?/std", "objc2-foundation/std"] -alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-foundation?/alloc", "objc2-core-image?/alloc", "objc2-core-ml?/alloc", "objc2-core-video?/alloc", "objc2-foundation/alloc"] -block2 = ["dep:block2", "objc2-core-foundation?/block2", "objc2-core-image?/block2", "objc2-core-ml?/block2", "objc2-core-video?/block2", "objc2-foundation/block2"] -objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-core-image?/objc2-core-foundation", "objc2-core-video?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation"] +std = ["alloc", "block2?/std", "objc2/std", "objc2-core-foundation?/std", "objc2-core-graphics?/std", "objc2-core-image?/std", "objc2-core-ml?/std", "objc2-core-video?/std", "objc2-foundation/std"] +alloc = ["block2?/alloc", "objc2/alloc", "objc2-core-foundation?/alloc", "objc2-core-graphics?/alloc", "objc2-core-image?/alloc", "objc2-core-ml?/alloc", "objc2-core-video?/alloc", "objc2-foundation/alloc"] +block2 = ["dep:block2", "objc2-core-foundation?/block2", "objc2-core-graphics?/block2", "objc2-core-image?/block2", "objc2-core-ml?/block2", "objc2-core-video?/block2", "objc2-foundation/block2"] +objc2-core-foundation = ["dep:objc2-core-foundation", "objc2-core-graphics?/objc2-core-foundation", "objc2-core-image?/objc2-core-foundation", "objc2-core-video?/objc2-core-foundation", "objc2-foundation/objc2-core-foundation"] +objc2-core-graphics = ["dep:objc2-core-graphics", "objc2-core-image?/objc2-core-graphics", "objc2-core-ml?/objc2-core-graphics", "objc2-core-video?/objc2-core-graphics"] objc2-core-image = ["dep:objc2-core-image"] objc2-core-ml = ["dep:objc2-core-ml"] objc2-core-video = ["dep:objc2-core-video", "objc2-core-image?/objc2-core-video", "objc2-core-ml?/objc2-core-video"] @@ -183,6 +185,7 @@ VNGenerateObjectnessBasedSaliencyImageRequest = [ "objc2-foundation/NSObject", ] VNGenerateOpticalFlowRequest = [ + "objc2-core-graphics?/CGImage", "objc2-core-image?/CIImage", "objc2-core-video?/CVBuffer", "objc2-core-video?/CVImageBuffer", @@ -208,6 +211,7 @@ VNGeneratePersonSegmentationRequest = [ ] VNGeometry = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGPath", "objc2-foundation/NSArray", "objc2-foundation/NSError", "objc2-foundation/NSIndexPath", @@ -222,6 +226,7 @@ VNHumanBodyRecognizedPoint3D = [ "objc2-foundation/NSString", ] VNImageRegistrationRequest = [ + "objc2-core-graphics?/CGImage", "objc2-core-image?/CIImage", "objc2-core-video?/CVBuffer", "objc2-core-video?/CVImageBuffer", @@ -236,6 +241,7 @@ VNImageRegistrationRequest = [ ] VNObservation = [ "objc2-core-foundation?/CFCGTypes", + "objc2-core-graphics?/CGPath", "objc2-core-image?/CIBarcodeDescriptor", "objc2-core-ml?/MLFeatureValue", "objc2-core-ml?/MLMultiArray", @@ -281,6 +287,7 @@ VNRequest = [ "objc2-foundation/NSString", ] VNRequestHandler = [ + "objc2-core-graphics?/CGImage", "objc2-core-image?/CIImage", "objc2-core-video?/CVBuffer", "objc2-core-video?/CVImageBuffer", @@ -298,6 +305,7 @@ VNStatefulRequest = [ "objc2-foundation/NSObject", ] VNTargetedImageRequest = [ + "objc2-core-graphics?/CGImage", "objc2-core-image?/CIImage", "objc2-core-video?/CVBuffer", "objc2-core-video?/CVImageBuffer", @@ -401,6 +409,7 @@ all = [ "VNVideoProcessor", "block2", "objc2-core-foundation", + "objc2-core-graphics", "objc2-core-image", "objc2-core-ml", "objc2-core-video", diff --git a/framework-crates/objc2-vision/translation-config.toml b/framework-crates/objc2-vision/translation-config.toml index 657c85722..84d36e1f5 100644 --- a/framework-crates/objc2-vision/translation-config.toml +++ b/framework-crates/objc2-vision/translation-config.toml @@ -39,38 +39,31 @@ class.VNTargetedImageRequest.methods."initWithTargetedCMSampleBuffer:options:".s class.VNTargetedImageRequest.methods."initWithTargetedCMSampleBuffer:options:completionHandler:".skipped = true class.VNVideoProcessor.methods."analyzeTimeRange:error:".skipped = true class.VNVideoProcessor.methods."analyzeWithTimeRange:error:".skipped = true +class.VNImageRequestHandler.methods."initWithCMSampleBuffer:orientation:options:".skipped = true +class.VNImageRequestHandler.methods."initWithCMSampleBuffer:depthData:orientation:options:".skipped = true +class.VNSequenceRequestHandler.methods."performRequests:onCMSampleBuffer:orientation:error:".skipped = true +class.VNTargetedImageRequest.methods."initWithTargetedCMSampleBuffer:orientation:options:".skipped = true +class.VNTargetedImageRequest.methods."initWithTargetedCMSampleBuffer:orientation:options:completionHandler:".skipped = true # Needs CoreVideo to have proper retain semantics class.VNInstanceMaskObservation.methods."generateMaskForInstances:error:".skipped = true class.VNInstanceMaskObservation.methods."generateMaskedImageOfInstances:fromRequestHandler:croppedToInstancesExtent:error:".skipped = true class.VNInstanceMaskObservation.methods."generateScaledMaskForImageForInstances:fromRequestHandler:error:".skipped = true -# Needs CoreGraphics -class.VNContour.methods.normalizedPath.skipped = true -class.VNHorizonObservation.methods.transform.skipped = true -class.VNHorizonObservation.methods."transformForImageWidth:height:".skipped = true -class.VNImageTranslationAlignmentObservation.methods.alignmentTransform.skipped = true -class.VNContoursObservation.methods.normalizedPath.skipped = true +# Needs `CGImagePropertyOrientation` from `ImageIO` class.VNImageRequestHandler.methods."initWithCVPixelBuffer:orientation:options:".skipped = true class.VNImageRequestHandler.methods."initWithCVPixelBuffer:depthData:orientation:options:".skipped = true -class.VNImageRequestHandler.methods."initWithCGImage:options:".skipped = true class.VNImageRequestHandler.methods."initWithCGImage:orientation:options:".skipped = true class.VNImageRequestHandler.methods."initWithCIImage:orientation:options:".skipped = true class.VNImageRequestHandler.methods."initWithURL:orientation:options:".skipped = true class.VNImageRequestHandler.methods."initWithData:orientation:options:".skipped = true -class.VNImageRequestHandler.methods."initWithCMSampleBuffer:orientation:options:".skipped = true -class.VNImageRequestHandler.methods."initWithCMSampleBuffer:depthData:orientation:options:".skipped = true class.VNSequenceRequestHandler.methods."performRequests:onCVPixelBuffer:orientation:error:".skipped = true -class.VNSequenceRequestHandler.methods."performRequests:onCGImage:error:".skipped = true class.VNSequenceRequestHandler.methods."performRequests:onCGImage:orientation:error:".skipped = true class.VNSequenceRequestHandler.methods."performRequests:onCIImage:orientation:error:".skipped = true class.VNSequenceRequestHandler.methods."performRequests:onImageURL:orientation:error:".skipped = true class.VNSequenceRequestHandler.methods."performRequests:onImageData:orientation:error:".skipped = true -class.VNSequenceRequestHandler.methods."performRequests:onCMSampleBuffer:orientation:error:".skipped = true class.VNTargetedImageRequest.methods."initWithTargetedCVPixelBuffer:orientation:options:".skipped = true class.VNTargetedImageRequest.methods."initWithTargetedCVPixelBuffer:orientation:options:completionHandler:".skipped = true -class.VNTargetedImageRequest.methods."initWithTargetedCGImage:options:".skipped = true -class.VNTargetedImageRequest.methods."initWithTargetedCGImage:options:completionHandler:".skipped = true class.VNTargetedImageRequest.methods."initWithTargetedCGImage:orientation:options:".skipped = true class.VNTargetedImageRequest.methods."initWithTargetedCGImage:orientation:options:completionHandler:".skipped = true class.VNTargetedImageRequest.methods."initWithTargetedCIImage:orientation:options:".skipped = true @@ -79,8 +72,6 @@ class.VNTargetedImageRequest.methods."initWithTargetedImageURL:orientation:optio class.VNTargetedImageRequest.methods."initWithTargetedImageURL:orientation:options:completionHandler:".skipped = true class.VNTargetedImageRequest.methods."initWithTargetedImageData:orientation:options:".skipped = true class.VNTargetedImageRequest.methods."initWithTargetedImageData:orientation:options:completionHandler:".skipped = true -class.VNTargetedImageRequest.methods."initWithTargetedCMSampleBuffer:orientation:options:".skipped = true -class.VNTargetedImageRequest.methods."initWithTargetedCMSampleBuffer:orientation:options:completionHandler:".skipped = true ### diff --git a/generated b/generated index c8eb6e339..a2280fca4 160000 --- a/generated +++ b/generated @@ -1 +1 @@ -Subproject commit c8eb6e339745e5c10d2001e4fd606ee295c25686 +Subproject commit a2280fca42606e09a6a5815309a0b138b3841926