commit 7a084710fae7ebe78c6c437df746b39ab90ef977
author Wan-Teh Chang <wtc@google.com> Wed Aug 17 11:07:25 2022 -0700
committer Wan-Teh Chang <wtc@google.com> Wed Aug 17 12:23:08 2022 -0700
tree 313c8e3c9da290afb6a52c50e368f18f44744ec8
parent 7ee3c4c51a9829cdd890945703893bd1cb098a94

Fix Clang and GCC -Wswitch-enum warnings

-Wswitch-enum warns about unhandled enum values in switch statements
even when the switch statements have a default case.

MSVC also warns about this when /Wall is specified. Since we compile
with MSVC's /Wall option on Windows, this pull request is a prerequisite
for https://github.com/AOMediaCodec/libavif/pull/1011.

src/codec_rav1e.c

diff --git a/src/codec_rav1e.c b/src/codec_rav1e.c
index 438ff5e..e9ed443 100644
--- a/src/codec_rav1e.c
+++ b/src/codec_rav1e.c
@@ -90,6 +90,7 @@
                     codec->internal->yShift = 1;
                     break;
                 case AVIF_PIXEL_FORMAT_NONE:
+                case AVIF_PIXEL_FORMAT_COUNT:
                 default:
                     return AVIF_RESULT_UNKNOWN_ERROR;
             }

src/codec_svt.c

diff --git a/src/codec_svt.c b/src/codec_svt.c
index cf50778..f6aefde 100644
--- a/src/codec_svt.c
+++ b/src/codec_svt.c
@@ -74,6 +74,7 @@
                 break;
             case AVIF_PIXEL_FORMAT_YUV400:
             case AVIF_PIXEL_FORMAT_NONE:
+            case AVIF_PIXEL_FORMAT_COUNT:
             default:
                 return AVIF_RESULT_UNKNOWN_ERROR;
         }

tests/gtest/aviftest_helpers.cc

diff --git a/tests/gtest/aviftest_helpers.cc b/tests/gtest/aviftest_helpers.cc
index cdcafc4..3c4e1dc 100644
--- a/tests/gtest/aviftest_helpers.cc
+++ b/tests/gtest/aviftest_helpers.cc
@@ -40,9 +40,12 @@
       return {/*r=*/2, /*g=*/1, /*b=*/0, /*a=*/0};
     case AVIF_RGB_FORMAT_BGRA:
       return {/*r=*/2, /*g=*/1, /*b=*/0, /*a=*/3};
-    default:
-      assert(format == AVIF_RGB_FORMAT_ABGR);
+    case AVIF_RGB_FORMAT_ABGR:
       return {/*r=*/3, /*g=*/2, /*b=*/1, /*a=*/0};
+    case AVIF_RGB_FORMAT_RGB_565:
+    case AVIF_RGB_FORMAT_COUNT:
+    default:
+      return {/*r=*/0, /*g=*/0, /*b=*/0, /*a=*/0};
   }
 }