avifmetadatatest: don't include avif/internal.h
avifmetadatatest can only call public functions because it may be linked
with the libavif shared library (when BUILD_SHARED_LIBS is set to ON).
Replace the call to the internal function
avifImageExtractExifOrientationToIrotImir() with a call to the public
function avifImageSetMetadataExif(), and include avif/avif.h instead of
avif/internal.h.
Fix https://github.com/AOMediaCodec/libavif/issues/1162.
diff --git a/tests/gtest/avifmetadatatest.cc b/tests/gtest/avifmetadatatest.cc
index f7fb8fd..6b3300c 100644
--- a/tests/gtest/avifmetadatatest.cc
+++ b/tests/gtest/avifmetadatatest.cc
@@ -4,7 +4,7 @@
#include <array>
#include <tuple>
-#include "avif/internal.h"
+#include "avif/avif.h"
#include "aviftest_helpers.h"
#include "gtest/gtest.h"
@@ -305,12 +305,18 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // tag, type, count, valueOffset
0, 0, 0, 8 // Invalid IFD offset, infinitely looping back to 0th IFD.
};
- avifRWDataSet(&image->exif, kBadExifPayload,
- sizeof(kBadExifPayload) / sizeof(kBadExifPayload[0]));
- // avifImageExtractExifOrientationToIrotImir() does not verify the whole
- // payload, only the parts necessary to extract Exif orientation.
- ASSERT_EQ(avifImageExtractExifOrientationToIrotImir(image.get()),
- AVIF_RESULT_OK);
+ // avifImageSetMetadataExif() calls
+ // avifImageExtractExifOrientationToIrotImir() internally.
+ // The avifImageExtractExifOrientationToIrotImir() call should not enter an
+ // infinite loop.
+ //
+ // TODO(wtc): When we change avifImageSetMetadataExif() to return avifResult,
+ // assert that the avifImageSetMetadataExif() call returns AVIF_RESULT_OK
+ // because avifImageExtractExifOrientationToIrotImir() does not verify the
+ // whole payload, only the parts necessary to extract Exif orientation.
+ avifImageSetMetadataExif(
+ image.get(), kBadExifPayload,
+ sizeof(kBadExifPayload) / sizeof(kBadExifPayload[0]));
}
//------------------------------------------------------------------------------
