From 0e34f88e97e40f9b8be27bcb70b032a53e8687ed Mon Sep 17 00:00:00 2001 From: Rachel Kang Date: Thu, 8 Jul 2021 12:41:29 -0400 Subject: [PATCH 1/7] Remove empty .todo files --- .../MacCatalyst-Accessibility.todo | 87 ------------------- tests/xtro-sharpie/MacCatalyst-MapKit.todo | 11 --- tests/xtro-sharpie/iOS-Accessibility.todo | 87 ------------------- tests/xtro-sharpie/iOS-Accounts.todo | 4 - tests/xtro-sharpie/iOS-MapKit.todo | 1 - tests/xtro-sharpie/macOS-Accessibility.todo | 81 ----------------- tests/xtro-sharpie/macOS-MapKit.todo | 1 - tests/xtro-sharpie/tvOS-Accessibility.todo | 81 ----------------- tests/xtro-sharpie/tvOS-MapKit.todo | 1 - tests/xtro-sharpie/watchOS-Accessibility.todo | 87 ------------------- 10 files changed, 441 deletions(-) delete mode 100644 tests/xtro-sharpie/MacCatalyst-Accessibility.todo delete mode 100644 tests/xtro-sharpie/MacCatalyst-MapKit.todo delete mode 100644 tests/xtro-sharpie/iOS-Accessibility.todo delete mode 100644 tests/xtro-sharpie/iOS-Accounts.todo delete mode 100644 tests/xtro-sharpie/iOS-MapKit.todo delete mode 100644 tests/xtro-sharpie/macOS-Accessibility.todo delete mode 100644 tests/xtro-sharpie/macOS-MapKit.todo delete mode 100644 tests/xtro-sharpie/tvOS-Accessibility.todo delete mode 100644 tests/xtro-sharpie/tvOS-MapKit.todo delete mode 100644 tests/xtro-sharpie/watchOS-Accessibility.todo diff --git a/tests/xtro-sharpie/MacCatalyst-Accessibility.todo b/tests/xtro-sharpie/MacCatalyst-Accessibility.todo deleted file mode 100644 index d6cbace2485a..000000000000 --- a/tests/xtro-sharpie/MacCatalyst-Accessibility.todo +++ /dev/null @@ -1,87 +0,0 @@ -!missing-enum! AXChartDescriptorContentDirection not bound -!missing-enum! AXHearingDeviceEar not bound -!missing-enum! AXNumericDataAxisDescriptorScale not bound -!missing-field! AXMFiHearingDevicePairedUUIDsDidChangeNotification not bound -!missing-field! AXMFiHearingDeviceStreamingEarDidChangeNotification not bound -!missing-pinvoke! AXMFiHearingDevicePairedUUIDs is not bound -!missing-pinvoke! AXMFiHearingDeviceStreamingEar is not bound -!missing-pinvoke! AXSupportsBidirectionalAXMFiHearingDeviceStreaming is not bound -!missing-protocol! AXChart not bound -!missing-protocol! AXDataAxisDescriptor not bound -!missing-selector! +AXDataPointValue::valueWithCategory: not bound -!missing-selector! +AXDataPointValue::valueWithNumber: not bound -!missing-selector! +AXLiveAudioGraph::start not bound -!missing-selector! +AXLiveAudioGraph::stop not bound -!missing-selector! +AXLiveAudioGraph::updateValue: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::categoryOrder not bound -!missing-selector! AXCategoricalDataAxisDescriptor::initWithAttributedTitle:categoryOrder: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::initWithTitle:categoryOrder: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::setCategoryOrder: not bound -!missing-selector! AXChartDescriptor::additionalAxes not bound -!missing-selector! AXChartDescriptor::attributedTitle not bound -!missing-selector! AXChartDescriptor::contentDirection not bound -!missing-selector! AXChartDescriptor::contentFrame not bound -!missing-selector! AXChartDescriptor::initWithAttributedTitle:summary:xAxisDescriptor:yAxisDescriptor:additionalAxes:series: not bound -!missing-selector! AXChartDescriptor::initWithAttributedTitle:summary:xAxisDescriptor:yAxisDescriptor:series: not bound -!missing-selector! AXChartDescriptor::initWithTitle:summary:xAxisDescriptor:yAxisDescriptor:additionalAxes:series: not bound -!missing-selector! AXChartDescriptor::initWithTitle:summary:xAxisDescriptor:yAxisDescriptor:series: not bound -!missing-selector! AXChartDescriptor::series not bound -!missing-selector! AXChartDescriptor::setAdditionalAxes: not bound -!missing-selector! AXChartDescriptor::setAttributedTitle: not bound -!missing-selector! AXChartDescriptor::setContentDirection: not bound -!missing-selector! AXChartDescriptor::setContentFrame: not bound -!missing-selector! AXChartDescriptor::setSeries: not bound -!missing-selector! AXChartDescriptor::setSummary: not bound -!missing-selector! AXChartDescriptor::setTitle: not bound -!missing-selector! AXChartDescriptor::setXAxis: not bound -!missing-selector! AXChartDescriptor::setYAxis: not bound -!missing-selector! AXChartDescriptor::summary not bound -!missing-selector! AXChartDescriptor::title not bound -!missing-selector! AXChartDescriptor::xAxis not bound -!missing-selector! AXChartDescriptor::yAxis not bound -!missing-selector! AXDataPoint::additionalValues not bound -!missing-selector! AXDataPoint::attributedLabel not bound -!missing-selector! AXDataPoint::initWithX:y: not bound -!missing-selector! AXDataPoint::initWithX:y:additionalValues: not bound -!missing-selector! AXDataPoint::initWithX:y:additionalValues:label: not bound -!missing-selector! AXDataPoint::label not bound -!missing-selector! AXDataPoint::setAdditionalValues: not bound -!missing-selector! AXDataPoint::setAttributedLabel: not bound -!missing-selector! AXDataPoint::setLabel: not bound -!missing-selector! AXDataPoint::setXValue: not bound -!missing-selector! AXDataPoint::setYValue: not bound -!missing-selector! AXDataPoint::xValue not bound -!missing-selector! AXDataPoint::yValue not bound -!missing-selector! AXDataPointValue::category not bound -!missing-selector! AXDataPointValue::number not bound -!missing-selector! AXDataPointValue::setCategory: not bound -!missing-selector! AXDataPointValue::setNumber: not bound -!missing-selector! AXDataSeriesDescriptor::attributedName not bound -!missing-selector! AXDataSeriesDescriptor::dataPoints not bound -!missing-selector! AXDataSeriesDescriptor::initWithAttributedName:isContinuous:dataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::initWithName:isContinuous:dataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::isContinuous not bound -!missing-selector! AXDataSeriesDescriptor::name not bound -!missing-selector! AXDataSeriesDescriptor::setAttributedName: not bound -!missing-selector! AXDataSeriesDescriptor::setDataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::setIsContinuous: not bound -!missing-selector! AXDataSeriesDescriptor::setName: not bound -!missing-selector! AXNumericDataAxisDescriptor::gridlinePositions not bound -!missing-selector! AXNumericDataAxisDescriptor::initWithAttributedTitle:lowerBound:upperBound:gridlinePositions:valueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::initWithTitle:lowerBound:upperBound:gridlinePositions:valueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::lowerBound not bound -!missing-selector! AXNumericDataAxisDescriptor::scaleType not bound -!missing-selector! AXNumericDataAxisDescriptor::setGridlinePositions: not bound -!missing-selector! AXNumericDataAxisDescriptor::setLowerBound: not bound -!missing-selector! AXNumericDataAxisDescriptor::setScaleType: not bound -!missing-selector! AXNumericDataAxisDescriptor::setUpperBound: not bound -!missing-selector! AXNumericDataAxisDescriptor::setValueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::upperBound not bound -!missing-selector! AXNumericDataAxisDescriptor::valueDescriptionProvider not bound -!missing-type! AXCategoricalDataAxisDescriptor not bound -!missing-type! AXChartDescriptor not bound -!missing-type! AXDataPoint not bound -!missing-type! AXDataPointValue not bound -!missing-type! AXDataSeriesDescriptor not bound -!missing-type! AXLiveAudioGraph not bound -!missing-type! AXNumericDataAxisDescriptor not bound diff --git a/tests/xtro-sharpie/MacCatalyst-MapKit.todo b/tests/xtro-sharpie/MacCatalyst-MapKit.todo deleted file mode 100644 index 2ef9f7e1ffd6..000000000000 --- a/tests/xtro-sharpie/MacCatalyst-MapKit.todo +++ /dev/null @@ -1,11 +0,0 @@ -!missing-field! MKAnnotationCalloutInfoDidChangeNotification not bound -!missing-pinvoke! MKRoadWidthAtZoomScale is not bound -!missing-protocol-conformance! MKUserLocation should conform to MKAnnotation -!missing-protocol-member! MKOverlay::coordinate not found -!missing-selector! MKAnnotationView::leftCalloutOffset not bound -!missing-selector! MKAnnotationView::rightCalloutOffset not bound -!missing-selector! MKAnnotationView::setLeftCalloutOffset: not bound -!missing-selector! MKAnnotationView::setRightCalloutOffset: not bound -!missing-selector! MKMapView::setShowsZoomControls: not bound -!missing-selector! MKMapView::showsZoomControls not bound -!deprecated-attribute-missing! MKPinAnnotationView missing a [Deprecated] attribute diff --git a/tests/xtro-sharpie/iOS-Accessibility.todo b/tests/xtro-sharpie/iOS-Accessibility.todo deleted file mode 100644 index d6cbace2485a..000000000000 --- a/tests/xtro-sharpie/iOS-Accessibility.todo +++ /dev/null @@ -1,87 +0,0 @@ -!missing-enum! AXChartDescriptorContentDirection not bound -!missing-enum! AXHearingDeviceEar not bound -!missing-enum! AXNumericDataAxisDescriptorScale not bound -!missing-field! AXMFiHearingDevicePairedUUIDsDidChangeNotification not bound -!missing-field! AXMFiHearingDeviceStreamingEarDidChangeNotification not bound -!missing-pinvoke! AXMFiHearingDevicePairedUUIDs is not bound -!missing-pinvoke! AXMFiHearingDeviceStreamingEar is not bound -!missing-pinvoke! AXSupportsBidirectionalAXMFiHearingDeviceStreaming is not bound -!missing-protocol! AXChart not bound -!missing-protocol! AXDataAxisDescriptor not bound -!missing-selector! +AXDataPointValue::valueWithCategory: not bound -!missing-selector! +AXDataPointValue::valueWithNumber: not bound -!missing-selector! +AXLiveAudioGraph::start not bound -!missing-selector! +AXLiveAudioGraph::stop not bound -!missing-selector! +AXLiveAudioGraph::updateValue: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::categoryOrder not bound -!missing-selector! AXCategoricalDataAxisDescriptor::initWithAttributedTitle:categoryOrder: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::initWithTitle:categoryOrder: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::setCategoryOrder: not bound -!missing-selector! AXChartDescriptor::additionalAxes not bound -!missing-selector! AXChartDescriptor::attributedTitle not bound -!missing-selector! AXChartDescriptor::contentDirection not bound -!missing-selector! AXChartDescriptor::contentFrame not bound -!missing-selector! AXChartDescriptor::initWithAttributedTitle:summary:xAxisDescriptor:yAxisDescriptor:additionalAxes:series: not bound -!missing-selector! AXChartDescriptor::initWithAttributedTitle:summary:xAxisDescriptor:yAxisDescriptor:series: not bound -!missing-selector! AXChartDescriptor::initWithTitle:summary:xAxisDescriptor:yAxisDescriptor:additionalAxes:series: not bound -!missing-selector! AXChartDescriptor::initWithTitle:summary:xAxisDescriptor:yAxisDescriptor:series: not bound -!missing-selector! AXChartDescriptor::series not bound -!missing-selector! AXChartDescriptor::setAdditionalAxes: not bound -!missing-selector! AXChartDescriptor::setAttributedTitle: not bound -!missing-selector! AXChartDescriptor::setContentDirection: not bound -!missing-selector! AXChartDescriptor::setContentFrame: not bound -!missing-selector! AXChartDescriptor::setSeries: not bound -!missing-selector! AXChartDescriptor::setSummary: not bound -!missing-selector! AXChartDescriptor::setTitle: not bound -!missing-selector! AXChartDescriptor::setXAxis: not bound -!missing-selector! AXChartDescriptor::setYAxis: not bound -!missing-selector! AXChartDescriptor::summary not bound -!missing-selector! AXChartDescriptor::title not bound -!missing-selector! AXChartDescriptor::xAxis not bound -!missing-selector! AXChartDescriptor::yAxis not bound -!missing-selector! AXDataPoint::additionalValues not bound -!missing-selector! AXDataPoint::attributedLabel not bound -!missing-selector! AXDataPoint::initWithX:y: not bound -!missing-selector! AXDataPoint::initWithX:y:additionalValues: not bound -!missing-selector! AXDataPoint::initWithX:y:additionalValues:label: not bound -!missing-selector! AXDataPoint::label not bound -!missing-selector! AXDataPoint::setAdditionalValues: not bound -!missing-selector! AXDataPoint::setAttributedLabel: not bound -!missing-selector! AXDataPoint::setLabel: not bound -!missing-selector! AXDataPoint::setXValue: not bound -!missing-selector! AXDataPoint::setYValue: not bound -!missing-selector! AXDataPoint::xValue not bound -!missing-selector! AXDataPoint::yValue not bound -!missing-selector! AXDataPointValue::category not bound -!missing-selector! AXDataPointValue::number not bound -!missing-selector! AXDataPointValue::setCategory: not bound -!missing-selector! AXDataPointValue::setNumber: not bound -!missing-selector! AXDataSeriesDescriptor::attributedName not bound -!missing-selector! AXDataSeriesDescriptor::dataPoints not bound -!missing-selector! AXDataSeriesDescriptor::initWithAttributedName:isContinuous:dataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::initWithName:isContinuous:dataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::isContinuous not bound -!missing-selector! AXDataSeriesDescriptor::name not bound -!missing-selector! AXDataSeriesDescriptor::setAttributedName: not bound -!missing-selector! AXDataSeriesDescriptor::setDataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::setIsContinuous: not bound -!missing-selector! AXDataSeriesDescriptor::setName: not bound -!missing-selector! AXNumericDataAxisDescriptor::gridlinePositions not bound -!missing-selector! AXNumericDataAxisDescriptor::initWithAttributedTitle:lowerBound:upperBound:gridlinePositions:valueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::initWithTitle:lowerBound:upperBound:gridlinePositions:valueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::lowerBound not bound -!missing-selector! AXNumericDataAxisDescriptor::scaleType not bound -!missing-selector! AXNumericDataAxisDescriptor::setGridlinePositions: not bound -!missing-selector! AXNumericDataAxisDescriptor::setLowerBound: not bound -!missing-selector! AXNumericDataAxisDescriptor::setScaleType: not bound -!missing-selector! AXNumericDataAxisDescriptor::setUpperBound: not bound -!missing-selector! AXNumericDataAxisDescriptor::setValueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::upperBound not bound -!missing-selector! AXNumericDataAxisDescriptor::valueDescriptionProvider not bound -!missing-type! AXCategoricalDataAxisDescriptor not bound -!missing-type! AXChartDescriptor not bound -!missing-type! AXDataPoint not bound -!missing-type! AXDataPointValue not bound -!missing-type! AXDataSeriesDescriptor not bound -!missing-type! AXLiveAudioGraph not bound -!missing-type! AXNumericDataAxisDescriptor not bound diff --git a/tests/xtro-sharpie/iOS-Accounts.todo b/tests/xtro-sharpie/iOS-Accounts.todo deleted file mode 100644 index fd66e6a93a3d..000000000000 --- a/tests/xtro-sharpie/iOS-Accounts.todo +++ /dev/null @@ -1,4 +0,0 @@ -!deprecated-attribute-missing! ACAccount missing a [Deprecated] attribute -!deprecated-attribute-missing! ACAccountCredential missing a [Deprecated] attribute -!deprecated-attribute-missing! ACAccountStore missing a [Deprecated] attribute -!deprecated-attribute-missing! ACAccountType missing a [Deprecated] attribute diff --git a/tests/xtro-sharpie/iOS-MapKit.todo b/tests/xtro-sharpie/iOS-MapKit.todo deleted file mode 100644 index b5438233d915..000000000000 --- a/tests/xtro-sharpie/iOS-MapKit.todo +++ /dev/null @@ -1 +0,0 @@ -!deprecated-attribute-missing! MKPinAnnotationView missing a [Deprecated] attribute diff --git a/tests/xtro-sharpie/macOS-Accessibility.todo b/tests/xtro-sharpie/macOS-Accessibility.todo deleted file mode 100644 index 4080728363ca..000000000000 --- a/tests/xtro-sharpie/macOS-Accessibility.todo +++ /dev/null @@ -1,81 +0,0 @@ -!missing-enum! AXChartDescriptorContentDirection not bound -!missing-enum! AXNumericDataAxisDescriptorScale not bound -!missing-protocol! AXChart not bound -!missing-protocol! AXDataAxisDescriptor not bound -!missing-selector! +AXDataPointValue::valueWithCategory: not bound -!missing-selector! +AXDataPointValue::valueWithNumber: not bound -!missing-selector! +AXLiveAudioGraph::start not bound -!missing-selector! +AXLiveAudioGraph::stop not bound -!missing-selector! +AXLiveAudioGraph::updateValue: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::categoryOrder not bound -!missing-selector! AXCategoricalDataAxisDescriptor::initWithAttributedTitle:categoryOrder: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::initWithTitle:categoryOrder: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::setCategoryOrder: not bound -!missing-selector! AXChartDescriptor::additionalAxes not bound -!missing-selector! AXChartDescriptor::attributedTitle not bound -!missing-selector! AXChartDescriptor::contentDirection not bound -!missing-selector! AXChartDescriptor::contentFrame not bound -!missing-selector! AXChartDescriptor::initWithAttributedTitle:summary:xAxisDescriptor:yAxisDescriptor:additionalAxes:series: not bound -!missing-selector! AXChartDescriptor::initWithAttributedTitle:summary:xAxisDescriptor:yAxisDescriptor:series: not bound -!missing-selector! AXChartDescriptor::initWithTitle:summary:xAxisDescriptor:yAxisDescriptor:additionalAxes:series: not bound -!missing-selector! AXChartDescriptor::initWithTitle:summary:xAxisDescriptor:yAxisDescriptor:series: not bound -!missing-selector! AXChartDescriptor::series not bound -!missing-selector! AXChartDescriptor::setAdditionalAxes: not bound -!missing-selector! AXChartDescriptor::setAttributedTitle: not bound -!missing-selector! AXChartDescriptor::setContentDirection: not bound -!missing-selector! AXChartDescriptor::setContentFrame: not bound -!missing-selector! AXChartDescriptor::setSeries: not bound -!missing-selector! AXChartDescriptor::setSummary: not bound -!missing-selector! AXChartDescriptor::setTitle: not bound -!missing-selector! AXChartDescriptor::setXAxis: not bound -!missing-selector! AXChartDescriptor::setYAxis: not bound -!missing-selector! AXChartDescriptor::summary not bound -!missing-selector! AXChartDescriptor::title not bound -!missing-selector! AXChartDescriptor::xAxis not bound -!missing-selector! AXChartDescriptor::yAxis not bound -!missing-selector! AXDataPoint::additionalValues not bound -!missing-selector! AXDataPoint::attributedLabel not bound -!missing-selector! AXDataPoint::initWithX:y: not bound -!missing-selector! AXDataPoint::initWithX:y:additionalValues: not bound -!missing-selector! AXDataPoint::initWithX:y:additionalValues:label: not bound -!missing-selector! AXDataPoint::label not bound -!missing-selector! AXDataPoint::setAdditionalValues: not bound -!missing-selector! AXDataPoint::setAttributedLabel: not bound -!missing-selector! AXDataPoint::setLabel: not bound -!missing-selector! AXDataPoint::setXValue: not bound -!missing-selector! AXDataPoint::setYValue: not bound -!missing-selector! AXDataPoint::xValue not bound -!missing-selector! AXDataPoint::yValue not bound -!missing-selector! AXDataPointValue::category not bound -!missing-selector! AXDataPointValue::number not bound -!missing-selector! AXDataPointValue::setCategory: not bound -!missing-selector! AXDataPointValue::setNumber: not bound -!missing-selector! AXDataSeriesDescriptor::attributedName not bound -!missing-selector! AXDataSeriesDescriptor::dataPoints not bound -!missing-selector! AXDataSeriesDescriptor::initWithAttributedName:isContinuous:dataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::initWithName:isContinuous:dataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::isContinuous not bound -!missing-selector! AXDataSeriesDescriptor::name not bound -!missing-selector! AXDataSeriesDescriptor::setAttributedName: not bound -!missing-selector! AXDataSeriesDescriptor::setDataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::setIsContinuous: not bound -!missing-selector! AXDataSeriesDescriptor::setName: not bound -!missing-selector! AXNumericDataAxisDescriptor::gridlinePositions not bound -!missing-selector! AXNumericDataAxisDescriptor::initWithAttributedTitle:lowerBound:upperBound:gridlinePositions:valueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::initWithTitle:lowerBound:upperBound:gridlinePositions:valueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::lowerBound not bound -!missing-selector! AXNumericDataAxisDescriptor::scaleType not bound -!missing-selector! AXNumericDataAxisDescriptor::setGridlinePositions: not bound -!missing-selector! AXNumericDataAxisDescriptor::setLowerBound: not bound -!missing-selector! AXNumericDataAxisDescriptor::setScaleType: not bound -!missing-selector! AXNumericDataAxisDescriptor::setUpperBound: not bound -!missing-selector! AXNumericDataAxisDescriptor::setValueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::upperBound not bound -!missing-selector! AXNumericDataAxisDescriptor::valueDescriptionProvider not bound -!missing-type! AXCategoricalDataAxisDescriptor not bound -!missing-type! AXChartDescriptor not bound -!missing-type! AXDataPoint not bound -!missing-type! AXDataPointValue not bound -!missing-type! AXDataSeriesDescriptor not bound -!missing-type! AXLiveAudioGraph not bound -!missing-type! AXNumericDataAxisDescriptor not bound diff --git a/tests/xtro-sharpie/macOS-MapKit.todo b/tests/xtro-sharpie/macOS-MapKit.todo deleted file mode 100644 index b5438233d915..000000000000 --- a/tests/xtro-sharpie/macOS-MapKit.todo +++ /dev/null @@ -1 +0,0 @@ -!deprecated-attribute-missing! MKPinAnnotationView missing a [Deprecated] attribute diff --git a/tests/xtro-sharpie/tvOS-Accessibility.todo b/tests/xtro-sharpie/tvOS-Accessibility.todo deleted file mode 100644 index 4080728363ca..000000000000 --- a/tests/xtro-sharpie/tvOS-Accessibility.todo +++ /dev/null @@ -1,81 +0,0 @@ -!missing-enum! AXChartDescriptorContentDirection not bound -!missing-enum! AXNumericDataAxisDescriptorScale not bound -!missing-protocol! AXChart not bound -!missing-protocol! AXDataAxisDescriptor not bound -!missing-selector! +AXDataPointValue::valueWithCategory: not bound -!missing-selector! +AXDataPointValue::valueWithNumber: not bound -!missing-selector! +AXLiveAudioGraph::start not bound -!missing-selector! +AXLiveAudioGraph::stop not bound -!missing-selector! +AXLiveAudioGraph::updateValue: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::categoryOrder not bound -!missing-selector! AXCategoricalDataAxisDescriptor::initWithAttributedTitle:categoryOrder: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::initWithTitle:categoryOrder: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::setCategoryOrder: not bound -!missing-selector! AXChartDescriptor::additionalAxes not bound -!missing-selector! AXChartDescriptor::attributedTitle not bound -!missing-selector! AXChartDescriptor::contentDirection not bound -!missing-selector! AXChartDescriptor::contentFrame not bound -!missing-selector! AXChartDescriptor::initWithAttributedTitle:summary:xAxisDescriptor:yAxisDescriptor:additionalAxes:series: not bound -!missing-selector! AXChartDescriptor::initWithAttributedTitle:summary:xAxisDescriptor:yAxisDescriptor:series: not bound -!missing-selector! AXChartDescriptor::initWithTitle:summary:xAxisDescriptor:yAxisDescriptor:additionalAxes:series: not bound -!missing-selector! AXChartDescriptor::initWithTitle:summary:xAxisDescriptor:yAxisDescriptor:series: not bound -!missing-selector! AXChartDescriptor::series not bound -!missing-selector! AXChartDescriptor::setAdditionalAxes: not bound -!missing-selector! AXChartDescriptor::setAttributedTitle: not bound -!missing-selector! AXChartDescriptor::setContentDirection: not bound -!missing-selector! AXChartDescriptor::setContentFrame: not bound -!missing-selector! AXChartDescriptor::setSeries: not bound -!missing-selector! AXChartDescriptor::setSummary: not bound -!missing-selector! AXChartDescriptor::setTitle: not bound -!missing-selector! AXChartDescriptor::setXAxis: not bound -!missing-selector! AXChartDescriptor::setYAxis: not bound -!missing-selector! AXChartDescriptor::summary not bound -!missing-selector! AXChartDescriptor::title not bound -!missing-selector! AXChartDescriptor::xAxis not bound -!missing-selector! AXChartDescriptor::yAxis not bound -!missing-selector! AXDataPoint::additionalValues not bound -!missing-selector! AXDataPoint::attributedLabel not bound -!missing-selector! AXDataPoint::initWithX:y: not bound -!missing-selector! AXDataPoint::initWithX:y:additionalValues: not bound -!missing-selector! AXDataPoint::initWithX:y:additionalValues:label: not bound -!missing-selector! AXDataPoint::label not bound -!missing-selector! AXDataPoint::setAdditionalValues: not bound -!missing-selector! AXDataPoint::setAttributedLabel: not bound -!missing-selector! AXDataPoint::setLabel: not bound -!missing-selector! AXDataPoint::setXValue: not bound -!missing-selector! AXDataPoint::setYValue: not bound -!missing-selector! AXDataPoint::xValue not bound -!missing-selector! AXDataPoint::yValue not bound -!missing-selector! AXDataPointValue::category not bound -!missing-selector! AXDataPointValue::number not bound -!missing-selector! AXDataPointValue::setCategory: not bound -!missing-selector! AXDataPointValue::setNumber: not bound -!missing-selector! AXDataSeriesDescriptor::attributedName not bound -!missing-selector! AXDataSeriesDescriptor::dataPoints not bound -!missing-selector! AXDataSeriesDescriptor::initWithAttributedName:isContinuous:dataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::initWithName:isContinuous:dataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::isContinuous not bound -!missing-selector! AXDataSeriesDescriptor::name not bound -!missing-selector! AXDataSeriesDescriptor::setAttributedName: not bound -!missing-selector! AXDataSeriesDescriptor::setDataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::setIsContinuous: not bound -!missing-selector! AXDataSeriesDescriptor::setName: not bound -!missing-selector! AXNumericDataAxisDescriptor::gridlinePositions not bound -!missing-selector! AXNumericDataAxisDescriptor::initWithAttributedTitle:lowerBound:upperBound:gridlinePositions:valueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::initWithTitle:lowerBound:upperBound:gridlinePositions:valueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::lowerBound not bound -!missing-selector! AXNumericDataAxisDescriptor::scaleType not bound -!missing-selector! AXNumericDataAxisDescriptor::setGridlinePositions: not bound -!missing-selector! AXNumericDataAxisDescriptor::setLowerBound: not bound -!missing-selector! AXNumericDataAxisDescriptor::setScaleType: not bound -!missing-selector! AXNumericDataAxisDescriptor::setUpperBound: not bound -!missing-selector! AXNumericDataAxisDescriptor::setValueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::upperBound not bound -!missing-selector! AXNumericDataAxisDescriptor::valueDescriptionProvider not bound -!missing-type! AXCategoricalDataAxisDescriptor not bound -!missing-type! AXChartDescriptor not bound -!missing-type! AXDataPoint not bound -!missing-type! AXDataPointValue not bound -!missing-type! AXDataSeriesDescriptor not bound -!missing-type! AXLiveAudioGraph not bound -!missing-type! AXNumericDataAxisDescriptor not bound diff --git a/tests/xtro-sharpie/tvOS-MapKit.todo b/tests/xtro-sharpie/tvOS-MapKit.todo deleted file mode 100644 index b5438233d915..000000000000 --- a/tests/xtro-sharpie/tvOS-MapKit.todo +++ /dev/null @@ -1 +0,0 @@ -!deprecated-attribute-missing! MKPinAnnotationView missing a [Deprecated] attribute diff --git a/tests/xtro-sharpie/watchOS-Accessibility.todo b/tests/xtro-sharpie/watchOS-Accessibility.todo deleted file mode 100644 index d6cbace2485a..000000000000 --- a/tests/xtro-sharpie/watchOS-Accessibility.todo +++ /dev/null @@ -1,87 +0,0 @@ -!missing-enum! AXChartDescriptorContentDirection not bound -!missing-enum! AXHearingDeviceEar not bound -!missing-enum! AXNumericDataAxisDescriptorScale not bound -!missing-field! AXMFiHearingDevicePairedUUIDsDidChangeNotification not bound -!missing-field! AXMFiHearingDeviceStreamingEarDidChangeNotification not bound -!missing-pinvoke! AXMFiHearingDevicePairedUUIDs is not bound -!missing-pinvoke! AXMFiHearingDeviceStreamingEar is not bound -!missing-pinvoke! AXSupportsBidirectionalAXMFiHearingDeviceStreaming is not bound -!missing-protocol! AXChart not bound -!missing-protocol! AXDataAxisDescriptor not bound -!missing-selector! +AXDataPointValue::valueWithCategory: not bound -!missing-selector! +AXDataPointValue::valueWithNumber: not bound -!missing-selector! +AXLiveAudioGraph::start not bound -!missing-selector! +AXLiveAudioGraph::stop not bound -!missing-selector! +AXLiveAudioGraph::updateValue: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::categoryOrder not bound -!missing-selector! AXCategoricalDataAxisDescriptor::initWithAttributedTitle:categoryOrder: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::initWithTitle:categoryOrder: not bound -!missing-selector! AXCategoricalDataAxisDescriptor::setCategoryOrder: not bound -!missing-selector! AXChartDescriptor::additionalAxes not bound -!missing-selector! AXChartDescriptor::attributedTitle not bound -!missing-selector! AXChartDescriptor::contentDirection not bound -!missing-selector! AXChartDescriptor::contentFrame not bound -!missing-selector! AXChartDescriptor::initWithAttributedTitle:summary:xAxisDescriptor:yAxisDescriptor:additionalAxes:series: not bound -!missing-selector! AXChartDescriptor::initWithAttributedTitle:summary:xAxisDescriptor:yAxisDescriptor:series: not bound -!missing-selector! AXChartDescriptor::initWithTitle:summary:xAxisDescriptor:yAxisDescriptor:additionalAxes:series: not bound -!missing-selector! AXChartDescriptor::initWithTitle:summary:xAxisDescriptor:yAxisDescriptor:series: not bound -!missing-selector! AXChartDescriptor::series not bound -!missing-selector! AXChartDescriptor::setAdditionalAxes: not bound -!missing-selector! AXChartDescriptor::setAttributedTitle: not bound -!missing-selector! AXChartDescriptor::setContentDirection: not bound -!missing-selector! AXChartDescriptor::setContentFrame: not bound -!missing-selector! AXChartDescriptor::setSeries: not bound -!missing-selector! AXChartDescriptor::setSummary: not bound -!missing-selector! AXChartDescriptor::setTitle: not bound -!missing-selector! AXChartDescriptor::setXAxis: not bound -!missing-selector! AXChartDescriptor::setYAxis: not bound -!missing-selector! AXChartDescriptor::summary not bound -!missing-selector! AXChartDescriptor::title not bound -!missing-selector! AXChartDescriptor::xAxis not bound -!missing-selector! AXChartDescriptor::yAxis not bound -!missing-selector! AXDataPoint::additionalValues not bound -!missing-selector! AXDataPoint::attributedLabel not bound -!missing-selector! AXDataPoint::initWithX:y: not bound -!missing-selector! AXDataPoint::initWithX:y:additionalValues: not bound -!missing-selector! AXDataPoint::initWithX:y:additionalValues:label: not bound -!missing-selector! AXDataPoint::label not bound -!missing-selector! AXDataPoint::setAdditionalValues: not bound -!missing-selector! AXDataPoint::setAttributedLabel: not bound -!missing-selector! AXDataPoint::setLabel: not bound -!missing-selector! AXDataPoint::setXValue: not bound -!missing-selector! AXDataPoint::setYValue: not bound -!missing-selector! AXDataPoint::xValue not bound -!missing-selector! AXDataPoint::yValue not bound -!missing-selector! AXDataPointValue::category not bound -!missing-selector! AXDataPointValue::number not bound -!missing-selector! AXDataPointValue::setCategory: not bound -!missing-selector! AXDataPointValue::setNumber: not bound -!missing-selector! AXDataSeriesDescriptor::attributedName not bound -!missing-selector! AXDataSeriesDescriptor::dataPoints not bound -!missing-selector! AXDataSeriesDescriptor::initWithAttributedName:isContinuous:dataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::initWithName:isContinuous:dataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::isContinuous not bound -!missing-selector! AXDataSeriesDescriptor::name not bound -!missing-selector! AXDataSeriesDescriptor::setAttributedName: not bound -!missing-selector! AXDataSeriesDescriptor::setDataPoints: not bound -!missing-selector! AXDataSeriesDescriptor::setIsContinuous: not bound -!missing-selector! AXDataSeriesDescriptor::setName: not bound -!missing-selector! AXNumericDataAxisDescriptor::gridlinePositions not bound -!missing-selector! AXNumericDataAxisDescriptor::initWithAttributedTitle:lowerBound:upperBound:gridlinePositions:valueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::initWithTitle:lowerBound:upperBound:gridlinePositions:valueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::lowerBound not bound -!missing-selector! AXNumericDataAxisDescriptor::scaleType not bound -!missing-selector! AXNumericDataAxisDescriptor::setGridlinePositions: not bound -!missing-selector! AXNumericDataAxisDescriptor::setLowerBound: not bound -!missing-selector! AXNumericDataAxisDescriptor::setScaleType: not bound -!missing-selector! AXNumericDataAxisDescriptor::setUpperBound: not bound -!missing-selector! AXNumericDataAxisDescriptor::setValueDescriptionProvider: not bound -!missing-selector! AXNumericDataAxisDescriptor::upperBound not bound -!missing-selector! AXNumericDataAxisDescriptor::valueDescriptionProvider not bound -!missing-type! AXCategoricalDataAxisDescriptor not bound -!missing-type! AXChartDescriptor not bound -!missing-type! AXDataPoint not bound -!missing-type! AXDataPointValue not bound -!missing-type! AXDataSeriesDescriptor not bound -!missing-type! AXLiveAudioGraph not bound -!missing-type! AXNumericDataAxisDescriptor not bound From cb1bfd64f34dbe7457e9cab7ddaff08050fcfb6a Mon Sep 17 00:00:00 2001 From: Rachel Kang Date: Tue, 17 Aug 2021 10:04:29 -0400 Subject: [PATCH 2/7] [Vision] Update bindings for Xcode 13.0 beta 1 --- src/Vision/VNUtils.cs | 16 ++ src/vision.cs | 237 +++++++++++++++++++- tests/monotouch-test/Vision/VNUtilsTests.cs | 60 +++++ tests/xtro-sharpie/MacCatalyst-Vision.todo | 76 ------- tests/xtro-sharpie/common-Vision.ignore | 21 ++ tests/xtro-sharpie/iOS-Vision.todo | 77 ------- tests/xtro-sharpie/macOS-Vision.todo | 77 ------- tests/xtro-sharpie/tvOS-Vision.todo | 77 ------- 8 files changed, 328 insertions(+), 313 deletions(-) create mode 100644 tests/monotouch-test/Vision/VNUtilsTests.cs delete mode 100644 tests/xtro-sharpie/MacCatalyst-Vision.todo delete mode 100644 tests/xtro-sharpie/iOS-Vision.todo delete mode 100644 tests/xtro-sharpie/macOS-Vision.todo delete mode 100644 tests/xtro-sharpie/tvOS-Vision.todo diff --git a/src/Vision/VNUtils.cs b/src/Vision/VNUtils.cs index 1e32dd810107..24ce53a84e62 100644 --- a/src/Vision/VNUtils.cs +++ b/src/Vision/VNUtils.cs @@ -54,6 +54,22 @@ public static partial class VNUtils { [DllImport (Constants.VisionLibrary, EntryPoint = "VNNormalizedRectForImageRect")] public static extern CGRect GetNormalizedRect (CGRect imageRect, nuint imageWidth, nuint imageHeight); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [DllImport (Constants.VisionLibrary, EntryPoint="VNImagePointForNormalizedPointUsingRegionOfInterest")] + public static extern CGPoint GetImagePoint (CGPoint normalizedPoint, nuint imageWidth, nuint imageHeight, CGRect roi); + + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [DllImport (Constants.VisionLibrary, EntryPoint="VNNormalizedPointForImagePointUsingRegionOfInterest")] + public static extern CGPoint GetNormalizedPoint (CGPoint imagePoint, nuint imageWidth, nuint imageHeight, CGRect roi); + + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [DllImport (Constants.VisionLibrary, EntryPoint="VNImageRectForNormalizedRectUsingRegionOfInterest")] + public static extern CGRect GetImageRect (CGRect normalizedRect, nuint imageWidth, nuint imageHeight, CGRect roi); + + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [DllImport (Constants.VisionLibrary, EntryPoint="VNNormalizedRectForImageRectUsingRegionOfInterest")] + public static extern CGRect GetNormalizedRect (CGRect imageRect, nuint imageWidth, nuint imageHeight, CGRect roi); + [DllImport ("__Internal", EntryPoint = "xamarin_CGPoint__VNNormalizedFaceBoundingBoxPointForLandmarkPoint_Vector2_CGRect_nuint_nuint_string")] static extern CGPoint VNNormalizedFaceBoundingBoxPointForLandmarkPoint (Vector2 faceLandmarkPoint, CGRect faceBoundingBox, nuint imageWidth, nuint imageHeight, out IntPtr error); diff --git a/src/vision.cs b/src/vision.cs index 7bce67637847..8cdf9d8b939f 100644 --- a/src/vision.cs +++ b/src/vision.cs @@ -48,6 +48,7 @@ enum VNErrorCode : long { UnsupportedRevision, DataUnavailable, TimeStampNotFound, + UnsupportedRequest, } [TV (11,0), Mac (10,13), iOS (11,0)] @@ -117,6 +118,39 @@ enum VNBarcodeSymbology { [Field ("VNBarcodeSymbologyUPCE")] Upce, + + [iOS (15,0), Mac (12,0), TV (15,0), MacCatalyst (15,0)] + [Field ("VNBarcodeSymbologyCodabar")] + Codabar, + + [iOS (15,0), Mac (12,0), TV (15,0), MacCatalyst (15,0)] + [Field ("VNBarcodeSymbologyGS1DataBar")] + Gs1DataBar, + + [iOS (15,0), Mac (12,0), TV (15,0), MacCatalyst (15,0)] + [Field ("VNBarcodeSymbologyGS1DataBarExpanded")] + Gs1DataBarExpanded, + + [iOS (15,0), Mac (12,0), TV (15,0), MacCatalyst (15,0)] + [Field ("VNBarcodeSymbologyGS1DataBarLimited")] + Gs1DataBarLimited, + + [iOS (15,0), Mac (12,0), TV (15,0), MacCatalyst (15,0)] + [Field ("VNBarcodeSymbologyMicroPDF417")] + MicroPDF417, + + [iOS (15,0), Mac (12,0), TV (15,0), MacCatalyst (15,0)] + [Field ("VNBarcodeSymbologyMicroQR")] + MicroQR, + } + + [TV (15,0), Mac (12,0), iOS (15,0)] + [Native] + public enum VNChirality : long + { + Unknown = 0, + Left = -1, + Right = 1, } [TV (12,0), Mac (10,14), iOS (12,0)] @@ -139,6 +173,8 @@ enum VNCoreMLRequestRevision : ulong { enum VNDetectBarcodesRequestRevision : ulong { Unspecified = 0, One = 1, + [TV (15,0), Mac (12,0), iOS (15,0)] + Two = 2, } [TV (12,0), Mac (10,14), iOS (12,0)] @@ -157,6 +193,8 @@ enum VNDetectFaceRectanglesRequestRevision : ulong { Unspecified = 0, One = 1, Two = 2, + [TV (15,0), Mac (12,0), iOS (15,0)] + Three = 3, } [TV (12,0), Mac (10,14), iOS (12,0)] @@ -265,6 +303,12 @@ enum VNClassifyImageRequestRevision : ulong { One = 1, } + [TV (15,0), Mac (12,0), iOS (15,0)] + [Native] + enum VNDetectDocumentSegmentationRequestRevision : ulong { + One = 1, + } + [TV (13,0), Mac (10,15), iOS (13,0)] [Native] enum VNDetectFaceCaptureQualityRequestRevision : ulong { @@ -287,6 +331,7 @@ enum VNRequestFaceLandmarksConstellation : ulong { enum VNDetectHumanRectanglesRequestRevision : ulong { Unspecified = 0, One = 1, + Two = 2, } [TV (13,0), Mac (10,15), iOS (13,0)] @@ -315,6 +360,7 @@ enum VNGenerateObjectnessBasedSaliencyImageRequestRevision : ulong { enum VNRecognizeAnimalsRequestRevision : ulong { Unspecified = 0, One = 1, + Two = 2, } [TV (13,0), Mac (10,15), iOS (13,0)] @@ -391,6 +437,12 @@ enum VNGenerateOpticalFlowRequestRevision : ulong { One = 1, } + [TV (15,0), Mac (12,0), iOS (15,0)] + [Native] + enum VNGeneratePersonSegmentationRequestRevision : ulong { + One = 1, + } + [TV (14,0), Mac (11,0), iOS (14,0)] [MacCatalyst (14,0)] [Native] @@ -590,6 +642,23 @@ enum VNHumanHandPoseObservationJointsGroupName { All, } + [Native] + public enum VNGeneratePersonSegmentationRequestQualityLevel : ulong + { + Accurate = 0, + Balanced, + Fast, + } + + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [BaseType (typeof(VNDetectedObjectObservation))] + interface VNHumanObservation + { + [NullAllowed] + [Export ("upperBodyOnly")] + bool UpperBodyOnly { get; } + } + [TV (11,0), Mac (10,13), iOS (11,0)] [BaseType (typeof (NSObject))] [DisableDefaultCtor] @@ -672,19 +741,30 @@ interface VNDetectBarcodesRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use 'GetSupportedSymbologiesAndReturnError' instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use 'GetSupportedSymbologiesAndReturnError' instead.")] + [Deprecated (PlatformName.TvOS, 15, 0, message: "Use 'GetSupportedSymbologiesAndReturnError' instead.")] [Static] [Protected] [Export ("supportedSymbologies", ArgumentSemantic.Copy)] NSString [] WeakSupportedSymbologies { get; } - [Static] [Wrap ("VNBarcodeSymbologyExtensions.GetValues (WeakSupportedSymbologies)")] VNBarcodeSymbology [] SupportedSymbologies { get; } + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [Export ("supportedSymbologiesAndReturnError:")] + [return: NullAllowed] + string[] GetSupportedSymbologiesAndReturnError ([NullAllowed] out NSError error); + // using NSString instead of string here + [Protected] [Export ("symbologies", ArgumentSemantic.Copy)] NSString [] WeakSymbologies { get; set; } + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNBarcodeObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -732,6 +812,9 @@ interface VNDetectFaceLandmarksRequest : VNFaceObservationAccepting { [Export ("constellation", ArgumentSemantic.Assign)] VNRequestFaceLandmarksConstellation Constellation { get; set; } + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNFaceObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -770,6 +853,9 @@ interface VNDetectFaceRectanglesRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNFaceObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -808,6 +894,9 @@ interface VNDetectHorizonRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNHorizonObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -864,6 +953,9 @@ interface VNDetectRectanglesRequest { [Export ("maximumObservations")] nuint MaximumObservations { get; set; } + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNRectangleObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -905,6 +997,9 @@ interface VNDetectTextRectanglesRequest { [Export ("reportCharacterBoxes")] bool ReportCharacterBoxes { get; set; } + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNTextObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -1162,6 +1257,9 @@ interface VNImageRegistrationRequest { [BaseType (typeof (VNImageRegistrationRequest))] interface VNTranslationalImageRegistrationRequest { + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNImageTranslationAlignmentObservation[] Results { get; } + // Inlined from parent class [Export ("initWithTargetedCVPixelBuffer:options:")] IntPtr Constructor (CVPixelBuffer pixelBuffer, NSDictionary optionsDict); @@ -1310,6 +1408,9 @@ interface VNTranslationalImageRegistrationRequest { [BaseType (typeof (VNImageRegistrationRequest))] interface VNHomographicImageRegistrationRequest { + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNImageHomographicAlignmentObservation[] Results { get; } + // Inlined from parent class [Export ("initWithTargetedCVPixelBuffer:options:")] IntPtr Constructor (CVPixelBuffer pixelBuffer, NSDictionary optionsDict); @@ -1494,6 +1595,10 @@ interface VNDetectedObjectObservation { [Export ("boundingBox", ArgumentSemantic.Assign)] CGRect BoundingBox { get; } + + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [NullAllowed, Export ("globalSegmentationMask")] + VNPixelBufferObservation GlobalSegmentationMask { get; } } [TV (11,0), Mac (10,13), iOS (11,0)] @@ -1514,11 +1619,19 @@ interface VNFaceObservation { [Export ("observationWithRequestRevision:boundingBox:")] VNFaceObservation FromBoundingBox (VNFaceObservationRequestRevision requestRevision, CGRect boundingBox); + [Deprecated (PlatformName.MacOSX, 12, 0)] + [Deprecated (PlatformName.iOS, 15, 0)] + [Deprecated (PlatformName.TvOS, 15, 0)] [TV (12,0), Mac (10,14), iOS (12,0)] [Static] [Export ("faceObservationWithRequestRevision:boundingBox:roll:yaw:")] VNFaceObservation FromBoundingBox (VNFaceObservationRequestRevision requestRevision, CGRect boundingBox, [NullAllowed] [BindAs (typeof (nfloat?))] NSNumber roll, [NullAllowed] [BindAs (typeof (nfloat?))] NSNumber yaw); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [Static] + [Export ("faceObservationWithRequestRevision:boundingBox:roll:yaw:pitch:")] + VNFaceObservation FromBoundingBox (VNFaceObservationRequestRevision requestRevision, CGRect boundingBox, [NullAllowed] [BindAs (typeof (nfloat?))] NSNumber roll, [NullAllowed] [BindAs (typeof (nfloat?))] NSNumber yaw, [NullAllowed] [BindAs (typeof (nfloat?))] NSNumber pitch); + [TV (13,0), Mac (10,15), iOS (13,0)] [BindAs (typeof (float?))] [NullAllowed, Export ("faceCaptureQuality", ArgumentSemantic.Strong)] @@ -1533,6 +1646,11 @@ interface VNFaceObservation { [BindAs (typeof (nfloat?))] [NullAllowed, Export ("yaw", ArgumentSemantic.Strong)] NSNumber Yaw { get; } + + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [BindAs (typeof (nfloat?))] + [NullAllowed, Export ("pitch", ArgumentSemantic.Strong)] + NSNumber Pitch { get; } } [TV (12,0), Mac (10,14), iOS (12,0)] @@ -1725,10 +1843,6 @@ interface VNImageHomographicAlignmentObservation { Matrix3 WarpTransform { [MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")] get; -#if !XAMCORE_4_0 - [NotImplemented] - set; -#endif } } @@ -2265,11 +2379,22 @@ interface VNClassifyImageRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use 'GetSupportedIdentifiersAndReturnError' instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use 'GetSupportedIdentifiersAndReturnError' instead.")] + [Deprecated (PlatformName.TvOS, 15, 0, message: "Use 'GetSupportedIdentifiersAndReturnError' instead.")] [Static] [Export ("knownClassificationsForRevision:error:")] [return: NullAllowed] VNClassificationObservation [] GetKnownClassifications (VNClassifyImageRequestRevision revision, [NullAllowed] out NSError error); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [Export ("supportedIdentifiersAndReturnError:")] + [return: NullAllowed] + string[] GetSupportedIdentifiersAndReturnError ([NullAllowed] out NSError error); + + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNClassificationObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -2303,6 +2428,9 @@ interface VNDetectFaceCaptureQualityRequest : VNFaceObservationAccepting { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNFaceObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -2336,6 +2464,13 @@ interface VNDetectHumanRectanglesRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [Export ("upperBodyOnly")] + bool UpperBodyOnly { get; set; } + + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNHumanObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -2369,6 +2504,9 @@ interface VNGenerateAttentionBasedSaliencyImageRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNRecognizedTextObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -2405,6 +2543,9 @@ interface VNGenerateImageFeaturePrintRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNFeaturePrintObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -2438,6 +2579,9 @@ interface VNGenerateObjectnessBasedSaliencyImageRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNSaliencyImageObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -2465,7 +2609,7 @@ interface VNGenerateObjectnessBasedSaliencyImageRequest { [TV (13,0), Mac (10,15), iOS (13,0)] [BaseType (typeof (NSObject))] [DisableDefaultCtor] - interface VNRecognizedText : NSCopying, NSSecureCoding { + interface VNRecognizedText : NSCopying, NSSecureCoding, VNRequestRevisionProviding { [Export ("string")] string String { get; } @@ -2538,16 +2682,27 @@ enum VNAnimalIdentifier { [DisableDefaultCtor] interface VNRecognizeAnimalsRequest { + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use 'GetSupportedIdentifiersAndReturnError' instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use 'GetSupportedIdentifiersAndReturnError' instead.")] + [Deprecated (PlatformName.TvOS, 15, 0, message: "Use 'GetSupportedIdentifiersAndReturnError' instead.")] [Static] [Export ("knownAnimalIdentifiersForRevision:error:")] [return: NullAllowed] [return: BindAs (typeof (VNAnimalIdentifier []))] NSString [] GetKnownAnimalIdentifiers (VNRecognizeAnimalsRequestRevision revision, [NullAllowed] out NSError error); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [Export ("supportedIdentifiersAndReturnError:")] + [return: NullAllowed] + string[] GetSupportedIdentifiersAndReturnError ([NullAllowed] out NSError error); + [Export ("initWithCompletionHandler:")] [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNRecognizedObjectObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -2577,11 +2732,19 @@ interface VNRecognizeAnimalsRequest { [DisableDefaultCtor] interface VNRecognizeTextRequest : VNRequestProgressProviding { + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use 'GetSupportedRecognitionLanguagesAndReturnError' instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use 'GetSupportedRecognitionLanguagesAndReturnError' instead.")] + [Deprecated (PlatformName.TvOS, 15, 0, message: "Use 'GetSupportedRecognitionLanguagesAndReturnError' instead.")] [Static] [Export ("supportedRecognitionLanguagesForTextRecognitionLevel:revision:error:")] [return: NullAllowed] string [] GetSupportedRecognitionLanguages (VNRequestTextRecognitionLevel textRecognitionLevel, VNRecognizeTextRequestRevision revision, [NullAllowed] out NSError error); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [Export ("supportedRecognitionLanguagesAndReturnError:")] + [return: NullAllowed] + string[] GetSupportedRecognitionLanguagesAndReturnError ([NullAllowed] out NSError error); + [Export ("recognitionLanguages", ArgumentSemantic.Copy)] string [] RecognitionLanguages { get; set; } @@ -2601,6 +2764,9 @@ interface VNRecognizeTextRequest : VNRequestProgressProviding { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNRecognizedTextObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -2651,6 +2817,10 @@ interface VNDetectContoursRequest { [Export ("contrastAdjustment")] float ContrastAdjustment { get; set; } + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [NullAllowed, Export ("contrastPivot", ArgumentSemantic.Assign)] + NSNumber ContrastPivot { get; set; } + [Export ("detectsDarkOnLight")] bool DetectsDarkOnLight { get; set; } @@ -2661,6 +2831,9 @@ interface VNDetectContoursRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNContoursObservation[] Results { get; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -2778,6 +2951,10 @@ interface VNHumanHandPoseObservation { [Export ("recognizedPointsForJointsGroupName:error:")] [return: NullAllowed] NSDictionary GetRecognizedPoints ([BindAs (typeof (VNHumanHandPoseObservationJointsGroupName))] NSString jointsGroupName, [NullAllowed] out NSError error); + + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [Export ("chirality")] + VNChirality Chirality { get; } } [TV (14,0), Mac (11,0), iOS (14,0)] @@ -2853,6 +3030,10 @@ interface VNDetectTrajectoriesRequest { [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNTrajectoryObservation [] Results { get; } + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [Export ("targetFrameTime", ArgumentSemantic.Assign)] + CMTime TargetFrameTime { get; set; } + // We must inline the following 5 properties // ('Revision', 'WeakSupportedRevisions', 'SupportedRevisions', 'DefaultRevision' and 'CurrentRevision') // into subclasses so the correct class_ptr is used for the static members and the right enum type is also used. @@ -3108,6 +3289,9 @@ interface VNGenerateOpticalFlowRequest { [Export ("outputPixelFormat")] CVPixelFormatType OutputPixelFormat { get; set; } + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNPixelBufferObservation[] Results { get; } + // Inlined from parent class [Export ("initWithTargetedCVPixelBuffer:options:")] IntPtr Constructor (CVPixelBuffer pixelBuffer, NSDictionary optionsDict); @@ -3253,6 +3437,31 @@ interface VNGenerateOpticalFlowRequest { VNGenerateOpticalFlowRequestRevision CurrentRevision { get; } } + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [BaseType (typeof(VNStatefulRequest))] + interface VNGeneratePersonSegmentationRequest + { + [Static] + [Export ("new")] + [return: Release] + VNGeneratePersonSegmentationRequest Create (); + + [Export ("initWithCompletionHandler:")] + IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + + [Export ("initWithFrameAnalysisSpacing:completionHandler:")] + IntPtr Constructor (CMTime frameAnalysisSpacing, [NullAllowed] VNRequestCompletionHandler completionHandler); + + [Export ("qualityLevel", ArgumentSemantic.Assign)] + VNGeneratePersonSegmentationRequestQualityLevel QualityLevel { get; set; } + + [Export ("outputPixelFormat")] + uint OutputPixelFormat { get; set; } + + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNPixelBufferObservation[] Results { get; } + } + [TV (14,0), Mac (11,0), iOS (14,0)] [MacCatalyst (14,0)] [BaseType (typeof (VNObservation))] @@ -3270,6 +3479,10 @@ Vector3 EquationCoefficients { [MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")] get; } + + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [Export ("movingAverageRadius")] + nfloat MovingAverageRadius { get; } } [TV (14,0), Mac (11,0), iOS (14,0)] @@ -3450,4 +3663,16 @@ interface VNVideoProcessorRequestProcessingOptions : NSCopying { [NullAllowed, Export ("cadence", ArgumentSemantic.Copy)] VNVideoProcessorCadence Cadence { get; set; } } + + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [BaseType (typeof(VNImageBasedRequest))] + interface VNDetectDocumentSegmentationRequest + { + [Export ("initWithCompletionHandler:")] + [DesignatedInitializer] + IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + + [NullAllowed, Export ("results", ArgumentSemantic.Copy)] + VNRectangleObservation[] Results { get; } + } } diff --git a/tests/monotouch-test/Vision/VNUtilsTests.cs b/tests/monotouch-test/Vision/VNUtilsTests.cs new file mode 100644 index 000000000000..747ea672893a --- /dev/null +++ b/tests/monotouch-test/Vision/VNUtilsTests.cs @@ -0,0 +1,60 @@ +// +// Unit tests for VNUtils +// +// Authors: +// Rachel Kang +// +// Copyright (c) Microsoft Corporation. +// + +#if !__WATCHOS__ + +using System; +using System.Collections; +using System.Collections.Generic; +using NUnit.Framework; +using OpenTK; + +using CoreGraphics; +using Foundation; +using Vision; + +namespace MonoTouchFixtures.Vision { + + [TestFixture] + [Preserve (AllMembers = true)] + public class VNUtilsTests { + + [SetUp] + public void Setup () => TestRuntime.AssertXcodeVersion (13, 0); + + [Test] + public void GetImagePointTest () + { + var imagePoint = VNUtils.GetImagePoint (new CGPoint(0, 0), 1, 1, new CGRect(0, 0, 1, 1)); + Assert.NotNull (imagePoint, $"VNImagePointForNormalizedPointUsingRegionOfInterest is not null"); + } + + [Test] + public void GetNormalizedPointTest () + { + var normalizedPoint = VNUtils.GetNormalizedPoint (new CGPoint(0, 0), 1, 1, new CGRect(0, 0, 1, 1)); + Assert.NotNull (normalizedPoint, $"VNNormalizedPointForImagePointUsingRegionOfInterest is not null"); + } + + [Test] + public void GetImageRectTest () + { + var normalizedPoint = VNUtils.GetImageRect (new CGRect(0, 0, 1, 1), 1, 1, new CGRect(0, 0, 1, 1)); + Assert.NotNull (normalizedPoint, $"VNImageRectForNormalizedRectUsingRegionOfInterest is not null"); + } + + [Test] + public void GetNormalizedRectTest () + { + var normalizedPoint = VNUtils.GetImageRect (new CGRect(0, 0, 1, 1), 1, 1, new CGRect(0, 0, 1, 1)); + Assert.NotNull (normalizedPoint, $"VNNormalizedRectForImageRectUsingRegionOfInterest is not null"); + } + } +} +#endif diff --git a/tests/xtro-sharpie/MacCatalyst-Vision.todo b/tests/xtro-sharpie/MacCatalyst-Vision.todo deleted file mode 100644 index e234cfc8cb09..000000000000 --- a/tests/xtro-sharpie/MacCatalyst-Vision.todo +++ /dev/null @@ -1,76 +0,0 @@ -!missing-enum! VNChirality not bound -!missing-enum! VNGeneratePersonSegmentationRequestQualityLevel not bound -!missing-enum-value! VNErrorCode native value VNErrorUnsupportedRequest = 19 not bound -!missing-field! VNBarcodeSymbologyAztec_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCodabar not bound -!missing-field! VNBarcodeSymbologyCode128_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39Checksum_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39FullASCIIChecksum_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39FullASCII_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode93_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode93i_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyDataMatrix_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyEAN13_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyEAN8_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyGS1DataBar not bound -!missing-field! VNBarcodeSymbologyGS1DataBarExpanded not bound -!missing-field! VNBarcodeSymbologyGS1DataBarLimited not bound -!missing-field! VNBarcodeSymbologyI2of5Checksum_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyI2of5_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyITF14_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyMicroPDF417 not bound -!missing-field! VNBarcodeSymbologyMicroQR not bound -!missing-field! VNBarcodeSymbologyPDF417_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyQR_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyUPCE_SwiftDeprecated not bound -!missing-pinvoke! VNImagePointForNormalizedPointUsingRegionOfInterest is not bound -!missing-pinvoke! VNImageRectForNormalizedRectUsingRegionOfInterest is not bound -!missing-pinvoke! VNNormalizedPointForImagePointUsingRegionOfInterest is not bound -!missing-pinvoke! VNNormalizedRectForImageRectUsingRegionOfInterest is not bound -!missing-protocol-conformance! VNRecognizedText should conform to VNRequestRevisionProviding -!missing-selector! +VNFaceObservation::faceObservationWithRequestRevision:boundingBox:roll:yaw:pitch: not bound -!missing-selector! VNClassifyImageRequest::results not bound -!missing-selector! VNClassifyImageRequest::supportedIdentifiersAndReturnError: not bound -!missing-selector! VNDetectBarcodesRequest::results not bound -!missing-selector! VNDetectBarcodesRequest::supportedSymbologiesAndReturnError: not bound -!missing-selector! VNDetectContoursRequest::contrastPivot not bound -!missing-selector! VNDetectContoursRequest::results not bound -!missing-selector! VNDetectContoursRequest::setContrastPivot: not bound -!missing-selector! VNDetectDocumentSegmentationRequest::results not bound -!missing-selector! VNDetectFaceCaptureQualityRequest::results not bound -!missing-selector! VNDetectFaceLandmarksRequest::results not bound -!missing-selector! VNDetectFaceRectanglesRequest::results not bound -!missing-selector! VNDetectHorizonRequest::results not bound -!missing-selector! VNDetectHumanRectanglesRequest::results not bound -!missing-selector! VNDetectHumanRectanglesRequest::setUpperBodyOnly: not bound -!missing-selector! VNDetectHumanRectanglesRequest::upperBodyOnly not bound -!missing-selector! VNDetectRectanglesRequest::results not bound -!missing-selector! VNDetectTextRectanglesRequest::results not bound -!missing-selector! VNDetectTrajectoriesRequest::setTargetFrameTime: not bound -!missing-selector! VNDetectTrajectoriesRequest::targetFrameTime not bound -!missing-selector! VNDetectedObjectObservation::globalSegmentationMask not bound -!missing-selector! VNFaceObservation::pitch not bound -!missing-selector! VNGenerateAttentionBasedSaliencyImageRequest::results not bound -!missing-selector! VNGenerateImageFeaturePrintRequest::results not bound -!missing-selector! VNGenerateObjectnessBasedSaliencyImageRequest::results not bound -!missing-selector! VNGenerateOpticalFlowRequest::results not bound -!missing-selector! VNGeneratePersonSegmentationRequest::init not bound -!missing-selector! VNGeneratePersonSegmentationRequest::initWithCompletionHandler: not bound -!missing-selector! VNGeneratePersonSegmentationRequest::outputPixelFormat not bound -!missing-selector! VNGeneratePersonSegmentationRequest::qualityLevel not bound -!missing-selector! VNGeneratePersonSegmentationRequest::results not bound -!missing-selector! VNGeneratePersonSegmentationRequest::setOutputPixelFormat: not bound -!missing-selector! VNGeneratePersonSegmentationRequest::setQualityLevel: not bound -!missing-selector! VNHomographicImageRegistrationRequest::results not bound -!missing-selector! VNHumanHandPoseObservation::chirality not bound -!missing-selector! VNHumanObservation::upperBodyOnly not bound -!missing-selector! VNRecognizeAnimalsRequest::results not bound -!missing-selector! VNRecognizeAnimalsRequest::supportedIdentifiersAndReturnError: not bound -!missing-selector! VNRecognizeTextRequest::results not bound -!missing-selector! VNRecognizeTextRequest::supportedRecognitionLanguagesAndReturnError: not bound -!missing-selector! VNTrajectoryObservation::movingAverageRadius not bound -!missing-selector! VNTranslationalImageRegistrationRequest::results not bound -!missing-type! VNDetectDocumentSegmentationRequest not bound -!missing-type! VNGeneratePersonSegmentationRequest not bound -!missing-type! VNHumanObservation not bound diff --git a/tests/xtro-sharpie/common-Vision.ignore b/tests/xtro-sharpie/common-Vision.ignore index baddb958a20b..a5b6022d2980 100644 --- a/tests/xtro-sharpie/common-Vision.ignore +++ b/tests/xtro-sharpie/common-Vision.ignore @@ -41,6 +41,8 @@ !unknown-native-enum! VNDetectTrajectoriesRequestRevision bound !unknown-native-enum! VNGenerateOpticalFlowRequestRevision bound !unknown-native-enum! VNStatefulRequestRevision bound +!unknown-native-enum! VNDetectDocumentSegmentationRequestRevision bound +!unknown-native-enum! VNGeneratePersonSegmentationRequestRevision bound ## VNRequest is an abstract class so this will be bound in subclasses ## matching the return type to the above defined custom enums @@ -92,3 +94,22 @@ !missing-selector! VNStatefulRequest::requestFrameAnalysisSpacing not bound !missing-selector! VNVideoProcessor::addRequest:withProcessingOptions:error: not bound !missing-selector! VNVideoProcessor::analyzeWithTimeRange:error: not bound + +# Existing enums with name changes relevant only to Swift +!missing-field! VNBarcodeSymbologyAztec_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyCode128_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyCode39_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyCode39Checksum_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyCode39FullASCII_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyCode39FullASCIIChecksum_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyCode93_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyCode93i_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyDataMatrix_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyEAN13_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyEAN8_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyI2of5_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyI2of5Checksum_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyITF14_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyPDF417_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyQR_SwiftDeprecated not bound +!missing-field! VNBarcodeSymbologyUPCE_SwiftDeprecated not bound diff --git a/tests/xtro-sharpie/iOS-Vision.todo b/tests/xtro-sharpie/iOS-Vision.todo deleted file mode 100644 index eb235125858f..000000000000 --- a/tests/xtro-sharpie/iOS-Vision.todo +++ /dev/null @@ -1,77 +0,0 @@ -!missing-enum! VNChirality not bound -!missing-enum! VNGeneratePersonSegmentationRequestQualityLevel not bound -!missing-enum-value! VNErrorCode native value VNErrorUnsupportedRequest = 19 not bound -!missing-field! VNBarcodeSymbologyAztec_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCodabar not bound -!missing-field! VNBarcodeSymbologyCode128_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39Checksum_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39FullASCIIChecksum_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39FullASCII_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode93_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode93i_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyDataMatrix_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyEAN13_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyEAN8_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyGS1DataBar not bound -!missing-field! VNBarcodeSymbologyGS1DataBarExpanded not bound -!missing-field! VNBarcodeSymbologyGS1DataBarLimited not bound -!missing-field! VNBarcodeSymbologyI2of5Checksum_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyI2of5_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyITF14_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyMicroPDF417 not bound -!missing-field! VNBarcodeSymbologyMicroQR not bound -!missing-field! VNBarcodeSymbologyPDF417_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyQR_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyUPCE_SwiftDeprecated not bound -!missing-pinvoke! VNImagePointForNormalizedPointUsingRegionOfInterest is not bound -!missing-pinvoke! VNImageRectForNormalizedRectUsingRegionOfInterest is not bound -!missing-pinvoke! VNNormalizedPointForImagePointUsingRegionOfInterest is not bound -!missing-pinvoke! VNNormalizedRectForImageRectUsingRegionOfInterest is not bound -!missing-protocol-conformance! VNRecognizedText should conform to VNRequestRevisionProviding -!missing-selector! +VNFaceObservation::faceObservationWithRequestRevision:boundingBox:roll:yaw:pitch: not bound -!missing-selector! VNClassifyImageRequest::results not bound -!missing-selector! VNClassifyImageRequest::supportedIdentifiersAndReturnError: not bound -!missing-selector! VNDetectBarcodesRequest::results not bound -!missing-selector! VNDetectBarcodesRequest::supportedSymbologiesAndReturnError: not bound -!missing-selector! VNDetectContoursRequest::contrastPivot not bound -!missing-selector! VNDetectContoursRequest::results not bound -!missing-selector! VNDetectContoursRequest::setContrastPivot: not bound -!missing-selector! VNDetectDocumentSegmentationRequest::results not bound -!missing-selector! VNDetectFaceCaptureQualityRequest::results not bound -!missing-selector! VNDetectFaceLandmarksRequest::results not bound -!missing-selector! VNDetectFaceRectanglesRequest::results not bound -!missing-selector! VNDetectHorizonRequest::results not bound -!missing-selector! VNDetectHumanRectanglesRequest::results not bound -!missing-selector! VNDetectHumanRectanglesRequest::setUpperBodyOnly: not bound -!missing-selector! VNDetectHumanRectanglesRequest::upperBodyOnly not bound -!missing-selector! VNDetectRectanglesRequest::results not bound -!missing-selector! VNDetectTextRectanglesRequest::results not bound -!missing-selector! VNDetectTrajectoriesRequest::setTargetFrameTime: not bound -!missing-selector! VNDetectTrajectoriesRequest::targetFrameTime not bound -!missing-selector! VNDetectedObjectObservation::globalSegmentationMask not bound -!missing-selector! VNFaceObservation::pitch not bound -!missing-selector! VNGenerateAttentionBasedSaliencyImageRequest::results not bound -!missing-selector! VNGenerateImageFeaturePrintRequest::results not bound -!missing-selector! VNGenerateObjectnessBasedSaliencyImageRequest::results not bound -!missing-selector! VNGenerateOpticalFlowRequest::results not bound -!missing-selector! VNGeneratePersonSegmentationRequest::init not bound -!missing-selector! VNGeneratePersonSegmentationRequest::initWithCompletionHandler: not bound -!missing-selector! VNGeneratePersonSegmentationRequest::outputPixelFormat not bound -!missing-selector! VNGeneratePersonSegmentationRequest::qualityLevel not bound -!missing-selector! VNGeneratePersonSegmentationRequest::results not bound -!missing-selector! VNGeneratePersonSegmentationRequest::setOutputPixelFormat: not bound -!missing-selector! VNGeneratePersonSegmentationRequest::setQualityLevel: not bound -!missing-selector! VNHomographicImageRegistrationRequest::results not bound -!missing-selector! VNHumanHandPoseObservation::chirality not bound -!missing-selector! VNHumanObservation::upperBodyOnly not bound -!missing-selector! VNRecognizeAnimalsRequest::results not bound -!missing-selector! VNRecognizeAnimalsRequest::supportedIdentifiersAndReturnError: not bound -!missing-selector! VNRecognizeTextRequest::results not bound -!missing-selector! VNRecognizeTextRequest::supportedRecognitionLanguagesAndReturnError: not bound -!missing-selector! VNTrajectoryObservation::movingAverageRadius not bound -!missing-selector! VNTranslationalImageRegistrationRequest::results not bound -!missing-type! VNDetectDocumentSegmentationRequest not bound -!missing-type! VNGeneratePersonSegmentationRequest not bound -!missing-type! VNHumanObservation not bound -## appended from unclassified file diff --git a/tests/xtro-sharpie/macOS-Vision.todo b/tests/xtro-sharpie/macOS-Vision.todo deleted file mode 100644 index eb235125858f..000000000000 --- a/tests/xtro-sharpie/macOS-Vision.todo +++ /dev/null @@ -1,77 +0,0 @@ -!missing-enum! VNChirality not bound -!missing-enum! VNGeneratePersonSegmentationRequestQualityLevel not bound -!missing-enum-value! VNErrorCode native value VNErrorUnsupportedRequest = 19 not bound -!missing-field! VNBarcodeSymbologyAztec_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCodabar not bound -!missing-field! VNBarcodeSymbologyCode128_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39Checksum_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39FullASCIIChecksum_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39FullASCII_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode93_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode93i_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyDataMatrix_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyEAN13_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyEAN8_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyGS1DataBar not bound -!missing-field! VNBarcodeSymbologyGS1DataBarExpanded not bound -!missing-field! VNBarcodeSymbologyGS1DataBarLimited not bound -!missing-field! VNBarcodeSymbologyI2of5Checksum_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyI2of5_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyITF14_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyMicroPDF417 not bound -!missing-field! VNBarcodeSymbologyMicroQR not bound -!missing-field! VNBarcodeSymbologyPDF417_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyQR_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyUPCE_SwiftDeprecated not bound -!missing-pinvoke! VNImagePointForNormalizedPointUsingRegionOfInterest is not bound -!missing-pinvoke! VNImageRectForNormalizedRectUsingRegionOfInterest is not bound -!missing-pinvoke! VNNormalizedPointForImagePointUsingRegionOfInterest is not bound -!missing-pinvoke! VNNormalizedRectForImageRectUsingRegionOfInterest is not bound -!missing-protocol-conformance! VNRecognizedText should conform to VNRequestRevisionProviding -!missing-selector! +VNFaceObservation::faceObservationWithRequestRevision:boundingBox:roll:yaw:pitch: not bound -!missing-selector! VNClassifyImageRequest::results not bound -!missing-selector! VNClassifyImageRequest::supportedIdentifiersAndReturnError: not bound -!missing-selector! VNDetectBarcodesRequest::results not bound -!missing-selector! VNDetectBarcodesRequest::supportedSymbologiesAndReturnError: not bound -!missing-selector! VNDetectContoursRequest::contrastPivot not bound -!missing-selector! VNDetectContoursRequest::results not bound -!missing-selector! VNDetectContoursRequest::setContrastPivot: not bound -!missing-selector! VNDetectDocumentSegmentationRequest::results not bound -!missing-selector! VNDetectFaceCaptureQualityRequest::results not bound -!missing-selector! VNDetectFaceLandmarksRequest::results not bound -!missing-selector! VNDetectFaceRectanglesRequest::results not bound -!missing-selector! VNDetectHorizonRequest::results not bound -!missing-selector! VNDetectHumanRectanglesRequest::results not bound -!missing-selector! VNDetectHumanRectanglesRequest::setUpperBodyOnly: not bound -!missing-selector! VNDetectHumanRectanglesRequest::upperBodyOnly not bound -!missing-selector! VNDetectRectanglesRequest::results not bound -!missing-selector! VNDetectTextRectanglesRequest::results not bound -!missing-selector! VNDetectTrajectoriesRequest::setTargetFrameTime: not bound -!missing-selector! VNDetectTrajectoriesRequest::targetFrameTime not bound -!missing-selector! VNDetectedObjectObservation::globalSegmentationMask not bound -!missing-selector! VNFaceObservation::pitch not bound -!missing-selector! VNGenerateAttentionBasedSaliencyImageRequest::results not bound -!missing-selector! VNGenerateImageFeaturePrintRequest::results not bound -!missing-selector! VNGenerateObjectnessBasedSaliencyImageRequest::results not bound -!missing-selector! VNGenerateOpticalFlowRequest::results not bound -!missing-selector! VNGeneratePersonSegmentationRequest::init not bound -!missing-selector! VNGeneratePersonSegmentationRequest::initWithCompletionHandler: not bound -!missing-selector! VNGeneratePersonSegmentationRequest::outputPixelFormat not bound -!missing-selector! VNGeneratePersonSegmentationRequest::qualityLevel not bound -!missing-selector! VNGeneratePersonSegmentationRequest::results not bound -!missing-selector! VNGeneratePersonSegmentationRequest::setOutputPixelFormat: not bound -!missing-selector! VNGeneratePersonSegmentationRequest::setQualityLevel: not bound -!missing-selector! VNHomographicImageRegistrationRequest::results not bound -!missing-selector! VNHumanHandPoseObservation::chirality not bound -!missing-selector! VNHumanObservation::upperBodyOnly not bound -!missing-selector! VNRecognizeAnimalsRequest::results not bound -!missing-selector! VNRecognizeAnimalsRequest::supportedIdentifiersAndReturnError: not bound -!missing-selector! VNRecognizeTextRequest::results not bound -!missing-selector! VNRecognizeTextRequest::supportedRecognitionLanguagesAndReturnError: not bound -!missing-selector! VNTrajectoryObservation::movingAverageRadius not bound -!missing-selector! VNTranslationalImageRegistrationRequest::results not bound -!missing-type! VNDetectDocumentSegmentationRequest not bound -!missing-type! VNGeneratePersonSegmentationRequest not bound -!missing-type! VNHumanObservation not bound -## appended from unclassified file diff --git a/tests/xtro-sharpie/tvOS-Vision.todo b/tests/xtro-sharpie/tvOS-Vision.todo deleted file mode 100644 index eb235125858f..000000000000 --- a/tests/xtro-sharpie/tvOS-Vision.todo +++ /dev/null @@ -1,77 +0,0 @@ -!missing-enum! VNChirality not bound -!missing-enum! VNGeneratePersonSegmentationRequestQualityLevel not bound -!missing-enum-value! VNErrorCode native value VNErrorUnsupportedRequest = 19 not bound -!missing-field! VNBarcodeSymbologyAztec_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCodabar not bound -!missing-field! VNBarcodeSymbologyCode128_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39Checksum_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39FullASCIIChecksum_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39FullASCII_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode39_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode93_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyCode93i_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyDataMatrix_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyEAN13_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyEAN8_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyGS1DataBar not bound -!missing-field! VNBarcodeSymbologyGS1DataBarExpanded not bound -!missing-field! VNBarcodeSymbologyGS1DataBarLimited not bound -!missing-field! VNBarcodeSymbologyI2of5Checksum_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyI2of5_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyITF14_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyMicroPDF417 not bound -!missing-field! VNBarcodeSymbologyMicroQR not bound -!missing-field! VNBarcodeSymbologyPDF417_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyQR_SwiftDeprecated not bound -!missing-field! VNBarcodeSymbologyUPCE_SwiftDeprecated not bound -!missing-pinvoke! VNImagePointForNormalizedPointUsingRegionOfInterest is not bound -!missing-pinvoke! VNImageRectForNormalizedRectUsingRegionOfInterest is not bound -!missing-pinvoke! VNNormalizedPointForImagePointUsingRegionOfInterest is not bound -!missing-pinvoke! VNNormalizedRectForImageRectUsingRegionOfInterest is not bound -!missing-protocol-conformance! VNRecognizedText should conform to VNRequestRevisionProviding -!missing-selector! +VNFaceObservation::faceObservationWithRequestRevision:boundingBox:roll:yaw:pitch: not bound -!missing-selector! VNClassifyImageRequest::results not bound -!missing-selector! VNClassifyImageRequest::supportedIdentifiersAndReturnError: not bound -!missing-selector! VNDetectBarcodesRequest::results not bound -!missing-selector! VNDetectBarcodesRequest::supportedSymbologiesAndReturnError: not bound -!missing-selector! VNDetectContoursRequest::contrastPivot not bound -!missing-selector! VNDetectContoursRequest::results not bound -!missing-selector! VNDetectContoursRequest::setContrastPivot: not bound -!missing-selector! VNDetectDocumentSegmentationRequest::results not bound -!missing-selector! VNDetectFaceCaptureQualityRequest::results not bound -!missing-selector! VNDetectFaceLandmarksRequest::results not bound -!missing-selector! VNDetectFaceRectanglesRequest::results not bound -!missing-selector! VNDetectHorizonRequest::results not bound -!missing-selector! VNDetectHumanRectanglesRequest::results not bound -!missing-selector! VNDetectHumanRectanglesRequest::setUpperBodyOnly: not bound -!missing-selector! VNDetectHumanRectanglesRequest::upperBodyOnly not bound -!missing-selector! VNDetectRectanglesRequest::results not bound -!missing-selector! VNDetectTextRectanglesRequest::results not bound -!missing-selector! VNDetectTrajectoriesRequest::setTargetFrameTime: not bound -!missing-selector! VNDetectTrajectoriesRequest::targetFrameTime not bound -!missing-selector! VNDetectedObjectObservation::globalSegmentationMask not bound -!missing-selector! VNFaceObservation::pitch not bound -!missing-selector! VNGenerateAttentionBasedSaliencyImageRequest::results not bound -!missing-selector! VNGenerateImageFeaturePrintRequest::results not bound -!missing-selector! VNGenerateObjectnessBasedSaliencyImageRequest::results not bound -!missing-selector! VNGenerateOpticalFlowRequest::results not bound -!missing-selector! VNGeneratePersonSegmentationRequest::init not bound -!missing-selector! VNGeneratePersonSegmentationRequest::initWithCompletionHandler: not bound -!missing-selector! VNGeneratePersonSegmentationRequest::outputPixelFormat not bound -!missing-selector! VNGeneratePersonSegmentationRequest::qualityLevel not bound -!missing-selector! VNGeneratePersonSegmentationRequest::results not bound -!missing-selector! VNGeneratePersonSegmentationRequest::setOutputPixelFormat: not bound -!missing-selector! VNGeneratePersonSegmentationRequest::setQualityLevel: not bound -!missing-selector! VNHomographicImageRegistrationRequest::results not bound -!missing-selector! VNHumanHandPoseObservation::chirality not bound -!missing-selector! VNHumanObservation::upperBodyOnly not bound -!missing-selector! VNRecognizeAnimalsRequest::results not bound -!missing-selector! VNRecognizeAnimalsRequest::supportedIdentifiersAndReturnError: not bound -!missing-selector! VNRecognizeTextRequest::results not bound -!missing-selector! VNRecognizeTextRequest::supportedRecognitionLanguagesAndReturnError: not bound -!missing-selector! VNTrajectoryObservation::movingAverageRadius not bound -!missing-selector! VNTranslationalImageRegistrationRequest::results not bound -!missing-type! VNDetectDocumentSegmentationRequest not bound -!missing-type! VNGeneratePersonSegmentationRequest not bound -!missing-type! VNHumanObservation not bound -## appended from unclassified file From cd3178c1129d284ff6c9760e9a016b8067db07db Mon Sep 17 00:00:00 2001 From: Rachel Kang Date: Thu, 19 Aug 2021 12:13:25 -0400 Subject: [PATCH 3/7] Update based on feedback --- src/Vision/VNUtils.cs | 38 +++++++-- src/vision.cs | 89 ++++++++++++++------- tests/monotouch-test/Vision/VNUtilsTests.cs | 8 +- 3 files changed, 98 insertions(+), 37 deletions(-) diff --git a/src/Vision/VNUtils.cs b/src/Vision/VNUtils.cs index 24ce53a84e62..1dd293e944ea 100644 --- a/src/Vision/VNUtils.cs +++ b/src/Vision/VNUtils.cs @@ -1,4 +1,4 @@ -// +// // VNUtils.cs // // Authors: @@ -54,21 +54,49 @@ public static partial class VNUtils { [DllImport (Constants.VisionLibrary, EntryPoint = "VNNormalizedRectForImageRect")] public static extern CGRect GetNormalizedRect (CGRect imageRect, nuint imageWidth, nuint imageHeight); +#if NET + [SupportedOSPlatform ("ios15.0")] + [SupportedOSPlatform ("tvos15.0")] + [SupportedOSPlatform ("macos12.0")] + [SupportedOSPlatform ("maccatalyst15.0")] +#else [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] +#endif [DllImport (Constants.VisionLibrary, EntryPoint="VNImagePointForNormalizedPointUsingRegionOfInterest")] - public static extern CGPoint GetImagePoint (CGPoint normalizedPoint, nuint imageWidth, nuint imageHeight, CGRect roi); + public static extern CGPoint GetImagePoint (CGPoint normalizedPoint, nuint imageWidth, nuint imageHeight, CGRect regionOfInterest); +#if NET + [SupportedOSPlatform ("ios15.0")] + [SupportedOSPlatform ("tvos15.0")] + [SupportedOSPlatform ("macos12.0")] + [SupportedOSPlatform ("maccatalyst15.0")] +#else [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] +#endif [DllImport (Constants.VisionLibrary, EntryPoint="VNNormalizedPointForImagePointUsingRegionOfInterest")] - public static extern CGPoint GetNormalizedPoint (CGPoint imagePoint, nuint imageWidth, nuint imageHeight, CGRect roi); + public static extern CGPoint GetNormalizedPoint (CGPoint imagePoint, nuint imageWidth, nuint imageHeight, CGRect regionOfInterest); +#if NET + [SupportedOSPlatform ("ios15.0")] + [SupportedOSPlatform ("tvos15.0")] + [SupportedOSPlatform ("macos12.0")] + [SupportedOSPlatform ("maccatalyst15.0")] +#else [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] +#endif [DllImport (Constants.VisionLibrary, EntryPoint="VNImageRectForNormalizedRectUsingRegionOfInterest")] - public static extern CGRect GetImageRect (CGRect normalizedRect, nuint imageWidth, nuint imageHeight, CGRect roi); + public static extern CGRect GetImageRect (CGRect normalizedRect, nuint imageWidth, nuint imageHeight, CGRect regionOfInterest); +#if NET + [SupportedOSPlatform ("ios15.0")] + [SupportedOSPlatform ("tvos15.0")] + [SupportedOSPlatform ("macos12.0")] + [SupportedOSPlatform ("maccatalyst15.0")] +#else [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] +#endif [DllImport (Constants.VisionLibrary, EntryPoint="VNNormalizedRectForImageRectUsingRegionOfInterest")] - public static extern CGRect GetNormalizedRect (CGRect imageRect, nuint imageWidth, nuint imageHeight, CGRect roi); + public static extern CGRect GetNormalizedRect (CGRect imageRect, nuint imageWidth, nuint imageHeight, CGRect regionOfInterest); [DllImport ("__Internal", EntryPoint = "xamarin_CGPoint__VNNormalizedFaceBoundingBoxPointForLandmarkPoint_Vector2_CGRect_nuint_nuint_string")] static extern CGPoint VNNormalizedFaceBoundingBoxPointForLandmarkPoint (Vector2 faceLandmarkPoint, CGRect faceBoundingBox, nuint imageWidth, nuint imageHeight, out IntPtr error); diff --git a/src/vision.cs b/src/vision.cs index 8cdf9d8b939f..8f04aea18ef6 100644 --- a/src/vision.cs +++ b/src/vision.cs @@ -125,26 +125,26 @@ enum VNBarcodeSymbology { [iOS (15,0), Mac (12,0), TV (15,0), MacCatalyst (15,0)] [Field ("VNBarcodeSymbologyGS1DataBar")] - Gs1DataBar, + GS1DataBar, [iOS (15,0), Mac (12,0), TV (15,0), MacCatalyst (15,0)] [Field ("VNBarcodeSymbologyGS1DataBarExpanded")] - Gs1DataBarExpanded, + GS1DataBarExpanded, [iOS (15,0), Mac (12,0), TV (15,0), MacCatalyst (15,0)] [Field ("VNBarcodeSymbologyGS1DataBarLimited")] - Gs1DataBarLimited, + GS1DataBarLimited, [iOS (15,0), Mac (12,0), TV (15,0), MacCatalyst (15,0)] [Field ("VNBarcodeSymbologyMicroPDF417")] - MicroPDF417, + MicroPdf417, [iOS (15,0), Mac (12,0), TV (15,0), MacCatalyst (15,0)] [Field ("VNBarcodeSymbologyMicroQR")] MicroQR, } - [TV (15,0), Mac (12,0), iOS (15,0)] + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [Native] public enum VNChirality : long { @@ -168,7 +168,7 @@ enum VNCoreMLRequestRevision : ulong { One = 1, } - [TV (12,0), Mac (10,14), iOS (12,0)] + [TV (12,0), Mac (10,14), iOS (12,0), MacCatalyst (15,0)] [Native] enum VNDetectBarcodesRequestRevision : ulong { Unspecified = 0, @@ -187,7 +187,7 @@ enum VNDetectFaceLandmarksRequestRevision : ulong { Three = 3, } - [TV (12,0), Mac (10,14), iOS (12,0)] + [TV (12,0), Mac (10,14), iOS (12,0), MacCatalyst (15,0)] [Native] enum VNDetectFaceRectanglesRequestRevision : ulong { Unspecified = 0, @@ -303,7 +303,7 @@ enum VNClassifyImageRequestRevision : ulong { One = 1, } - [TV (15,0), Mac (12,0), iOS (15,0)] + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [Native] enum VNDetectDocumentSegmentationRequestRevision : ulong { One = 1, @@ -331,6 +331,7 @@ enum VNRequestFaceLandmarksConstellation : ulong { enum VNDetectHumanRectanglesRequestRevision : ulong { Unspecified = 0, One = 1, + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] Two = 2, } @@ -360,6 +361,7 @@ enum VNGenerateObjectnessBasedSaliencyImageRequestRevision : ulong { enum VNRecognizeAnimalsRequestRevision : ulong { Unspecified = 0, One = 1, + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] Two = 2, } @@ -437,7 +439,7 @@ enum VNGenerateOpticalFlowRequestRevision : ulong { One = 1, } - [TV (15,0), Mac (12,0), iOS (15,0)] + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [Native] enum VNGeneratePersonSegmentationRequestRevision : ulong { One = 1, @@ -642,6 +644,7 @@ enum VNHumanHandPoseObservationJointsGroupName { All, } + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [Native] public enum VNGeneratePersonSegmentationRequestQualityLevel : ulong { @@ -652,6 +655,7 @@ public enum VNGeneratePersonSegmentationRequestQualityLevel : ulong [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [BaseType (typeof(VNDetectedObjectObservation))] + [DisableDefaultCtor] interface VNHumanObservation { [NullAllowed] @@ -741,27 +745,34 @@ interface VNDetectBarcodesRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); - [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use 'GetSupportedSymbologiesAndReturnError' instead.")] - [Deprecated (PlatformName.iOS, 15, 0, message: "Use 'GetSupportedSymbologiesAndReturnError' instead.")] - [Deprecated (PlatformName.TvOS, 15, 0, message: "Use 'GetSupportedSymbologiesAndReturnError' instead.")] + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use 'GetSupportedSymbologies' instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use 'GetSupportedSymbologies' instead.")] + [Deprecated (PlatformName.TvOS, 15, 0, message: "Use 'GetSupportedSymbologies' instead.")] [Static] [Protected] - [Export ("supportedSymbologies", ArgumentSemantic.Copy)] + [Export ("supportedSymbologiesAndReturnError:", ArgumentSemantic.Copy)] NSString [] WeakSupportedSymbologies { get; } + [Static] [Wrap ("VNBarcodeSymbologyExtensions.GetValues (WeakSupportedSymbologies)")] VNBarcodeSymbology [] SupportedSymbologies { get; } + [Static] [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] - [Export ("supportedSymbologiesAndReturnError:")] + [Export ("supportedSymbologies:")] [return: NullAllowed] - string[] GetSupportedSymbologiesAndReturnError ([NullAllowed] out NSError error); - // using NSString instead of string here + NSString [] GetWeakSupportedSymbologies ([NullAllowed] out NSError error); + + [Static] + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] + [Wrap ("VNBarcodeSymbologyExtensions.GetValues (GetWeakSupportedSymbologies)")] + VNBarcodeSymbology [] GetSupportedSymbologies ([NullAllowed] out NSError error); [Protected] [Export ("symbologies", ArgumentSemantic.Copy)] NSString [] WeakSymbologies { get; set; } + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNBarcodeObservation[] Results { get; } @@ -812,6 +823,7 @@ interface VNDetectFaceLandmarksRequest : VNFaceObservationAccepting { [Export ("constellation", ArgumentSemantic.Assign)] VNRequestFaceLandmarksConstellation Constellation { get; set; } + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNFaceObservation[] Results { get; } @@ -853,6 +865,7 @@ interface VNDetectFaceRectanglesRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNFaceObservation[] Results { get; } @@ -894,6 +907,7 @@ interface VNDetectHorizonRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNHorizonObservation[] Results { get; } @@ -953,6 +967,7 @@ interface VNDetectRectanglesRequest { [Export ("maximumObservations")] nuint MaximumObservations { get; set; } + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNRectangleObservation[] Results { get; } @@ -997,6 +1012,7 @@ interface VNDetectTextRectanglesRequest { [Export ("reportCharacterBoxes")] bool ReportCharacterBoxes { get; set; } + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNTextObservation[] Results { get; } @@ -1257,6 +1273,7 @@ interface VNImageRegistrationRequest { [BaseType (typeof (VNImageRegistrationRequest))] interface VNTranslationalImageRegistrationRequest { + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNImageTranslationAlignmentObservation[] Results { get; } @@ -1408,6 +1425,7 @@ interface VNTranslationalImageRegistrationRequest { [BaseType (typeof (VNImageRegistrationRequest))] interface VNHomographicImageRegistrationRequest { + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNImageHomographicAlignmentObservation[] Results { get; } @@ -1843,6 +1861,10 @@ interface VNImageHomographicAlignmentObservation { Matrix3 WarpTransform { [MarshalDirective (NativePrefix = "xamarin_simd__", Library = "__Internal")] get; +#if !XAMCORE_4_0 + [NotImplemented] + set; +#endif } } @@ -2379,9 +2401,9 @@ interface VNClassifyImageRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); - [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use 'GetSupportedIdentifiersAndReturnError' instead.")] - [Deprecated (PlatformName.iOS, 15, 0, message: "Use 'GetSupportedIdentifiersAndReturnError' instead.")] - [Deprecated (PlatformName.TvOS, 15, 0, message: "Use 'GetSupportedIdentifiersAndReturnError' instead.")] + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use 'GetSupportedIdentifiers' instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use 'GetSupportedIdentifiers' instead.")] + [Deprecated (PlatformName.TvOS, 15, 0, message: "Use 'GetSupportedIdentifiers' instead.")] [Static] [Export ("knownClassificationsForRevision:error:")] [return: NullAllowed] @@ -2390,8 +2412,9 @@ interface VNClassifyImageRequest { [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [Export ("supportedIdentifiersAndReturnError:")] [return: NullAllowed] - string[] GetSupportedIdentifiersAndReturnError ([NullAllowed] out NSError error); + NSString[] GetSupportedIdentifiers ([NullAllowed] out NSError error); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNClassificationObservation[] Results { get; } @@ -2428,6 +2451,7 @@ interface VNDetectFaceCaptureQualityRequest : VNFaceObservationAccepting { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNFaceObservation[] Results { get; } @@ -2468,6 +2492,7 @@ interface VNDetectHumanRectanglesRequest { [Export ("upperBodyOnly")] bool UpperBodyOnly { get; set; } + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNHumanObservation[] Results { get; } @@ -2504,6 +2529,7 @@ interface VNGenerateAttentionBasedSaliencyImageRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNRecognizedTextObservation[] Results { get; } @@ -2543,6 +2569,7 @@ interface VNGenerateImageFeaturePrintRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNFeaturePrintObservation[] Results { get; } @@ -2579,6 +2606,7 @@ interface VNGenerateObjectnessBasedSaliencyImageRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNSaliencyImageObservation[] Results { get; } @@ -2682,9 +2710,9 @@ enum VNAnimalIdentifier { [DisableDefaultCtor] interface VNRecognizeAnimalsRequest { - [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use 'GetSupportedIdentifiersAndReturnError' instead.")] - [Deprecated (PlatformName.iOS, 15, 0, message: "Use 'GetSupportedIdentifiersAndReturnError' instead.")] - [Deprecated (PlatformName.TvOS, 15, 0, message: "Use 'GetSupportedIdentifiersAndReturnError' instead.")] + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use 'GetSupportedIdentifiers' instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use 'GetSupportedIdentifiers' instead.")] + [Deprecated (PlatformName.TvOS, 15, 0, message: "Use 'GetSupportedIdentifiers' instead.")] [Static] [Export ("knownAnimalIdentifiersForRevision:error:")] [return: NullAllowed] @@ -2694,12 +2722,14 @@ interface VNRecognizeAnimalsRequest { [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [Export ("supportedIdentifiersAndReturnError:")] [return: NullAllowed] - string[] GetSupportedIdentifiersAndReturnError ([NullAllowed] out NSError error); + [return: BindAs (typeof (VNAnimalIdentifier []))] + NSString [] GetSupportedIdentifiers ([NullAllowed] out NSError error); [Export ("initWithCompletionHandler:")] [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNRecognizedObjectObservation[] Results { get; } @@ -2732,9 +2762,9 @@ interface VNRecognizeAnimalsRequest { [DisableDefaultCtor] interface VNRecognizeTextRequest : VNRequestProgressProviding { - [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use 'GetSupportedRecognitionLanguagesAndReturnError' instead.")] - [Deprecated (PlatformName.iOS, 15, 0, message: "Use 'GetSupportedRecognitionLanguagesAndReturnError' instead.")] - [Deprecated (PlatformName.TvOS, 15, 0, message: "Use 'GetSupportedRecognitionLanguagesAndReturnError' instead.")] + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use 'GetSupportedRecognitionLanguages' instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use 'GetSupportedRecognitionLanguages' instead.")] + [Deprecated (PlatformName.TvOS, 15, 0, message: "Use 'GetSupportedRecognitionLanguages' instead.")] [Static] [Export ("supportedRecognitionLanguagesForTextRecognitionLevel:revision:error:")] [return: NullAllowed] @@ -2743,7 +2773,7 @@ interface VNRecognizeTextRequest : VNRequestProgressProviding { [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [Export ("supportedRecognitionLanguagesAndReturnError:")] [return: NullAllowed] - string[] GetSupportedRecognitionLanguagesAndReturnError ([NullAllowed] out NSError error); + NSString[] GetSupportedRecognitionLanguages ([NullAllowed] out NSError error); [Export ("recognitionLanguages", ArgumentSemantic.Copy)] string [] RecognitionLanguages { get; set; } @@ -2764,6 +2794,7 @@ interface VNRecognizeTextRequest : VNRequestProgressProviding { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNRecognizedTextObservation[] Results { get; } @@ -2831,6 +2862,7 @@ interface VNDetectContoursRequest { [DesignatedInitializer] IntPtr Constructor ([NullAllowed] VNRequestCompletionHandler completionHandler); + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNContoursObservation[] Results { get; } @@ -3289,6 +3321,7 @@ interface VNGenerateOpticalFlowRequest { [Export ("outputPixelFormat")] CVPixelFormatType OutputPixelFormat { get; set; } + [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [NullAllowed, Export ("results", ArgumentSemantic.Copy)] VNPixelBufferObservation[] Results { get; } diff --git a/tests/monotouch-test/Vision/VNUtilsTests.cs b/tests/monotouch-test/Vision/VNUtilsTests.cs index 747ea672893a..dc99252a0c58 100644 --- a/tests/monotouch-test/Vision/VNUtilsTests.cs +++ b/tests/monotouch-test/Vision/VNUtilsTests.cs @@ -32,28 +32,28 @@ public class VNUtilsTests { public void GetImagePointTest () { var imagePoint = VNUtils.GetImagePoint (new CGPoint(0, 0), 1, 1, new CGRect(0, 0, 1, 1)); - Assert.NotNull (imagePoint, $"VNImagePointForNormalizedPointUsingRegionOfInterest is not null"); + Assert.That (imagePoint , Is.Not.EqualTo (CGPoint.Empty), "VNImagePointForNormalizedPointUsingRegionOfInterest is not empty"); } [Test] public void GetNormalizedPointTest () { var normalizedPoint = VNUtils.GetNormalizedPoint (new CGPoint(0, 0), 1, 1, new CGRect(0, 0, 1, 1)); - Assert.NotNull (normalizedPoint, $"VNNormalizedPointForImagePointUsingRegionOfInterest is not null"); + Assert.That (imagePoint , Is.Not.EqualTo (CGPoint.Empty), "VNNormalizedPointForImagePointUsingRegionOfInterest is not empty"); } [Test] public void GetImageRectTest () { var normalizedPoint = VNUtils.GetImageRect (new CGRect(0, 0, 1, 1), 1, 1, new CGRect(0, 0, 1, 1)); - Assert.NotNull (normalizedPoint, $"VNImageRectForNormalizedRectUsingRegionOfInterest is not null"); + Assert.That (imagePoint , Is.Not.EqualTo (CGPoint.Empty), "VNImageRectForNormalizedRectUsingRegionOfInterest is not empty"); } [Test] public void GetNormalizedRectTest () { var normalizedPoint = VNUtils.GetImageRect (new CGRect(0, 0, 1, 1), 1, 1, new CGRect(0, 0, 1, 1)); - Assert.NotNull (normalizedPoint, $"VNNormalizedRectForImageRectUsingRegionOfInterest is not null"); + Assert.That (imagePoint , Is.Not.EqualTo (CGPoint.Empty), "VNNormalizedRectForImageRectUsingRegionOfInterest is not empty"); } } } From 82eb5013adde741d903e10eb3ee17250a8a2d33e Mon Sep 17 00:00:00 2001 From: Rachel Kang Date: Mon, 23 Aug 2021 10:59:52 -0400 Subject: [PATCH 4/7] Fix selector typo swap --- src/vision.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vision.cs b/src/vision.cs index 8f04aea18ef6..00460b020179 100644 --- a/src/vision.cs +++ b/src/vision.cs @@ -750,7 +750,7 @@ interface VNDetectBarcodesRequest { [Deprecated (PlatformName.TvOS, 15, 0, message: "Use 'GetSupportedSymbologies' instead.")] [Static] [Protected] - [Export ("supportedSymbologiesAndReturnError:", ArgumentSemantic.Copy)] + [Export ("supportedSymbologies", ArgumentSemantic.Copy)] NSString [] WeakSupportedSymbologies { get; } [Static] @@ -758,14 +758,15 @@ interface VNDetectBarcodesRequest { VNBarcodeSymbology [] SupportedSymbologies { get; } [Static] + [Protected] [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] - [Export ("supportedSymbologies:")] + [Export ("supportedSymbologiesAndReturnError:")] [return: NullAllowed] NSString [] GetWeakSupportedSymbologies ([NullAllowed] out NSError error); [Static] [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] - [Wrap ("VNBarcodeSymbologyExtensions.GetValues (GetWeakSupportedSymbologies)")] + [Wrap ("VNBarcodeSymbologyExtensions.GetValues (GetWeakSupportedSymbologies (out error))")] VNBarcodeSymbology [] GetSupportedSymbologies ([NullAllowed] out NSError error); [Protected] From b879223cb027f9daa06fa3230e4b7214fd8f414c Mon Sep 17 00:00:00 2001 From: Rachel Kang Date: Mon, 23 Aug 2021 14:48:01 -0400 Subject: [PATCH 5/7] Remove misplaced static --- src/vision.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/vision.cs b/src/vision.cs index 00460b020179..fa02897cca56 100644 --- a/src/vision.cs +++ b/src/vision.cs @@ -757,14 +757,12 @@ interface VNDetectBarcodesRequest { [Wrap ("VNBarcodeSymbologyExtensions.GetValues (WeakSupportedSymbologies)")] VNBarcodeSymbology [] SupportedSymbologies { get; } - [Static] [Protected] [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [Export ("supportedSymbologiesAndReturnError:")] [return: NullAllowed] NSString [] GetWeakSupportedSymbologies ([NullAllowed] out NSError error); - [Static] [TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)] [Wrap ("VNBarcodeSymbologyExtensions.GetValues (GetWeakSupportedSymbologies (out error))")] VNBarcodeSymbology [] GetSupportedSymbologies ([NullAllowed] out NSError error); From a7ed18a19a6979c98eced88249e487288e8035e7 Mon Sep 17 00:00:00 2001 From: Rachel Kang Date: Mon, 23 Aug 2021 14:48:32 -0400 Subject: [PATCH 6/7] Fix VNUtilsTests --- tests/monotouch-test/Vision/VNUtilsTests.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/monotouch-test/Vision/VNUtilsTests.cs b/tests/monotouch-test/Vision/VNUtilsTests.cs index dc99252a0c58..2f6adeba4b5a 100644 --- a/tests/monotouch-test/Vision/VNUtilsTests.cs +++ b/tests/monotouch-test/Vision/VNUtilsTests.cs @@ -31,29 +31,29 @@ public class VNUtilsTests { [Test] public void GetImagePointTest () { - var imagePoint = VNUtils.GetImagePoint (new CGPoint(0, 0), 1, 1, new CGRect(0, 0, 1, 1)); - Assert.That (imagePoint , Is.Not.EqualTo (CGPoint.Empty), "VNImagePointForNormalizedPointUsingRegionOfInterest is not empty"); + var imagePoint = VNUtils.GetImagePoint (new CGPoint(2, 345), 6, 78, new CGRect(90, 12, 34, 56)); + Assert.That (imagePoint, Is.Not.EqualTo (CGPoint.Empty), "VNImagePointForNormalizedPointUsingRegionOfInterest is not empty"); } [Test] public void GetNormalizedPointTest () { - var normalizedPoint = VNUtils.GetNormalizedPoint (new CGPoint(0, 0), 1, 1, new CGRect(0, 0, 1, 1)); - Assert.That (imagePoint , Is.Not.EqualTo (CGPoint.Empty), "VNNormalizedPointForImagePointUsingRegionOfInterest is not empty"); + var normalizedPoint = VNUtils.GetNormalizedPoint (new CGPoint(2, 345), 6, 78, new CGRect(90, 12, 34, 56)); + Assert.That (normalizedPoint, Is.Not.EqualTo (CGPoint.Empty), "VNNormalizedPointForImagePointUsingRegionOfInterest is not empty"); } [Test] public void GetImageRectTest () { - var normalizedPoint = VNUtils.GetImageRect (new CGRect(0, 0, 1, 1), 1, 1, new CGRect(0, 0, 1, 1)); - Assert.That (imagePoint , Is.Not.EqualTo (CGPoint.Empty), "VNImageRectForNormalizedRectUsingRegionOfInterest is not empty"); + var imageRect = VNUtils.GetImageRect (new CGRect(2, 34, 5, 67), 8, 90, new CGRect(123, 4, 56, 7)); + Assert.That (imageRect, Is.Not.EqualTo (CGRect.Empty), "VNImageRectForNormalizedRectUsingRegionOfInterest is not empty"); } [Test] public void GetNormalizedRectTest () { - var normalizedPoint = VNUtils.GetImageRect (new CGRect(0, 0, 1, 1), 1, 1, new CGRect(0, 0, 1, 1)); - Assert.That (imagePoint , Is.Not.EqualTo (CGPoint.Empty), "VNNormalizedRectForImageRectUsingRegionOfInterest is not empty"); + var normalizedRect = VNUtils.GetImageRect (new CGRect(2, 34, 5, 67), 8, 90, new CGRect(123, 4, 56, 7)); + Assert.That (normalizedRect, Is.Not.EqualTo (CGRect.Empty), "VNNormalizedRectForImageRectUsingRegionOfInterest is not empty"); } } } From 18e088bf8b65212cbc2559d765c995acecce894e Mon Sep 17 00:00:00 2001 From: Rachel Kang Date: Tue, 24 Aug 2021 18:16:44 -0400 Subject: [PATCH 7/7] Defuse BOM! --- src/Vision/VNUtils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Vision/VNUtils.cs b/src/Vision/VNUtils.cs index 1dd293e944ea..57a35a2d362b 100644 --- a/src/Vision/VNUtils.cs +++ b/src/Vision/VNUtils.cs @@ -1,4 +1,4 @@ -// +// // VNUtils.cs // // Authors: