Merge pull request #8 from awxkee/dev

bump libs, added CMYK handling

Author: awxkee

Sources/Frameworks/libjxl.xcframework/Info.plist

@@ -10,15 +10,16 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libjxl.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>
@@ -45,16 +46,15 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libjxl.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

…mework/ios-arm64/Headers/jpegli/common.h …mework/ios-arm64/Headers/jpegli/common.hSources/Frameworks/libjpegli.xcframework/ios-arm64/Headers/jpegli/common.h renamed to Sources/Frameworks/libjxl.xcframework/ios-arm64/Headers/jpegli/common.h Sources/Frameworks/libjpegli.xcframework/ios-arm64/Headers/jpegli/common.h renamed to Sources/Frameworks/libjxl.xcframework/ios-arm64/Headers/jpegli/common.h

@@ -23,7 +23,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#if defined(__cplusplus) || defined(c_plusplus)
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -246,7 +246,7 @@ typedef struct {
   jpegxl_cms_destroy_func destroy;
 } JxlCmsInterface;
 
-#if defined(__cplusplus) || defined(c_plusplus)
+#ifdef __cplusplus
 }
 #endif
 

…mework/ios-arm64/Headers/jpegli/decode.h …mework/ios-arm64/Headers/jpegli/decode.hSources/Frameworks/libjpegli.xcframework/ios-arm64/Headers/jpegli/decode.h renamed to Sources/Frameworks/libjxl.xcframework/ios-arm64/Headers/jpegli/decode.h Sources/Frameworks/libjpegli.xcframework/ios-arm64/Headers/jpegli/decode.h renamed to Sources/Frameworks/libjxl.xcframework/ios-arm64/Headers/jpegli/decode.h

@@ -19,7 +19,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#if defined(__cplusplus) || defined(c_plusplus)
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -424,7 +424,7 @@ typedef struct {
   JxlLayerInfo layer_info;
 } JxlFrameHeader;
 
-#if defined(__cplusplus) || defined(c_plusplus)
+#ifdef __cplusplus
 }
 #endif