commit 25b0f65f51f9142b3373fa7f668a4d96df0947e1
author Wan-Teh Chang <wtc@google.com> Mon Jul 22 15:44:58 2024 -0700
committer Wan-Teh Chang <wtc@google.com> Mon Jul 22 19:48:30 2024 -0700
tree 3f71ee3adbdcbcb302ab20583b068d5f76a82f00
parent d8f09df4d34067b4d841612167e5910bfb3f92b3

Revert "Move gainmap function definitions to gainmap.c"

This reverts commit 4a4ff640088063fdf0d33164f6aa380777492f5a.

The code that was originally in src/gainmap.c is not used by Chrome.
With this commit, Chrome will need to include src/gainmap.c, which in
turn requires src/colrconvert.c.

Let's try again to figure out the reason for the strange unresolved
symbol linker error in a shared library build on Windows, and fix it
properly.

src/avif.c

diff --git a/src/avif.c b/src/avif.c
index 24fca74..00dc4c8 100644
--- a/src/avif.c
+++ b/src/avif.c
@@ -1163,3 +1163,29 @@
         append(&writePos, &remainingLen, availableCodecs[i].version());
     }
 }
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+avifGainMap * avifGainMapCreate(void)
+{
+    avifGainMap * gainMap = (avifGainMap *)avifAlloc(sizeof(avifGainMap));
+    if (!gainMap) {
+        return NULL;
+    }
+    memset(gainMap, 0, sizeof(avifGainMap));
+    gainMap->altColorPrimaries = AVIF_COLOR_PRIMARIES_UNSPECIFIED;
+    gainMap->altTransferCharacteristics = AVIF_TRANSFER_CHARACTERISTICS_UNSPECIFIED;
+    gainMap->altMatrixCoefficients = AVIF_MATRIX_COEFFICIENTS_UNSPECIFIED;
+    gainMap->altYUVRange = AVIF_RANGE_FULL;
+    gainMap->metadata.useBaseColorSpace = AVIF_TRUE;
+    return gainMap;
+}
+
+void avifGainMapDestroy(avifGainMap * gainMap)
+{
+    if (gainMap->image) {
+        avifImageDestroy(gainMap->image);
+    }
+    avifRWDataFree(&gainMap->altICC);
+    avifFree(gainMap);
+}
+#endif // AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP

src/gainmap.c

diff --git a/src/gainmap.c b/src/gainmap.c
index 6c0ec06..782719f 100644
--- a/src/gainmap.c
+++ b/src/gainmap.c
@@ -9,30 +9,6 @@
 
 #if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
 
-avifGainMap * avifGainMapCreate(void)
-{
-    avifGainMap * gainMap = (avifGainMap *)avifAlloc(sizeof(avifGainMap));
-    if (!gainMap) {
-        return NULL;
-    }
-    memset(gainMap, 0, sizeof(avifGainMap));
-    gainMap->altColorPrimaries = AVIF_COLOR_PRIMARIES_UNSPECIFIED;
-    gainMap->altTransferCharacteristics = AVIF_TRANSFER_CHARACTERISTICS_UNSPECIFIED;
-    gainMap->altMatrixCoefficients = AVIF_MATRIX_COEFFICIENTS_UNSPECIFIED;
-    gainMap->altYUVRange = AVIF_RANGE_FULL;
-    gainMap->metadata.useBaseColorSpace = AVIF_TRUE;
-    return gainMap;
-}
-
-void avifGainMapDestroy(avifGainMap * gainMap)
-{
-    if (gainMap->image) {
-        avifImageDestroy(gainMap->image);
-    }
-    avifRWDataFree(&gainMap->altICC);
-    avifFree(gainMap);
-}
-
 avifBool avifGainMapMetadataDoubleToFractions(avifGainMapMetadata * dst, const avifGainMapMetadataDouble * src)
 {
     AVIF_CHECK(dst != NULL && src != NULL);