updated version

Author: awxkee

JxlCoder.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'JxlCoder'
-    s.version          = '1.7.3'
+    s.version          = '1.8.0'
     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'

Sources/jxlc/JXLSystemImage.hpp

@@ -56,7 +56,7 @@ typedef NS_ENUM(NSInteger, JXLCompressionOption) {
 typedef NS_ENUM(NSInteger, JXLPreferredPixelFormat) {
     kOptimal NS_SWIFT_NAME(optimal),
     kR8 NS_SWIFT_NAME(r8),
-    kFloat16 NS_SWIFT_NAME(float16),
+    kR16 NS_SWIFT_NAME(r16),
 };
 
 typedef NS_ENUM(NSInteger, JXLEncoderDecodingSpeed)  {

Sources/jxlc/JxlDefinitions.h

@@ -39,7 +39,7 @@ enum JxlCompressionOption {
 enum JxlDecodingPixelFormat {
     optimal = 1,
     r8 = 2,
-    float16 = 3
+    r16 = 3
 };
 
 enum JxlEncodingPixelFormat {

Sources/jxlc/JxlInternalCoder.mm

@@ -235,7 +235,7 @@ - (nullable JXLSystemImage *)decode:(nonnull NSInputStream *)inputStream
 
         std::vector<uint8_t> iccProfile;
         size_t xSize, ySize;
-        bool useFloats;
+        bool use16BitImage;
         int depth;
         std::vector<uint8_t> outputData;
         int components;
@@ -248,14 +248,14 @@ - (nullable JXLSystemImage *)decode:(nonnull NSInputStream *)inputStream
             case kR8:
                 pixelFormat = r8;
                 break;
-            case kFloat16:
-                pixelFormat = float16;
+            case kR16:
+                pixelFormat = r16;
                 break;
         }
         auto decoded = DecodeJpegXlOneShot(imageData.data(), imageData.size(),
                                            &outputData, &xSize, &ySize,
                                            &iccProfile, &depth, &components,
-                                           &useFloats, &jxlExposedOrientation,
+                                           &use16BitImage, &jxlExposedOrientation,
                                            pixelFormat);
         if (!decoded) {
             *error = [[NSError alloc] initWithDomain:@"JXLCoder" 
@@ -277,7 +277,7 @@ - (nullable JXLSystemImage *)decode:(nonnull NSInputStream *)inputStream
         if (rescale.width > 0 && rescale.height > 0) {
             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];
+                                          components:components pixelFormat:use16BitImage ? kF16 : kU8];
             if (!scaleResult) {
                 *error = [[NSError alloc] initWithDomain:@"JXLCoder" 
                                                     code:500
@@ -309,11 +309,11 @@ - (nullable JXLSystemImage *)decode:(nonnull NSInputStream *)inputStream
             }
         }
 
-        int stride = components*(int)xSize * (int)(useFloats ? sizeof(uint16_t) : sizeof(uint8_t));
+        int stride = components*(int)xSize * (int)(use16BitImage ? sizeof(uint16_t) : sizeof(uint8_t));
 
         int flags;
-        if (useFloats) {
-            flags = (int)kCGBitmapByteOrder16Host | (int)kCGBitmapFloatComponents;
+        if (use16BitImage) {
+            flags = (int)kCGBitmapByteOrder16Host;
             if (components == 4) {
                 flags |= (int)kCGImageAlphaLast;
             } else {
@@ -343,7 +343,7 @@ - (nullable JXLSystemImage *)decode:(nonnull NSInputStream *)inputStream
             return nullptr;
         }
 
-        int bitsPerComponent = (useFloats ? sizeof(uint16_t) : sizeof(uint8_t)) * 8;
+        int bitsPerComponent = (use16BitImage ? sizeof(uint16_t) : sizeof(uint8_t)) * 8;
         int bitsPerPixel = bitsPerComponent*components;
 
         CGImageRef imageRef = CGImageCreate(xSize, ySize, bitsPerComponent,

Sources/jxlc/JxlWorker.cpp

@@ -68,8 +68,8 @@ bool DecodeJpegXlOneShot(const uint8_t *jxl, size_t size,
     if (pixelFormat == optimal) {
         format = {4, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
     } else {
-        if (pixelFormat == float16) {
-            format = {4, JXL_TYPE_FLOAT16, JXL_NATIVE_ENDIAN, 0};
+        if (pixelFormat == r16) {
+            format = {4, JXL_TYPE_UINT16, JXL_NATIVE_ENDIAN, 0};
         } else if (pixelFormat == r8) {
             format = {4, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
         }
@@ -105,11 +105,11 @@ bool DecodeJpegXlOneShot(const uint8_t *jxl, size_t size,
             if (bitDepth > 8 && pixelFormat == optimal) {
                 *useFloats = true;
                 hdrImage = true;
-                format = { static_cast<uint32_t>(baseComponents), JXL_TYPE_FLOAT16, JXL_NATIVE_ENDIAN, 0 };
-            } else if (pixelFormat == float16) {
+                format = { static_cast<uint32_t>(baseComponents), JXL_TYPE_UINT16, JXL_NATIVE_ENDIAN, 0 };
+            } else if (pixelFormat == r16) {
                 *useFloats = true;
                 hdrImage = true;
-                format = { static_cast<uint32_t>(baseComponents), JXL_TYPE_FLOAT16, JXL_NATIVE_ENDIAN, 0 };
+                format = { static_cast<uint32_t>(baseComponents), JXL_TYPE_UINT16, JXL_NATIVE_ENDIAN, 0 };
             } else {
                 if (pixelFormat == r8) {
                     *depth = 8;