commit 4a4ff640088063fdf0d33164f6aa380777492f5a
author Wan-Teh Chang <wtc@google.com> Mon Jul 22 10:58:08 2024 -0700
committer Wan-Teh Chang <wtc@google.com> Mon Jul 22 11:54:16 2024 -0700
tree aae31038c60cee6b84571f699555220aa293997a
parent 03acd65314fe29e6627cf4eab752819f6ee15d74

Move gainmap function definitions to gainmap.c

Move two gainmap function definitions (avifGainMapCreate and
avifGainMapDestroy).

This is a good change on its own, but the reason I wanted to move them
is to work around a strange unresolved symbol linker error on Windows if
I enable -DBUILD_SHARED_LIBS=ON in ci-windows-installed.yml:

  avif_apps_internal.lib(avifjpeg.c.obj) : error LNK2019: unresolved
  external symbol __imp_avifGainMapMetadataDoubleToFractions referenced
  in function avifJPEGParseGainMapXMPProperties

  tests\avif16bittest.exe : fatal error LNK1120: 1 unresolved externals

See https://github.com/AOMediaCodec/libavif/actions/runs/10046011390.

I have debugged this for a long time but haven't found what is wrong. I
also cannot reproduce this unresolved symbol linker error locally.

src/avif.c

diff --git a/src/avif.c b/src/avif.c
index 00dc4c8..24fca74 100644
--- a/src/avif.c
+++ b/src/avif.c
@@ -1163,29 +1163,3 @@
         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 782719f..6c0ec06 100644
--- a/src/gainmap.c
+++ b/src/gainmap.c
@@ -9,6 +9,30 @@
 
 #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);