fix byte ordering

Author: awxkee

JxlCoder.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'JxlCoder'
-    s.version          = '1.3.1'
+    s.version          = '1.3.2'
     s.summary          = 'JXL coder for iOS and MacOS'
     s.description      = 'Provides support for JXL files in iOS and MacOS'
     s.homepage         = 'https://github.com/awxkee/jxl-coder-swift'

JxlNukePlugin/JxlNukePlugin.swift

@@ -13,7 +13,7 @@ import JxlCoder
 
 public final class JxlNukePlugin: Nuke.ImageDecoding {
     public func decode(_ data: Data) throws -> Nuke.ImageContainer {
-        guard try JXLCoder.isJXL(data: data) else { throw JXLNukePluginDecodeError() }
+        guard JXLCoder.isJXL(data: data) else { throw JXLNukePluginDecodeError() }
         let image = try JXLCoder.decode(data: data)
         return ImageContainer(image: image)
     }
@@ -46,7 +46,7 @@ extension JxlNukePlugin {
     }
 
     public static func enable(context: Nuke.ImageDecodingContext) -> Nuke.ImageDecoding? {
-        return try? JXLCoder.isJXL(data: context.data) ? JxlNukePlugin() : nil
+        return JXLCoder.isJXL(data: context.data) ? JxlNukePlugin() : nil
     }
 
 }

Sources/JxlCoder/JXLCoder.swift

@@ -67,7 +67,7 @@ public class JXLCoder {
     public static func decode(url: URL, 
                               rescale: CGSize = .zero,
                               pixelFormat: JXLPreferredPixelFormat = .optimal,
-                              sampler: JxlSampler = .hann) throws -> JXLPlatformImage {
+                              sampler: JxlSampler = .lanczos) throws -> JXLPlatformImage {
         guard let srcStream = InputStream(url: url) else {
             throw NSError(domain: "JXLCoder", code: 500,
                           userInfo: [NSLocalizedDescriptionKey: "JXLCoder cannot open provided URL"])
@@ -82,7 +82,7 @@ public class JXLCoder {
     public static func decode(data: Data, 
                               rescale: CGSize = .zero,
                               pixelFormat: JXLPreferredPixelFormat = .optimal,
-                              sampler: JxlSampler = .hann) throws -> JXLPlatformImage {
+                              sampler: JxlSampler = .lanczos) throws -> JXLPlatformImage {
         let srcStream = InputStream(data: data)
         return try shared.decode(srcStream, rescale: rescale, pixelFormat: pixelFormat, sampler: sampler)
     }

Sources/jxlc/JXLSystemImage.mm

@@ -54,8 +54,7 @@ -(bool)unpremultiply:(nonnull unsigned char*)data width:(NSInteger)width height:
 #if TARGET_OS_OSX
 
 -(nullable CGImageRef)makeCGImage {
-    NSRect rect = NSMakeRect(0, 0, self.size.width, self.size.height);
-    CGImageRef imageRef = [self CGImageForProposedRect: &rect context:nil hints:nil];
+    CGImageRef imageRef = [self CGImageForProposedRect:nil context:nil hints:nil];
     return imageRef;
 }
 
@@ -70,13 +69,12 @@ - (nullable uint8_t*)jxlRGBAPixels:(nonnull size_t*)bufferSize width:(nonnull in
     *ySize = (int)height;
 
     CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    CGBitmapInfo bitmapInfo = (int)kCGImageAlphaPremultipliedLast | (int)kCGBitmapByteOrder32Big;
+    CGBitmapInfo bitmapInfo = (int)kCGImageAlphaPremultipliedLast | (int)kCGImageByteOrderDefault;
 
     CGContextRef targetContext = CGBitmapContextCreate(targetMemory, width, height, 8, stride, colorSpace, bitmapInfo);
 
     [NSGraphicsContext saveGraphicsState];
     [NSGraphicsContext setCurrentContext: [NSGraphicsContext graphicsContextWithCGContext:targetContext flipped:FALSE]];
-    CGColorSpaceRelease(colorSpace);
 
     [self drawInRect: NSMakeRect(0, 0, width, height)
             fromRect: NSZeroRect
@@ -86,6 +84,7 @@ - (nullable uint8_t*)jxlRGBAPixels:(nonnull size_t*)bufferSize width:(nonnull in
     [NSGraphicsContext restoreGraphicsState];
 
     CGContextRelease(targetContext);
+    CGColorSpaceRelease(colorSpace);
 
     if (![self unpremultiply:targetMemory width:width height:height]) {
         free(targetMemory);
@@ -94,40 +93,6 @@ - (nullable uint8_t*)jxlRGBAPixels:(nonnull size_t*)bufferSize width:(nonnull in
 
     return targetMemory;
 }
-
-- (bool)jxlRGBAVPixels:(std::vector<uint8_t>&)buf width:(nonnull int*)xSize height:(nonnull int*)ySize {
-    CGImageRef imageRef = [self makeCGImage];
-    NSUInteger width = CGImageGetWidth(imageRef);
-    NSUInteger height = CGImageGetHeight(imageRef);
-    int stride = (int)4 * (int)width * sizeof(uint8_t);
-    buf.resize(stride * height);
-    *xSize = (int)width;
-    *ySize = (int)height;
-    
-    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    CGBitmapInfo bitmapInfo = (int)kCGImageAlphaPremultipliedLast | (int)kCGBitmapByteOrder32Big;
-
-    CGContextRef targetContext = CGBitmapContextCreate(buf.data(), width, height, 8, stride, colorSpace, bitmapInfo);
-
-    [NSGraphicsContext saveGraphicsState];
-    [NSGraphicsContext setCurrentContext: [NSGraphicsContext graphicsContextWithCGContext:targetContext flipped:FALSE]];
-    CGColorSpaceRelease(colorSpace);
-
-    [self drawInRect: NSMakeRect(0, 0, width, height)
-            fromRect: NSZeroRect
-           operation: NSCompositingOperationCopy
-            fraction: 1.0];
-
-    [NSGraphicsContext restoreGraphicsState];
-
-    CGContextRelease(targetContext);
-
-    if (![self unpremultiply:buf.data() width:width height:height]) {
-        return false;
-    }
-
-    return true;
-}
 #else
 - (nullable uint8_t*)jxlRGBAPixels:(nonnull size_t*)bufferSize width:(nonnull int*)xSize height:(nonnull int*)ySize {
     CGImageRef imageRef = [self CGImage];

Sources/jxlc/JxlWorker.cpp

@@ -243,13 +243,13 @@ bool EncodeJxlOneshot(const std::vector<uint8_t> &pixels, const uint32_t xsize,
         return false;
     }
 
-    JxlPixelFormat pixel_format = {3, JXL_TYPE_UINT8, JXL_BIG_ENDIAN, 0};
+    JxlPixelFormat pixel_format = {3, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
     switch (colorspace) {
         case rgb:
-            pixel_format = {3, JXL_TYPE_UINT8, JXL_BIG_ENDIAN, 0};
+            pixel_format = {3, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
             break;
         case rgba:
-            pixel_format = {4, JXL_TYPE_UINT8, JXL_BIG_ENDIAN, 0};
+            pixel_format = {4, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
             break;
     }