fixes bugs

Author: awxkee

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

@@ -17,7 +17,7 @@
 		<key>JxlCoder.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>0</integer>
 		</dict>
 		<key>jxlcoder.xcscheme_^#shared#^_</key>
 		<dict>

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    activesupport (7.0.7.2)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -15,10 +15,10 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.1.0)
-    cocoapods (1.12.1)
+    cocoapods (1.13.0)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.12.1)
+      cocoapods-core (= 1.13.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.6.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -32,11 +32,11 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.21.0, < 2.0)
+      xcodeproj (>= 1.23.0, < 2.0)
     cocoapods-catalyst-support (0.2.1)
       cocoapods (~> 1.9)
       colored2 (~> 3.1)
-    cocoapods-core (1.12.1)
+    cocoapods-core (1.13.0)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -64,15 +64,15 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    ffi (1.15.5)
+    ffi (1.16.2)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
-    minitest (5.19.0)
+    minitest (5.20.0)
     molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -89,7 +89,7 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.23.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

JxlCoder.podspec

@@ -9,13 +9,15 @@ Pod::Spec.new do |s|
     s.source           = { :git => 'https://github.com/awxkee/jxl-coder-swift.git', :tag => "#{s.version}" }
     s.ios.deployment_target = '11.0'
     s.osx.deployment_target = '11.0'
+    s.platform  = :ios, '11.0'
+    s.platform = :macos, '11.0'
     s.source_files = 'Sources/jxlc/*.{swift,h,m,cpp,mm,hpp}',  "Sources/JxlCoder/*.swift", 'Sources/Module/JxlCoder.h', 'Sources/Frameworks/libjxl.xcframework/ios-arm64/Headers/**/*.h'
     s.swift_version = ["5.3", "5.4", "5.5"]
     s.frameworks = "Foundation", "CoreGraphics", "Accelerate"
     s.ios.vendored_frameworks = 'Sources/Frameworks/libbrotlicommon.xcframework', 'Sources/Frameworks/libbrotlidec.xcframework', 'Sources/Frameworks/libbrotlienc.xcframework', 'Sources/Frameworks/libhwy.xcframework', 'Sources/Frameworks/libjxl.xcframework', 'Sources/Frameworks/libjxl_threads.xcframework'
     s.osx.vendored_frameworks = 'Sources/Frameworks/libbrotlicommon.xcframework', 'Sources/Frameworks/libbrotlidec.xcframework', 'Sources/Frameworks/libbrotlienc.xcframework', 'Sources/Frameworks/libhwy.xcframework', 'Sources/Frameworks/libjxl.xcframework', 'Sources/Frameworks/libjxl_threads.xcframework'
     s.public_header_files = 'Sources/jxlc/**.h', 'Sources/jxlc/**.hpp', 'Headers/**/*.h'
-    s.project_header_files = 'Sources/jxlc/jxl_worker.hpp'
+    s.project_header_files = 'Sources/jxlc/JxlWorker.hpp'
     s.pod_target_xcconfig = {
         'OTHER_CXXFLAGS' => '$(inherited) -std=c++20',
         'HEADER_SEARCH_PATHS' => '$(inherited) "$(PODS_TARGET_SRCROOT)/Sources/Frameworks/libjxl.xcframework/ios-arm64/Headers"',

Sources/jxlc/JxlInternalCoder.mm

@@ -28,8 +28,7 @@
 #import <vector>
 #import "JxlWorker.hpp"
 #import <Accelerate/Accelerate.h>
-#import "RgbRgbaConverter.h"
-#import "RgbScaler.h"
+#import "RgbRgbaConverter.hpp"
 
 static void JXLCGData16ProviderReleaseDataCallback(void *info, const void *data, size_t size) {
     auto dataWrapper = static_cast<JXLDataWrapper<uint16_t>*>(info);

Sources/jxlc/RgbRgbaConverter.h Sources/jxlc/RgbRgbaConverter.hppSources/jxlc/RgbRgbaConverter.h renamed to Sources/jxlc/RgbRgbaConverter.hpp

@@ -26,6 +26,8 @@
 #ifndef RgbRgbaConverter_h
 #define RgbRgbaConverter_h
 
+#ifdef __cplusplus
+
 #import <vector>
 
 @interface RgbRgbaConverter : NSObject
@@ -88,5 +90,7 @@
 +(bool)convertRGBAU8ToRGBU8:(uint8_t*)src dst:(uint8_t*)dst width:(int)width height:(int)height;
 @end
 
+#endif
+
 #endif /* RgbRgbaConverter_h */
 

Sources/jxlc/RgbRgbaConverter.mm

@@ -25,7 +25,9 @@
 
 #import <Foundation/Foundation.h>
 #import "Accelerate/Accelerate.h"
-#import "RgbRgbaConverter.h"
+#import "RgbRgbaConverter.hpp"
+
+#ifdef __cplusplus
 
 @implementation RgbRgbaConverter: NSObject
 
@@ -143,3 +145,4 @@ +(bool)convertRGBAU16ToRGBU16:(uint16_t*)src dst:(uint16_t*)dst width:(int)width
 
 @end
 
+#endif