correctly handle ICC profiles

Author: awxkee

.swiftpm/xcode/xcuserdata/radzivonbartoshyk.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,12 @@
 		<key>Jxl Coder-Package.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
+		</dict>
+		<key>JxlCoder.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>6</integer>
 		</dict>
 		<key>jxlcoder.xcscheme_^#shared#^_</key>
 		<dict>

Jxl Coder.xcodeproj/project.pbxproj

@@ -13,9 +13,7 @@
 		D341F4CC2A97FC2A003A496C /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D341F4CB2A97FC2A003A496C /* Preview Assets.xcassets */; };
 		D3B84ACC2A9C580800DAFE87 /* Nuke in Frameworks */ = {isa = PBXBuildFile; productRef = D3B84ACB2A9C580800DAFE87 /* Nuke */; };
 		D3B84ACE2A9C580800DAFE87 /* NukeUI in Frameworks */ = {isa = PBXBuildFile; productRef = D3B84ACD2A9C580800DAFE87 /* NukeUI */; };
-		D3B84AD02A9C581500DAFE87 /* JxlNukePlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3B84ACF2A9C581500DAFE87 /* JxlNukePlugin.swift */; };
 		D3B84AD32A9C58EB00DAFE87 /* SDWebImage in Frameworks */ = {isa = PBXBuildFile; productRef = D3B84AD22A9C58EB00DAFE87 /* SDWebImage */; };
-		D3B84AD52A9C591600DAFE87 /* JxlSDWebImageCoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3B84AD42A9C591600DAFE87 /* JxlSDWebImageCoder.swift */; };
 		D3D2B9EB2A9BACF100EBB7A9 /* libjxl_threads.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D2B9E62A9BACF000EBB7A9 /* libjxl_threads.xcframework */; };
 		D3D2B9EC2A9BACF100EBB7A9 /* libbrotlidec.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D2B9E72A9BACF000EBB7A9 /* libbrotlidec.xcframework */; };
 		D3D2B9EE2A9BACF100EBB7A9 /* libbrotlienc.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D2B9E92A9BACF100EBB7A9 /* libbrotlienc.xcframework */; };
@@ -38,8 +36,6 @@
 		D341F4C62A97FC29003A496C /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
 		D341F4C82A97FC2A003A496C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		D341F4CB2A97FC2A003A496C /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
-		D3B84ACF2A9C581500DAFE87 /* JxlNukePlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JxlNukePlugin.swift; sourceTree = "<group>"; };
-		D3B84AD42A9C591600DAFE87 /* JxlSDWebImageCoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JxlSDWebImageCoder.swift; sourceTree = "<group>"; };
 		D3B84AD62A9C5FE700DAFE87 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
 		D3B84AD72A9C636E00DAFE87 /* JXLCoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JXLCoder.h; sourceTree = "<group>"; };
 		D3D2B9E62A9BACF000EBB7A9 /* libjxl_threads.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = libjxl_threads.xcframework; sourceTree = "<group>"; };
@@ -87,8 +83,6 @@
 		D341F4B82A97FC29003A496C = {
 			isa = PBXGroup;
 			children = (
-				D3B84AD42A9C591600DAFE87 /* JxlSDWebImageCoder.swift */,
-				D3B84ACF2A9C581500DAFE87 /* JxlNukePlugin.swift */,
 				D341F4D22A97FC5A003A496C /* Sources */,
 				D341F4C32A97FC29003A496C /* Jxl Coder */,
 				D341F4C22A97FC29003A496C /* Products */,
