Upgrade the dependency libavif to 0.1.3

dreampiggy · May 1, 2019 · 9cafb36 · 9cafb36
1 parent c180313
commit 9cafb36
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 29 deletions.
diff --git a/AVIFQuickLook/Info.plist b/AVIFQuickLook/Info.plist
@@ -57,29 +57,29 @@
 	<false/>
 	<key>QLThumbnailMinimumSize</key>
 	<real>17</real>
-    <key>UTImportedTypeDeclarations</key>
-    <array>
-        <dict>
-            <key>UTTypeConformsTo</key>
-            <array>
-                <string>public.image</string>
-            </array>
-            <key>UTTypeDescription</key>
-            <string>AVIF image</string>
-            <key>UTTypeIdentifier</key>
-            <string>public.avif</string>
-            <key>UTTypeReferenceURL</key>
-            <string>https://aomediacodec.github.io/av1-avif/</string>
-            <key>UTTypeTagSpecification</key>
-            <dict>
-                <key>public.filename-extension</key>
-                <array>
-                    <string>avif</string>
-                </array>
-                <key>public.mime-type</key>
-                <string>image/avif</string>
-            </dict>
-        </dict>
-    </array>
+	<key>UTImportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.image</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>AVIF Image</string>
+			<key>UTTypeIdentifier</key>
+			<string>public.avif</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://aomediacodec.github.io/av1-avif/</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>avif</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>image/avif</string>
+			</dict>
+		</dict>
+	</array>
 </dict>
 </plist>
diff --git a/App/AVIF.app/Contents/Info.plist b/App/AVIF.app/Contents/Info.plist
@@ -56,7 +56,7 @@
 		<key>bundleDividerCollapsed</key>
 		<true/>
 		<key>bundlePositionOfDivider</key>
-		<real>0.0</real>
+		<real>0</real>
 		<key>dividerCollapsed</key>
 		<false/>
 		<key>eventLogLevel</key>
@@ -78,7 +78,31 @@
 				<string>public.image</string>
 			</array>
 			<key>UTTypeDescription</key>
-			<string>AVIF image</string>
+			<string>AVIF Image</string>
+			<key>UTTypeIdentifier</key>
+			<string>public.avif</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://aomediacodec.github.io/av1-avif/</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>avif</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>image/avif</string>
+			</dict>
+		</dict>
+	</array>
+	<key>UTImportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.image</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>AVIF Image</string>
 			<key>UTTypeIdentifier</key>
 			<string>public.avif</string>
 			<key>UTTypeReferenceURL</key>

diff --git a/Dependency/include/avif/avif.h b/Dependency/include/avif/avif.h
@@ -16,7 +16,7 @@ extern "C" {
 
 #define AVIF_VERSION_MAJOR 0
 #define AVIF_VERSION_MINOR 1
-#define AVIF_VERSION_PATCH 0
+#define AVIF_VERSION_PATCH 3
 #define AVIF_VERSION (AVIF_VERSION_MAJOR * 10000) + (AVIF_VERSION_MINOR * 100) + AVIF_VERSION_PATCH
 
 typedef int avifBool;
@@ -55,7 +55,7 @@ enum avifChannelIndex
 // ---------------------------------------------------------------------------
 // Utils
 
-const char * avifVersion();
+const char * avifVersion(void);
 
 // Yes, clamp macros are nasty. Do not use them.
 #define AVIF_CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
@@ -170,12 +170,14 @@ typedef enum avifNclxColourPrimaries
     AVIF_NCLX_COLOUR_PRIMARIES_XYZ = 10,
     AVIF_NCLX_COLOUR_PRIMARIES_ST428 = 10,
     AVIF_NCLX_COLOUR_PRIMARIES_RP431_2 = 11,
-    AVIF_NCLX_COLOUR_PRIMARIES_RP432_1 = 12,
+    AVIF_NCLX_COLOUR_PRIMARIES_EG432_1 = 12,
+    AVIF_NCLX_COLOUR_PRIMARIES_P3 = 12,
     AVIF_NCLX_COLOUR_PRIMARIES_EBU3213E = 22
 } avifNclxColourPrimaries;
 
 // outPrimaries: rX, rY, gX, gY, bX, bY, wX, wY
 void avifNclxColourPrimariesGetValues(avifNclxColourPrimaries ancp, float outPrimaries[8]);
+avifNclxColourPrimaries avifNclxColourPrimariesFind(float inPrimaries[8], const char ** outName);
 
 typedef enum avifNclxTransferCharacteristics
 {
@@ -225,6 +227,8 @@ typedef enum avifNclxMatrixCoefficients
     AVIF_NCLX_MATRIX_COEFFICIENTS_BT2100 = 9,
     AVIF_NCLX_MATRIX_COEFFICIENTS_BT2020_CL = 10,
     AVIF_NCLX_MATRIX_COEFFICIENTS_ST2085 = 11,
+    AVIF_NCLX_MATRIX_COEFFICIENTS_CHROMA_DERIVED_NCL = 12,
+    AVIF_NCLX_MATRIX_COEFFICIENTS_CHROMA_DERIVED_CL = 13,
     AVIF_NCLX_MATRIX_COEFFICIENTS_ICTCP = 14
 } avifNclxMatrixCoefficients;
 

diff --git a/Dependency/lib/libavif.a b/Dependency/lib/libavif.a