commit ab8d9a51cb82a7a8a4fdc71f7749f0b6bd8fa864
author Wan-Teh Chang <wtc@google.com> Wed Aug 12 17:17:37 2020 -0700
committer Joe Drago <joedrago@gmail.com> Wed Aug 12 18:04:17 2020 -0700
tree 0322c01e6861b094922a4ab2f779f02732f2db3b
parent 272aafe446a35d8686052c0bec8d52b48dc983f6

Check for grid images consistently

If an image is a grid image, the grid's rows and columns are both
nonzero. Therefore, the check
    (grid.rows > 0) && (grid.columns > 0)
and the check
    (grid.rows > 0) || (grid.columns > 0)
are equivalent. Standardize on the first form, which is the prevalent
style in libavif.

src/read.c

diff --git a/src/read.c b/src/read.c
index 5d8eb43..0cfe4c4 100644
--- a/src/read.c
+++ b/src/read.c
@@ -2462,7 +2462,7 @@
         return AVIF_RESULT_UNKNOWN_ERROR;
     }
 
-    if ((decoder->data->colorGrid.rows > 0) || (decoder->data->colorGrid.columns > 0)) {
+    if ((decoder->data->colorGrid.rows > 0) && (decoder->data->colorGrid.columns > 0)) {
         if (!avifDecoderDataFillImageGrid(
                 decoder->data, &decoder->data->colorGrid, decoder->image, 0, decoder->data->colorTileCount, AVIF_FALSE)) {
             return AVIF_RESULT_INVALID_IMAGE_GRID;
@@ -2498,7 +2498,7 @@
         avifImageStealPlanes(decoder->image, srcColor, AVIF_PLANES_YUV);
     }
 
-    if ((decoder->data->alphaGrid.rows > 0) || (decoder->data->alphaGrid.columns > 0)) {
+    if ((decoder->data->alphaGrid.rows > 0) && (decoder->data->alphaGrid.columns > 0)) {
         if (!avifDecoderDataFillImageGrid(
                 decoder->data, &decoder->data->alphaGrid, decoder->image, decoder->data->colorTileCount, decoder->data->alphaTileCount, AVIF_TRUE)) {
             return AVIF_RESULT_INVALID_IMAGE_GRID;