diff --git a/src/CoreImage/CIFilter.cs b/src/CoreImage/CIFilter.cs index 88a5d7b673..d6660f9ad3 100644 --- a/src/CoreImage/CIFilter.cs +++ b/src/CoreImage/CIFilter.cs @@ -714,6 +714,12 @@ namespace CoreImage { return new CIBlendWithBlueMask (handle); case "CIBlendWithRedMask": return new CIBlendWithRedMask (handle); + case "CIMaximumScaleTransform": + return new CIMaximumScaleTransform (handle); + case "CIToneMapHeadroom": + return new CIToneMapHeadroom (handle); + case "CIAreaBoundsRed": + return new CIAreaBoundsRed (handle); default: throw new NotImplementedException (String.Format ("Unknown filter type returned: `{0}', returning a default CIFilter", filterName)); } diff --git a/src/coreimage.cs b/src/coreimage.cs index 30cd67ec98..23fa3ad0e8 100644 --- a/src/coreimage.cs +++ b/src/coreimage.cs @@ -2380,6 +2380,17 @@ namespace CoreImage { [Export ("imageByInsertingIntermediate:")] CIImage CreateByInsertingIntermediate (bool cache); + [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)] + [Export ("imageByApplyingGainMap:")] + CIImage CreateByApplyingGainMap (CIImage gainMap); + + [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)] + [Export ("imageByApplyingGainMap:headroom:")] + CIImage CreateByApplyingGainMap (CIImage gainMap, float headroom); + + [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)] + [Export ("opaque")] + bool Opaque { [Bind ("isOpaque")] get; } // CIImage_AVPortraitEffectsMatte category [TV (12, 0), iOS (12, 0)] @@ -2543,6 +2554,14 @@ namespace CoreImage { [iOS (16, 0), TV (16, 0), Mac (13, 0), MacCatalyst (16, 0)] [Export ("imageByConvertingLabToWorkingSpace")] CIImage ConvertLabToWorkingSpace (); + + [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)] + [Export ("contentHeadroom")] + float ContentHeadroom { get; } + + [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)] + [Export ("metalTexture"), NullAllowed] + IMTLTexture MetalTexture { get; } } interface ICIImageProcessorInput { } @@ -6485,6 +6504,15 @@ namespace CoreImage { [iOS (17, 0), TV (17, 0), Mac (14, 0), MacCatalyst (17, 0)] [Field ("kCIImageExpandToHDR")] NSString ExpandToHdr { get; } + + [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)] + [Field ("kCIImageRepresentationHDRImage")] + NSString HdrImage { get; } + + [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)] + [Field ("kCIImageContentHeadroom")] + NSString ContentHeadroom { get; } + } [MacCatalyst (13, 1)] @@ -10265,6 +10293,60 @@ namespace CoreImage { } #endif + [CoreImageFilter] + [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)] + [BaseType (typeof (CIFilter))] + interface CIMaximumScaleTransform : CIMaximumScaleTransformProtocol { + } + + [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)] + [Protocol (Name = "CIMaximumScaleTransform", BackwardsCompatibleCodeGeneration = false)] + interface CIMaximumScaleTransformProtocol : CIFilterProtocol { + [Abstract] + [NullAllowed, Export ("inputImage", ArgumentSemantic.Retain)] + CIImage InputImage { get; set; } + + [Abstract] + [Export ("scale")] + float Scale { get; set; } + + [Abstract] + [Export ("aspectRatio")] + float AspectRatio { get; set; } + } + + [CoreImageFilter] + [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)] + [BaseType (typeof (CIFilter))] + interface CIToneMapHeadroom : CIToneMapHeadroomProtocol { + } + + [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)] + [Protocol (Name = "CIToneMapHeadroom", BackwardsCompatibleCodeGeneration = false)] + interface CIToneMapHeadroomProtocol : CIFilterProtocol { + [Abstract] + [NullAllowed, Export ("inputImage", ArgumentSemantic.Retain)] + CIImage InputImage { get; set; } + + [Abstract] + [Export ("sourceHeadroom")] + float SourceHeadroom { get; set; } + + [Abstract] + [Export ("targetHeadroom")] + float TargetHeadroom { get; set; } + } + + [CoreImageFilter] + [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)] + [BaseType (typeof (CIFilter))] + interface CIAreaBoundsRed : CIAreaBoundsRedProtocol { + } + + [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)] + [Protocol (Name = "CIAreaBoundsRed")] + interface CIAreaBoundsRedProtocol : CIAreaReductionFilterProtocol { + } #endregion } diff --git a/tests/cecil-tests/Documentation.KnownFailures.txt b/tests/cecil-tests/Documentation.KnownFailures.txt index 667a2f5543..a6a8bf1068 100644 --- a/tests/cecil-tests/Documentation.KnownFailures.txt +++ b/tests/cecil-tests/Documentation.KnownFailures.txt @@ -30382,6 +30382,10 @@ M:CoreImage.CIAreaAverage.#ctor M:CoreImage.CIAreaAverage.#ctor(Foundation.NSCoder) M:CoreImage.CIAreaAverage.#ctor(Foundation.NSObjectFlag) M:CoreImage.CIAreaAverage.#ctor(ObjCRuntime.NativeHandle) +M:CoreImage.CIAreaBoundsRed.#ctor +M:CoreImage.CIAreaBoundsRed.#ctor(Foundation.NSCoder) +M:CoreImage.CIAreaBoundsRed.#ctor(Foundation.NSObjectFlag) +M:CoreImage.CIAreaBoundsRed.#ctor(ObjCRuntime.NativeHandle) M:CoreImage.CIAreaHistogram.#ctor M:CoreImage.CIAreaHistogram.#ctor(Foundation.NSCoder) M:CoreImage.CIAreaHistogram.#ctor(Foundation.NSObjectFlag) @@ -31061,6 +31065,8 @@ M:CoreImage.CIImage.#ctor(UIKit.UIImage) M:CoreImage.CIImage.ConvertLabToWorkingSpace M:CoreImage.CIImage.ConvertWorkingSpaceToLab M:CoreImage.CIImage.Copy(Foundation.NSZone) +M:CoreImage.CIImage.CreateByApplyingGainMap(CoreImage.CIImage,System.Single) +M:CoreImage.CIImage.CreateByApplyingGainMap(CoreImage.CIImage) M:CoreImage.CIImage.CreateByApplyingGaussianBlur(System.Double) M:CoreImage.CIImage.CreateByApplyingOrientation(ImageIO.CGImagePropertyOrientation) M:CoreImage.CIImage.CreateByClamping(CoreGraphics.CGRect) @@ -31257,6 +31263,10 @@ M:CoreImage.CIMaximumCompositing.#ctor M:CoreImage.CIMaximumCompositing.#ctor(Foundation.NSCoder) M:CoreImage.CIMaximumCompositing.#ctor(Foundation.NSObjectFlag) M:CoreImage.CIMaximumCompositing.#ctor(ObjCRuntime.NativeHandle) +M:CoreImage.CIMaximumScaleTransform.#ctor +M:CoreImage.CIMaximumScaleTransform.#ctor(Foundation.NSCoder) +M:CoreImage.CIMaximumScaleTransform.#ctor(Foundation.NSObjectFlag) +M:CoreImage.CIMaximumScaleTransform.#ctor(ObjCRuntime.NativeHandle) M:CoreImage.CIMedianFilter.#ctor M:CoreImage.CIMedianFilter.#ctor(Foundation.NSCoder) M:CoreImage.CIMedianFilter.#ctor(Foundation.NSObjectFlag) @@ -31634,6 +31644,10 @@ M:CoreImage.CIToneCurve.#ctor M:CoreImage.CIToneCurve.#ctor(Foundation.NSCoder) M:CoreImage.CIToneCurve.#ctor(Foundation.NSObjectFlag) M:CoreImage.CIToneCurve.#ctor(ObjCRuntime.NativeHandle) +M:CoreImage.CIToneMapHeadroom.#ctor +M:CoreImage.CIToneMapHeadroom.#ctor(Foundation.NSCoder) +M:CoreImage.CIToneMapHeadroom.#ctor(Foundation.NSObjectFlag) +M:CoreImage.CIToneMapHeadroom.#ctor(ObjCRuntime.NativeHandle) M:CoreImage.CITorusLensDistortion.#ctor M:CoreImage.CITorusLensDistortion.#ctor(Foundation.NSCoder) M:CoreImage.CITorusLensDistortion.#ctor(Foundation.NSObjectFlag) @@ -60075,6 +60089,9 @@ P:CoreImage.CIAffineTransform.InputImage P:CoreImage.CIAffineTransform.Transform P:CoreImage.CIAreaAverage.OutputImageMps P:CoreImage.CIAreaAverage.OutputImageNonMps +P:CoreImage.CIAreaBoundsRed.InputExtent +P:CoreImage.CIAreaBoundsRed.InputImage +P:CoreImage.CIAreaBoundsRed.OutputImage P:CoreImage.CIAreaHistogram.Extent P:CoreImage.CIAreaHistogram.InputCount P:CoreImage.CIAreaHistogram.InputExtent @@ -60755,6 +60772,7 @@ P:CoreImage.CIImage.BlueImage P:CoreImage.CIImage.CGImage P:CoreImage.CIImage.ClearImage P:CoreImage.CIImage.ColorSpace +P:CoreImage.CIImage.ContentHeadroom P:CoreImage.CIImage.CyanImage P:CoreImage.CIImage.Definition P:CoreImage.CIImage.DepthData @@ -60794,6 +60812,8 @@ P:CoreImage.CIImage.FormatRh P:CoreImage.CIImage.GrayImage P:CoreImage.CIImage.GreenImage P:CoreImage.CIImage.MagentaImage +P:CoreImage.CIImage.MetalTexture +P:CoreImage.CIImage.Opaque P:CoreImage.CIImage.PixelBuffer P:CoreImage.CIImage.PortraitEffectsMatte P:CoreImage.CIImage.Properties @@ -60928,6 +60948,10 @@ P:CoreImage.CIMaskToAlpha.InputImage P:CoreImage.CIMaskToAlpha.OutputImage P:CoreImage.CIMaximumComponent.InputImage P:CoreImage.CIMaximumComponent.OutputImage +P:CoreImage.CIMaximumScaleTransform.AspectRatio +P:CoreImage.CIMaximumScaleTransform.InputImage +P:CoreImage.CIMaximumScaleTransform.OutputImage +P:CoreImage.CIMaximumScaleTransform.Scale P:CoreImage.CIMedianFilter.InputImage P:CoreImage.CIMedianFilter.OutputImage P:CoreImage.CIMeshGenerator.Color @@ -61360,6 +61384,10 @@ P:CoreImage.CIToneCurve.InputPoint2 P:CoreImage.CIToneCurve.InputPoint3 P:CoreImage.CIToneCurve.InputPoint4 P:CoreImage.CIToneCurve.OutputImage +P:CoreImage.CIToneMapHeadroom.InputImage +P:CoreImage.CIToneMapHeadroom.OutputImage +P:CoreImage.CIToneMapHeadroom.SourceHeadroom +P:CoreImage.CIToneMapHeadroom.TargetHeadroom P:CoreImage.CITorusLensDistortion.InputCenter P:CoreImage.CITorusLensDistortion.InputImage P:CoreImage.CITorusLensDistortion.OutputImage @@ -61799,6 +61827,9 @@ P:CoreImage.ICIMaskedVariableBlurProtocol.Mask P:CoreImage.ICIMaskedVariableBlurProtocol.Radius P:CoreImage.ICIMaskToAlphaProtocol.InputImage P:CoreImage.ICIMaximumComponentProtocol.InputImage +P:CoreImage.ICIMaximumScaleTransformProtocol.AspectRatio +P:CoreImage.ICIMaximumScaleTransformProtocol.InputImage +P:CoreImage.ICIMaximumScaleTransformProtocol.Scale P:CoreImage.ICIMedianProtocol.InputImage P:CoreImage.ICIMeshGeneratorProtocol.Color P:CoreImage.ICIMeshGeneratorProtocol.Mesh @@ -62011,6 +62042,9 @@ P:CoreImage.ICIToneCurveProtocol.InputPoint1 P:CoreImage.ICIToneCurveProtocol.InputPoint2 P:CoreImage.ICIToneCurveProtocol.InputPoint3 P:CoreImage.ICIToneCurveProtocol.InputPoint4 +P:CoreImage.ICIToneMapHeadroomProtocol.InputImage +P:CoreImage.ICIToneMapHeadroomProtocol.SourceHeadroom +P:CoreImage.ICIToneMapHeadroomProtocol.TargetHeadroom P:CoreImage.ICITorusLensDistortionProtocol.InputCenter P:CoreImage.ICITorusLensDistortionProtocol.InputImage P:CoreImage.ICITorusLensDistortionProtocol.Radius @@ -78296,6 +78330,7 @@ T:CoreHaptics.ICHHapticAdvancedPatternPlayer T:CoreHaptics.ICHHapticDeviceCapability T:CoreHaptics.ICHHapticParameterAttributes T:CoreHaptics.ICHHapticPatternPlayer +T:CoreImage.CIAreaBoundsRed T:CoreImage.CIAreaLogarithmicHistogram T:CoreImage.CIAreaMinMax T:CoreImage.CIAreaMinMaxRed @@ -78346,6 +78381,7 @@ T:CoreImage.CIKMeans T:CoreImage.CILabDeltaE T:CoreImage.CILinearBlur T:CoreImage.CILinearLightBlendMode +T:CoreImage.CIMaximumScaleTransform T:CoreImage.CIMeshGenerator T:CoreImage.CIMix T:CoreImage.CIMorphology @@ -78376,6 +78412,7 @@ T:CoreImage.CISampleNearest T:CoreImage.CISamplerOptions T:CoreImage.CISobelGradients T:CoreImage.CIThermal +T:CoreImage.CIToneMapHeadroom T:CoreImage.CIVividLightBlendMode T:CoreImage.CIWrapMode T:CoreImage.CIXRay @@ -78384,6 +78421,7 @@ T:CoreImage.ICIAccordionFoldTransitionProtocol T:CoreImage.ICIAffineClampProtocol T:CoreImage.ICIAffineTileProtocol T:CoreImage.ICIAreaAverageProtocol +T:CoreImage.ICIAreaBoundsRedProtocol T:CoreImage.ICIAreaHistogramProtocol T:CoreImage.ICIAreaLogarithmicHistogramProtocol T:CoreImage.ICIAreaMaximumAlphaProtocol @@ -78491,6 +78529,7 @@ T:CoreImage.ICILineScreenProtocol T:CoreImage.ICIMaskedVariableBlurProtocol T:CoreImage.ICIMaskToAlphaProtocol T:CoreImage.ICIMaximumComponentProtocol +T:CoreImage.ICIMaximumScaleTransformProtocol T:CoreImage.ICIMedianProtocol T:CoreImage.ICIMeshGeneratorProtocol T:CoreImage.ICIMinimumComponentProtocol @@ -78550,6 +78589,7 @@ T:CoreImage.ICITemperatureAndTintProtocol T:CoreImage.ICITextImageGeneratorProtocol T:CoreImage.ICIThermalProtocol T:CoreImage.ICIToneCurveProtocol +T:CoreImage.ICIToneMapHeadroomProtocol T:CoreImage.ICITorusLensDistortionProtocol T:CoreImage.ICITransitionFilterProtocol T:CoreImage.ICITriangleKaleidoscopeProtocol diff --git a/tests/introspection/ApiCoreImageFiltersTest.cs b/tests/introspection/ApiCoreImageFiltersTest.cs index 7916625f54..f09079b051 100644 --- a/tests/introspection/ApiCoreImageFiltersTest.cs +++ b/tests/introspection/ApiCoreImageFiltersTest.cs @@ -567,6 +567,13 @@ namespace Introspection { continue; } break; + case "CIToneMapHeadroom": + switch (key) { + case "outputValue:": + // no doc for argument + continue; + } + break; } var cap = Char.ToUpperInvariant (key [0]) + key.Substring (1);