commit 247e20df1bca3ec55beede9a0c2041465e1ca9a5
author Wan-Teh Chang <wtc@google.com> Thu May 18 16:08:45 2023 -0700
committer Wan-Teh Chang <wtc@google.com> Fri May 19 09:12:42 2023 -0700
tree d047afad83a8ebbc409521f2aa072f8f570c6201
parent ddd241470be14bcde122ff52128602eb0383ea69

Fix a retval of avifDecoderGenerateImageGridTiles

avifDecoderGenerateImageGridTiles returns avifBool. Change a return
value of AVIF_RESULT_BMFF_PARSE_FAILED (copied from a function that
returns avifResult) to AVIF_FALSE.

Also move an if statement into an "else" block.

src/read.c

diff --git a/src/read.c b/src/read.c
index 4cc1b30..091b405 100644
--- a/src/read.c
+++ b/src/read.c
@@ -1401,9 +1401,7 @@
                     decoder->imageCount = tile->input->samples.count;
                 }
             }
-        }
-
-        if (memcmp(item->type, firstTileItem->type, 4)) {
+        } else if (memcmp(item->type, firstTileItem->type, 4)) {
             // MIAF (ISO 23000-22:2019), Section 7.3.11.4.1:
             //   All input images of a grid image item shall use the same coding format [...]
             // The coding format is defined by the item type.
@@ -1412,7 +1410,7 @@
                                   item->id,
                                   (const char *)item->type,
                                   (const char *)firstTileItem->type);
-            return AVIF_RESULT_BMFF_PARSE_FAILED;
+            return AVIF_FALSE;
         }
         ++tilesAvailable;
     }