Merge pull request #23 from SDWebImage/project_fix_avif_0.8

Fix the compatible with libavif 0.8+ version

Author: dreampiggy

Cartfile

@@ -1,2 +1,2 @@
 github "SDWebImage/SDWebImage" ~> 5.0
-github "SDWebImage/libavif-Xcode" >= 0.7.2
+github "SDWebImage/libavif-Xcode" >= 0.8

Example/Podfile

@@ -1,4 +1,4 @@
-#use_frameworks!
+install! 'cocoapods', :generate_multiple_pod_projects => true
 
 target 'SDWebImageAVIFCoder_Example' do
   platform :ios, '8.0'
@@ -7,8 +7,6 @@ target 'SDWebImageAVIFCoder_Example' do
 
   target 'SDWebImageAVIFCoder_Tests' do
     inherit! :search_paths
-
-    
   end
 end
 

Example/SDWebImageAVIFCoder.xcodeproj/xcshareddata/xcschemes/SDWebImageAVIFCoder_Tests.xcscheme

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1200"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6003F5AD195388D20070C39A"
+               BuildableName = "SDWebImageAVIFCoder_Tests.xctest"
+               BlueprintName = "SDWebImageAVIFCoder_Tests"
+               ReferencedContainer = "container:SDWebImageAVIFCoder.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Example/Tests/Tests.m

@@ -27,8 +27,8 @@
 static UInt16 kBlue16[] = {0,0,65535};
 static UInt16 kSpecial16[] = {0xe4 << 8,0x7a << 8,0x8c << 8};
 
-static avifNclxColourPrimaries const kNumPrimaries = AVIF_NCLX_COLOUR_PRIMARIES_EBU3213;
-static avifNclxTransferCharacteristics const kNumTransfers = AVIF_NCLX_TRANSFER_CHARACTERISTICS_HLG;
+static avifColorPrimaries const kNumPrimaries = AVIF_COLOR_PRIMARIES_EBU3213;
+static avifTransferCharacteristics const kNumTransfers = AVIF_TRANSFER_CHARACTERISTICS_HLG;
 
 
 // FIXME(ledyba-z): libavif does not respect MatrixCoefficients in AV1 Sequence Header.
@@ -160,8 +160,8 @@ - (void)testSpecialTest
 
 -(void)testAllColorSpaceSupportsOutput
 {
-    for(avifNclxColourPrimaries primaries = 0; primaries < kNumPrimaries; ++primaries) {
-        for(avifNclxTransferCharacteristics transfer = 0; transfer < kNumTransfers; ++transfer) {
+    for(avifColorPrimaries primaries = 0; primaries < kNumPrimaries; ++primaries) {
+        for(avifTransferCharacteristics transfer = 0; transfer < kNumTransfers; ++transfer) {
             CGColorSpaceRef space = NULL;
 
             space = SDAVIFCreateColorSpaceRGB(primaries, transfer);
@@ -179,12 +179,10 @@ -(void)testAllColorSpaceSupportsOutput
 -(void)testCalcNCLXColorSpaceFromAVIFImage
 {
     avifImage* img = avifImageCreate(100, 100, 8, AVIF_PIXEL_FORMAT_YUV420);
-    for(avifNclxColourPrimaries primaries = 0; primaries < kNumPrimaries; ++primaries) {
-        for(avifNclxTransferCharacteristics transfer = 0; transfer < kNumTransfers; ++transfer) {
-            avifNclxColorProfile nclx;
-            nclx.colourPrimaries = primaries;
-            nclx.transferCharacteristics = transfer;
-            avifImageSetProfileNCLX(img, &nclx);
+    for(avifColorPrimaries primaries = 0; primaries < kNumPrimaries; ++primaries) {
+        for(avifTransferCharacteristics transfer = 0; transfer < kNumTransfers; ++transfer) {
+            img->colorPrimaries = primaries;
+            img->transferCharacteristics = transfer;
             avifImageAllocatePlanes(img, AVIF_PLANES_YUV);
 
             CGColorSpaceRef space = NULL;

Package.swift

@@ -18,7 +18,7 @@ let package = Package(
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
         .package(url: "https://github.com/SDWebImage/SDWebImage.git", from: "5.1.0"),
-        .package(url: "https://github.com/SDWebImage/libavif-Xcode.git", from: "0.7.2")
+        .package(url: "https://github.com/SDWebImage/libavif-Xcode.git", from: "0.8.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

SDWebImageAVIFCoder.podspec

@@ -37,5 +37,5 @@ Which is built based on the open-sourced libavif codec.
   s.private_header_files = 'SDWebImageAVIFCoder/Classes/Private/*.{h,m}'
 
   s.dependency 'SDWebImage', '~> 5.0'
-  s.dependency 'libavif', '>= 0.7.2'
+  s.dependency 'libavif', '>= 0.8'
 end