commit 2b7f04e95b56fc91b4428221d6e457e33ba2e05d
author Wan-Teh Chang <wtc@google.com> Mon Dec 14 09:51:01 2020 -0800
committer Joe Drago <joedrago@gmail.com> Mon Dec 14 10:02:31 2020 -0800
tree 6590e4a58326c0719b449217931991715250eb93
parent f3dd8f608471492226d97825bca2d61c606eabc4

Fix -Wmissing-prototypes and -Wcast-qual warnings

Add 'static' to function signatures of avifImageSplitGrid() and
avifEncoderFindExistingChunk(). This fix was suggested by Pascal
Massimino.

Change the type of the cellImages parameter of avifEncoderAddImageGrid()
from:
    const avifImage ** cellImages
to
    const avifImage * const * cellImages
so that we can cast a avifImage ** pointer to the new type without the
-Wcast-qual warning. This fix was suggested by Yuan Tong.

Fix https://crbug.com/oss-fuzz/28622.

src/write.c

diff --git a/src/write.c b/src/write.c
index a6c3671..f45afcd 100644
--- a/src/write.c
+++ b/src/write.c
@@ -382,7 +382,7 @@
 static avifResult avifEncoderAddImageInternal(avifEncoder * encoder,
                                               uint8_t gridCols,
                                               uint8_t gridRows,
-                                              const avifImage ** cellImages,
+                                              const avifImage * const * cellImages,
                                               uint64_t durationInTimescales,
                                               uint32_t addImageFlags)
 {
@@ -626,13 +626,13 @@
     return avifEncoderAddImageInternal(encoder, 1, 1, &image, durationInTimescales, addImageFlags);
 }
 
-avifResult avifEncoderAddImageGrid(avifEncoder * encoder, uint8_t gridCols, uint8_t gridRows, const avifImage ** cellImages, uint32_t addImageFlags)
+avifResult avifEncoderAddImageGrid(avifEncoder * encoder, uint8_t gridCols, uint8_t gridRows, const avifImage * const * cellImages, uint32_t addImageFlags)
 {
     return avifEncoderAddImageInternal(
         encoder, gridCols, gridRows, cellImages, 1, addImageFlags | AVIF_ADD_IMAGE_FLAG_SINGLE); // only single image grids are supported
 }
 
-size_t avifEncoderFindExistingChunk(avifRWStream * s, size_t mdatStartOffset, const uint8_t * data, size_t size)
+static size_t avifEncoderFindExistingChunk(avifRWStream * s, size_t mdatStartOffset, const uint8_t * data, size_t size)
 {
     const size_t mdatCurrentOffset = avifRWStreamOffset(s);
     const size_t mdatSearchSize = mdatCurrentOffset - mdatStartOffset;