upgrade libjxl to 0.9.0, some improvements

awxkee · Jan 10, 2024 · 8408c85 · 8408c85
1 parent 5f7fe79
commit 8408c85
Show file tree

Hide file tree

Showing 168 changed files with 223,315 additions and 263 deletions.
diff --git a/JxlCoder.podspec b/JxlCoder.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'JxlCoder'
-    s.version          = '1.4.1'
+    s.version          = '1.5.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'

diff --git a/Package.swift b/Package.swift
@@ -17,7 +17,8 @@ let package = Package(
             dependencies: ["jxlc"],
             path: "Sources/JxlCoder"),
         .target(name: "jxlc",
-                dependencies: ["libbrotlicommon", "libbrotlidec", "libbrotlienc", "libhwy", "libjxl_threads", "libjxl"],
+                dependencies: ["libbrotlicommon", "libbrotlidec", "libbrotlienc", "libhwy",
+                               "libjxl_threads", "libjxl", "libjxl_cms", "libskcms"],
                 publicHeadersPath: "include",
                 linkerSettings: [
                     .linkedFramework("Accelerate")
@@ -27,7 +28,9 @@ let package = Package(
         .binaryTarget(name: "libbrotlienc", path: "Sources/Frameworks/libbrotlienc.xcframework"),
         .binaryTarget(name: "libhwy", path: "Sources/Frameworks/libhwy.xcframework"),
         .binaryTarget(name: "libjxl_threads", path: "Sources/Frameworks/libjxl_threads.xcframework"),
-        .binaryTarget(name: "libjxl", path: "Sources/Frameworks/libjxl.xcframework")
+        .binaryTarget(name: "libjxl", path: "Sources/Frameworks/libjxl.xcframework"),
+        .binaryTarget(name: "libjxl_cms", path: "Sources/Frameworks/libjxl_cms.xcframework"),
+        .binaryTarget(name: "libskcms", path: "Sources/Frameworks/libskcms.xcframework")
     ],
     cxxLanguageStandard: .cxx20
 )
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ pod install
 ```swift
 import JxlCoder
 // Decompress data
-let uiImage: UIImage? = JXLCoder.decode(data: Data()) // or any max CGSize of image
+let uiImage: UIImage = try JXLCoder.decode(data: Data()) // or any max CGSize of image
 // Compress
 let data: Data = try JXLCoder.encode(data: UIImage())
 ```

diff --git a/Sources/Frameworks/libbrotlicommon.xcframework/Info.plist b/Sources/Frameworks/libbrotlicommon.xcframework/Info.plist
@@ -5,10 +5,12 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libbrotlicommon.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libbrotlicommon.a</string>
 			<key>SupportedArchitectures</key>
@@ -17,9 +19,13 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libbrotlicommon.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
@@ -34,10 +40,12 @@
 			<string>ios</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libbrotlicommon.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libbrotlicommon.a</string>
 			<key>SupportedArchitectures</key>
@@ -46,9 +54,7 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>macos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/Sources/Frameworks/libbrotlicommon.xcframework/ios-arm64/libbrotlicommon.a b/Sources/Frameworks/libbrotlicommon.xcframework/ios-arm64/libbrotlicommon.a
diff --git a/Sources/Frameworks/libbrotlicommon.xcframework/ios-arm64_x86_64-simulator/libbrotlicommon.a b/Sources/Frameworks/libbrotlicommon.xcframework/ios-arm64_x86_64-simulator/libbrotlicommon.a
diff --git a/Sources/Frameworks/libbrotlicommon.xcframework/macos-arm64_x86_64/libbrotlicommon.a b/Sources/Frameworks/libbrotlicommon.xcframework/macos-arm64_x86_64/libbrotlicommon.a
diff --git a/Sources/Frameworks/libbrotlidec.xcframework/Info.plist b/Sources/Frameworks/libbrotlidec.xcframework/Info.plist
@@ -5,6 +5,8 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libbrotlidec.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
@@ -22,6 +24,8 @@
 			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libbrotlidec.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
@@ -36,6 +40,8 @@
 			<string>ios</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libbrotlidec.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>

diff --git a/Sources/Frameworks/libbrotlidec.xcframework/ios-arm64/libbrotlidec.a b/Sources/Frameworks/libbrotlidec.xcframework/ios-arm64/libbrotlidec.a
diff --git a/Sources/Frameworks/libbrotlidec.xcframework/ios-arm64_x86_64-simulator/libbrotlidec.a b/Sources/Frameworks/libbrotlidec.xcframework/ios-arm64_x86_64-simulator/libbrotlidec.a
diff --git a/Sources/Frameworks/libbrotlidec.xcframework/macos-arm64_x86_64/libbrotlidec.a b/Sources/Frameworks/libbrotlidec.xcframework/macos-arm64_x86_64/libbrotlidec.a
diff --git a/Sources/Frameworks/libbrotlienc.xcframework/Info.plist b/Sources/Frameworks/libbrotlienc.xcframework/Info.plist
@@ -5,6 +5,8 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libbrotlienc.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
@@ -20,35 +22,39 @@
 			<string>macos</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libbrotlienc.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libbrotlienc.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libbrotlienc.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libbrotlienc.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/Sources/Frameworks/libbrotlienc.xcframework/ios-arm64/libbrotlienc.a b/Sources/Frameworks/libbrotlienc.xcframework/ios-arm64/libbrotlienc.a
diff --git a/Sources/Frameworks/libbrotlienc.xcframework/ios-arm64_x86_64-simulator/libbrotlienc.a b/Sources/Frameworks/libbrotlienc.xcframework/ios-arm64_x86_64-simulator/libbrotlienc.a
diff --git a/Sources/Frameworks/libbrotlienc.xcframework/macos-arm64_x86_64/libbrotlienc.a b/Sources/Frameworks/libbrotlienc.xcframework/macos-arm64_x86_64/libbrotlienc.a
diff --git a/Sources/Frameworks/libhwy.xcframework/Info.plist b/Sources/Frameworks/libhwy.xcframework/Info.plist
@@ -5,10 +5,12 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libhwy.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libhwy.a</string>
 			<key>SupportedArchitectures</key>
@@ -17,38 +19,42 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libhwy.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libhwy.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>macos</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libhwy.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libhwy.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>