@@ -290,12 +284,10 @@
 			files = (
 				D3D2B9F52A9BAD6A00EBB7A9 /* JXLCPlusCoder.mm in Sources */,
 				D3D2BA092A9BD1B600EBB7A9 /* JXLSystemImage.mm in Sources */,
-				D3B84AD52A9C591600DAFE87 /* JxlSDWebImageCoder.swift in Sources */,
 				D3D2B9FD2A9BAEF300EBB7A9 /* jxl_worker.cpp in Sources */,
 				D3D2BA002A9BB4AF00EBB7A9 /* JXLCoder.swift in Sources */,
 				D3D2BA022A9BB50F00EBB7A9 /* JXLSupport.swift in Sources */,
 				D341F4C72A97FC29003A496C /* ContentView.swift in Sources */,
-				D3B84AD02A9C581500DAFE87 /* JxlNukePlugin.swift in Sources */,
 				D341F4C52A97FC29003A496C /* Jxl_CoderApp.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

JxlCoder.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'JxlCoder'
-    s.version          = '1.0.1'
+    s.version          = '1.0.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'
@@ -25,4 +25,4 @@ Pod::Spec.new do |s|
     s.preserve_paths = "Sources/Frameworks/*.xcframework", "Sources/Frameworks/*.xcframework/**/Headers", "Sources/Frameworks/libjxl.xcframework/ios-arm64/Headers/jxl", "Sources/Frameworks/libjxl.xcframework/ios-arm64/Headers/jpegli"
     s.libraries = 'c++'
     s.requires_arc = true
-end
+end

Package.swift

@@ -8,8 +8,8 @@ let package = Package(
     platforms: [.iOS(.v11), .macOS(.v11)],
     products: [
         .library(
-            name: "jxlcoder",
-            targets: ["jxlcoder"]),
+            name: "JxlCoder",
+            targets: ["JxlCoder"]),
     ],
     targets: [
         .target(

Sources/jxlc/JXLCPlusCoder.mm

@@ -11,11 +11,17 @@
 #import "jxl_worker.hpp"
 #import <Accelerate/Accelerate.h>
 
-static void JXLCGDataProviderReleaseDataCallback(void *info, const void *data, size_t size) {
-    JXLDataWrapper* dataWrapper = static_cast<JXLDataWrapper*>(info);
+static void JXLCGData16ProviderReleaseDataCallback(void *info, const void *data, size_t size) {
+    auto dataWrapper = static_cast<JXLDataWrapper<uint16_t>*>(info);
     delete dataWrapper;
 }
 
+static void JXLCGData8ProviderReleaseDataCallback(void *info, const void *data, size_t size) {
+    auto dataWrapper = static_cast<JXLDataWrapper<uint8_t>*>(info);
+    delete dataWrapper;
+}
+
+
 std::vector<uint8_t> convertRGBAtoRGB(std::vector<uint8_t> srcVector, int width, int height) {
     std::vector<uint8_t> dstVector;
     vImage_Buffer src = {
@@ -98,7 +104,7 @@ - (nullable NSData *)encode:(nonnull JXLSystemImage *)platformImage
         pixels = resizedVector;
     }
 
-    JXLDataWrapper* wrapper = new JXLDataWrapper();
+    JXLDataWrapper<uint8_t>* wrapper = new JXLDataWrapper<uint8_t>();
     auto encoded = EncodeJxlOneshot(pixels, width, height, &wrapper->data, jColorspace, jCompressionOption, compressionDistance);
     if (!encoded) {
         delete wrapper;
@@ -196,7 +202,7 @@ - (nullable JXLSystemImage *)decode:(nonnull NSInputStream *)inputStream error:(
         return nil;
     }
 
-    JXLDataWrapper* dataWrapper = new JXLDataWrapper();
+    auto dataWrapper = new JXLDataWrapper<uint8_t>();
     std::vector<uint8_t> iccProfile;
     size_t xSize, ySize;
     auto decoded = DecodeJpegXlOneShot(imageData.data(), imageData.size(),
@@ -207,10 +213,22 @@ - (nullable JXLSystemImage *)decode:(nonnull NSInputStream *)inputStream error:(
         return nil;
     }
 
-    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    int flags = (int)kCGBitmapByteOrder32Big | (int)kCGImageAlphaLast;
+    CGColorSpaceRef colorSpace;
+    if (iccProfile.size() > 0) {
+        CFDataRef iccData = CFDataCreate(kCFAllocatorDefault, iccProfile.data(), iccProfile.size());
+        colorSpace = CGColorSpaceCreateWithICCData(iccData);
+        CFRelease(iccData);
+    } else {
+        colorSpace = CGColorSpaceCreateDeviceRGB();
+    }
+
+    if (!colorSpace) {
+        colorSpace = CGColorSpaceCreateDeviceRGB();
+    }
+
+    int flags = (int)kCGImageByteOrder32Big | (int)kCGImageAlphaLast;
     CGDataProviderRef provider = CGDataProviderCreateWithData(dataWrapper, dataWrapper->data.data(),
-                                                              dataWrapper->data.size(), JXLCGDataProviderReleaseDataCallback);
+                                                              dataWrapper->data.size(), JXLCGData8ProviderReleaseDataCallback);
     if (!provider) {
         delete dataWrapper;
         *error = [[NSError alloc] initWithDomain:@"JXLCoder"

Sources/jxlc/jxl_worker.cpp

@@ -77,10 +77,10 @@ bool DecodeJpegXlOneShot(const uint8_t *jxl, size_t size,
                 JxlDecoderImageOutBufferSize(dec.get(), &format, &buffer_size)) {
                 return false;
             }
-            if (buffer_size != *xsize * *ysize * 4) {
+            if (buffer_size != *xsize * *ysize * 4 * sizeof(uint8_t)) {
                 return false;
             }
-            pixels->resize(*xsize * *ysize * 4);
+            pixels->resize(*xsize * *ysize * 4 * sizeof(uint8_t));
             void *pixels_buffer = (void *) pixels->data();
             size_t pixels_buffer_size = pixels->size() * sizeof(uint8_t);
             if (JXL_DEC_SUCCESS != JxlDecoderSetImageOutBuffer(dec.get(), &format,

Sources/jxlc/jxl_worker.hpp

@@ -33,10 +33,11 @@ bool EncodeJxlOneshot(const std::vector<uint8_t> &pixels, const uint32_t xsize,
                       jxl_colorspace colorspace, jxl_compression_option compression_option,
                       float compression_distance);
 
+template <typename DataType>
 class JXLDataWrapper {
 public:
     JXLDataWrapper() {}
-    std::vector<uint8_t> data;
+    std::vector<DataType> data;
 };
 #endif