removed outdated scaler

Author: awxkee

Sources/JxlCoder/JXLCoder.swift

@@ -57,9 +57,8 @@ public class JXLCoder {
     public static func decode(srcStream: InputStream, 
                               rescale: CGSize = .zero,
                               scale: Int = 1,
-                              pixelFormat: JXLPreferredPixelFormat = .optimal,
-                              sampler: JxlSampler = .hann) throws -> JXLPlatformImage {
-        return try shared.decode(srcStream, rescale: rescale, pixelFormat: pixelFormat, sampler: sampler, scale: Int32(scale))
+                              pixelFormat: JXLPreferredPixelFormat = .optimal) throws -> JXLPlatformImage {
+        return try shared.decode(srcStream, rescale: rescale, pixelFormat: pixelFormat, scale: Int32(scale))
     }
 
     /***
@@ -70,13 +69,12 @@ public class JXLCoder {
     public static func decode(url: URL, 
                               rescale: CGSize = .zero,
                               scale: Int = 1,
-                              pixelFormat: JXLPreferredPixelFormat = .optimal,
-                              sampler: JxlSampler = .lanczos) throws -> JXLPlatformImage {
+                              pixelFormat: JXLPreferredPixelFormat = .optimal) throws -> JXLPlatformImage {
         guard let srcStream = InputStream(url: url) else {
             throw NSError(domain: "JXLCoder", code: 500,
                           userInfo: [NSLocalizedDescriptionKey: "JXLCoder cannot open provided URL"])
         }
-        return try shared.decode(srcStream, rescale: rescale, pixelFormat: pixelFormat, sampler: sampler, scale: Int32(scale))
+        return try shared.decode(srcStream, rescale: rescale, pixelFormat: pixelFormat, scale: Int32(scale))
     }
 
     /***
@@ -87,10 +85,9 @@ public class JXLCoder {
     public static func decode(data: Data, 
                               rescale: CGSize = .zero,
                               scale: Int = 1,
-                              pixelFormat: JXLPreferredPixelFormat = .optimal,
-                              sampler: JxlSampler = .lanczos) throws -> JXLPlatformImage {
+                              pixelFormat: JXLPreferredPixelFormat = .optimal) throws -> JXLPlatformImage {
         let srcStream = InputStream(data: data)
-        return try shared.decode(srcStream, rescale: rescale, pixelFormat: pixelFormat, sampler: sampler, scale: Int32(scale))
+        return try shared.decode(srcStream, rescale: rescale, pixelFormat: pixelFormat, scale: Int32(scale))
     }
 
     /***

Sources/jxlc/JXLSystemImage.hpp

@@ -59,18 +59,6 @@ typedef NS_ENUM(NSInteger, JXLPreferredPixelFormat) {
     kFloat16 NS_SWIFT_NAME(float16),
 };
 
-typedef NS_ENUM(NSInteger, JxlSampler)  {
-    kNearestNeighbor NS_SWIFT_NAME(nearestNeighbor),
-    kBilinear NS_SWIFT_NAME(bilinear),
-    kCubic NS_SWIFT_NAME(cubic),
-    kBSpline NS_SWIFT_NAME(bSpline),
-    kMitchell NS_SWIFT_NAME(mitchell),
-    kLanczos NS_SWIFT_NAME(lanczos),
-    kCatmullRom NS_SWIFT_NAME(catmullRom),
-    kHermite NS_SWIFT_NAME(hermite),
-    kHann NS_SWIFT_NAME(hann)
-};
-
 typedef NS_ENUM(NSInteger, JXLEncoderDecodingSpeed)  {
     kSlowest NS_SWIFT_NAME(slowest) = 0,
     kSlow NS_SWIFT_NAME(slow) = 1,

Sources/jxlc/JxlInternalCoder.h

@@ -35,7 +35,6 @@
 - (nullable JXLSystemImage *)decode:(nonnull NSInputStream *)inputStream
                              rescale:(CGSize)rescale
                              pixelFormat:(JXLPreferredPixelFormat)preferredPixelFormat
-                             sampler:(JxlSampler)sampler
                              scale:(int)scale
                              error:(NSError *_Nullable * _Nullable)error;
 - (CGSize)getSize:(nonnull NSInputStream *)inputStream error:(NSError *_Nullable * _Nullable)error;

Sources/jxlc/JxlInternalCoder.mm

@@ -189,7 +189,6 @@ - (CGSize)getSize:(nonnull NSInputStream *)inputStream error:(NSError *_Nullable
 - (nullable JXLSystemImage *)decode:(nonnull NSInputStream *)inputStream
                             rescale:(CGSize)rescale
                         pixelFormat:(JXLPreferredPixelFormat)preferredPixelFormat
-                            sampler:(JxlSampler)sampler
                               scale:(int)scale
                               error:(NSError *_Nullable * _Nullable)error {
     try {
@@ -276,41 +275,9 @@ - (nullable JXLSystemImage *)decode:(nonnull NSInputStream *)inputStream
         }
 
         if (rescale.width > 0 && rescale.height > 0) {
-            XSampler xSampler = bilinear;
-
-            switch (sampler) {
-                case kNearestNeighbor:
-                    xSampler = nearest;
-                    break;
-                case kBilinear:
-                    xSampler = bilinear;
-                    break;
-                case kCubic:
-                    xSampler = cubic;
-                    break;
-                case kMitchell:
-                    xSampler = mitchell;
-                    break;
-                case kLanczos:
-                    xSampler = lanczos;
-                    break;
-                case kCatmullRom:
-                    xSampler = catmullRom;
-                    break;
-                case kHermite:
-                    xSampler = hermite;
-                    break;
-                case kBSpline:
-                    xSampler = bSpline;
-                    break;
-                case kHann:
-                    xSampler = hann;
-                    break;
-            }
-
             auto scaleResult = [RgbaScaler scaleData:outputData width:(int)xSize height:(int)ySize
                                             newWidth:(int)rescale.width newHeight:(int)rescale.height
-                                          components:components pixelFormat:useFloats ? kF16 : kU8 sampler:xSampler];
+                                          components:components pixelFormat:useFloats ? kF16 : kU8];
             if (!scaleResult) {
                 *error = [[NSError alloc] initWithDomain:@"JXLCoder" 
                                                     code:500

Sources/jxlc/RgbaScaler.h

@@ -29,7 +29,6 @@
 #ifdef __cplusplus
 
 #import <vector>
-#import "XScaler.hpp"
 
 typedef NS_ENUM(NSInteger, JxlIPixelFormat)  {
     kU8 NS_SWIFT_NAME(uniform8),
@@ -47,7 +46,7 @@ typedef NS_ENUM(NSInteger, JxlIPixelFormat)  {
  * @param pixelFormat Pixel Format of the image
  * @return destination
  */
-+(bool) scaleData:(std::vector<uint8_t>&)src width:(int)width height:(int)height newWidth:(int)newWidth newHeight:(int)newHeight components:(int)components pixelFormat:(JxlIPixelFormat)pixelFormat sampler:(XSampler)sampler;
++(bool) scaleData:(std::vector<uint8_t>&)src width:(int)width height:(int)height newWidth:(int)newWidth newHeight:(int)newHeight components:(int)components pixelFormat:(JxlIPixelFormat)pixelFormat;
 @end
 
 #endif