commit 94352e0e203aaeec8427882c66f37f75d7391139
author Vincent Rabaud <vrabaud@users.noreply.github.com> Fri May 12 13:55:28 2023 +0200
committer GitHub <noreply@github.com> Fri May 12 13:55:28 2023 +0200
tree b2ec5cdf22c314fa1647e2bd5aebd9e8f412dd8f
parent d78c0db95b1afe85a66b41c066f8327165a8d567

Fix YCgCo-Re error in avifPNGWrite()

apps/shared/avifpng.c

diff --git a/apps/shared/avifpng.c b/apps/shared/avifpng.c
index bb18ebc..3b00618 100644
--- a/apps/shared/avifpng.c
+++ b/apps/shared/avifpng.c
@@ -426,7 +426,11 @@
         goto cleanup;
     }
     if (avif->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO_RE) {
-        if (avif->depth != 10 || (requestedDepth && requestedDepth != 8)) {
+        if (avif->depth != 10) {
+            fprintf(stderr, "avif->depth must be 10 bits and not %u.\n", avif->depth);
+            goto cleanup;
+        }
+        if (requestedDepth && requestedDepth != 8) {
             fprintf(stderr, "Cannot request %u bits for YCgCo-Re as it only works for 8 bits.\n", requestedDepth);
             goto cleanup;
         }

src/reformat.c

diff --git a/src/reformat.c b/src/reformat.c
index a8e8441..7a24fce 100644
--- a/src/reformat.c
+++ b/src/reformat.c
@@ -336,9 +336,9 @@
 #if defined(AVIF_ENABLE_EXPERIMENTAL_YCGCO_R)
                         } else if (state.mode == AVIF_REFORMAT_MODE_YCGCO_RE || state.mode == AVIF_REFORMAT_MODE_YCGCO_RO) {
                             // Formulas from JVET-U0093.
-                            const int R = (int)avifRoundf(AVIF_CLAMP(rgbPixel[0] * rgbMaxChannelF, 0.f, rgbMaxChannelF));
-                            const int G = (int)avifRoundf(AVIF_CLAMP(rgbPixel[1] * rgbMaxChannelF, 0.f, rgbMaxChannelF));
-                            const int B = (int)avifRoundf(AVIF_CLAMP(rgbPixel[2] * rgbMaxChannelF, 0.f, rgbMaxChannelF));
+                            const int R = (int)avifRoundf(AVIF_CLAMP(rgbPixel[0] * rgbMaxChannelF, 0.0f, rgbMaxChannelF));
+                            const int G = (int)avifRoundf(AVIF_CLAMP(rgbPixel[1] * rgbMaxChannelF, 0.0f, rgbMaxChannelF));
+                            const int B = (int)avifRoundf(AVIF_CLAMP(rgbPixel[2] * rgbMaxChannelF, 0.0f, rgbMaxChannelF));
                             const int Co = R - B;
                             const int t = B + (Co >> 1);
                             const int Cg = G - t;