Skip to content

Commit 8408c85

Browse files
committed
upgrade libjxl to 0.9.0, some improvements
1 parent 5f7fe79 commit 8408c85

File tree

168 files changed

+223315
-263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+223315
-263
lines changed

JxlCoder.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'JxlCoder'
3-
s.version = '1.4.1'
3+
s.version = '1.5.0'
44
s.summary = 'JXL coder for iOS and MacOS'
55
s.description = 'Provides support for JXL files in iOS and MacOS'
66
s.homepage = 'https://github.com/awxkee/jxl-coder-swift'

Package.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ let package = Package(
1717
dependencies: ["jxlc"],
1818
path: "Sources/JxlCoder"),
1919
.target(name: "jxlc",
20-
dependencies: ["libbrotlicommon", "libbrotlidec", "libbrotlienc", "libhwy", "libjxl_threads", "libjxl"],
20+
dependencies: ["libbrotlicommon", "libbrotlidec", "libbrotlienc", "libhwy",
21+
"libjxl_threads", "libjxl", "libjxl_cms", "libskcms"],
2122
publicHeadersPath: "include",
2223
linkerSettings: [
2324
.linkedFramework("Accelerate")
@@ -27,7 +28,9 @@ let package = Package(
2728
.binaryTarget(name: "libbrotlienc", path: "Sources/Frameworks/libbrotlienc.xcframework"),
2829
.binaryTarget(name: "libhwy", path: "Sources/Frameworks/libhwy.xcframework"),
2930
.binaryTarget(name: "libjxl_threads", path: "Sources/Frameworks/libjxl_threads.xcframework"),
30-
.binaryTarget(name: "libjxl", path: "Sources/Frameworks/libjxl.xcframework")
31+
.binaryTarget(name: "libjxl", path: "Sources/Frameworks/libjxl.xcframework"),
32+
.binaryTarget(name: "libjxl_cms", path: "Sources/Frameworks/libjxl_cms.xcframework"),
33+
.binaryTarget(name: "libskcms", path: "Sources/Frameworks/libskcms.xcframework")
3134
],
3235
cxxLanguageStandard: .cxx20
3336
)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pod install
4141
```swift
4242
import JxlCoder
4343
// Decompress data
44-
let uiImage: UIImage? = JXLCoder.decode(data: Data()) // or any max CGSize of image
44+
let uiImage: UIImage = try JXLCoder.decode(data: Data()) // or any max CGSize of image
4545
// Compress
4646
let data: Data = try JXLCoder.encode(data: UIImage())
4747
```

Sources/Frameworks/libbrotlicommon.xcframework/Info.plist

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
<key>AvailableLibraries</key>
66
<array>
77
<dict>
8+
<key>BinaryPath</key>
9+
<string>libbrotlicommon.a</string>
810
<key>HeadersPath</key>
911
<string>Headers</string>
1012
<key>LibraryIdentifier</key>
11-
<string>macos-arm64_x86_64</string>
13+
<string>ios-arm64_x86_64-simulator</string>
1214
<key>LibraryPath</key>
1315
<string>libbrotlicommon.a</string>
1416
<key>SupportedArchitectures</key>
@@ -17,9 +19,13 @@
1719
<string>x86_64</string>
1820
</array>
1921
<key>SupportedPlatform</key>
20-
<string>macos</string>
22+
<string>ios</string>
23+
<key>SupportedPlatformVariant</key>
24+
<string>simulator</string>
2125
</dict>
2226
<dict>
27+
<key>BinaryPath</key>
28+
<string>libbrotlicommon.a</string>
2329
<key>HeadersPath</key>
2430
<string>Headers</string>
2531
<key>LibraryIdentifier</key>
@@ -34,10 +40,12 @@
3440
<string>ios</string>
3541
</dict>
3642
<dict>
43+
<key>BinaryPath</key>
44+
<string>libbrotlicommon.a</string>
3745
<key>HeadersPath</key>
3846
<string>Headers</string>
3947
<key>LibraryIdentifier</key>
40-
<string>ios-arm64_x86_64-simulator</string>
48+
<string>macos-arm64_x86_64</string>
4149
<key>LibraryPath</key>
4250
<string>libbrotlicommon.a</string>
4351
<key>SupportedArchitectures</key>
@@ -46,9 +54,7 @@
4654
<string>x86_64</string>
4755
</array>
4856
<key>SupportedPlatform</key>
49-
<string>ios</string>
50-
<key>SupportedPlatformVariant</key>
51-
<string>simulator</string>
57+
<string>macos</string>
5258
</dict>
5359
</array>
5460
<key>CFBundlePackageType</key>
Binary file not shown.
Binary file not shown.
Binary file not shown.

Sources/Frameworks/libbrotlidec.xcframework/Info.plist

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<key>AvailableLibraries</key>
66
<array>
77
<dict>
8+
<key>BinaryPath</key>
9+
<string>libbrotlidec.a</string>
810
<key>HeadersPath</key>
911
<string>Headers</string>
1012
<key>LibraryIdentifier</key>
@@ -22,6 +24,8 @@
2224
<string>simulator</string>
2325
</dict>
2426
<dict>
27+
<key>BinaryPath</key>
28+
<string>libbrotlidec.a</string>
2529
<key>HeadersPath</key>
2630
<string>Headers</string>
2731
<key>LibraryIdentifier</key>
@@ -36,6 +40,8 @@
3640
<string>ios</string>
3741
</dict>
3842
<dict>
43+
<key>BinaryPath</key>
44+
<string>libbrotlidec.a</string>
3945
<key>HeadersPath</key>
4046
<string>Headers</string>
4147
<key>LibraryIdentifier</key>
-144 Bytes
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)