From 3862f76940b23525addd5c07df3b829282bd4e4f Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Wed, 13 Apr 2022 21:56:21 +0200
Subject: [PATCH] avif-decoder: Convert directly to RGBA

e3f81a4d4826af82d623d48cf1c6fd72c688df06 introduced a byte swap
conversion from BGRA to RGBA, which can be eliminated if we ask dcp to
convert directly to RGBA.
---
 src/codecs/avif/decoder.rs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/codecs/avif/decoder.rs b/src/codecs/avif/decoder.rs
index 7e9b60689d..7a4c7e9938 100644
--- a/src/codecs/avif/decoder.rs
+++ b/src/codecs/avif/decoder.rs
@@ -112,7 +112,7 @@ impl<'a, R: 'a + Read> ImageDecoder<'a> for AvifDecoder<R> {
                 num_planes: 3,
             };
             let dst_format = dcp::ImageFormat {
-                pixel_format: dcp::PixelFormat::Bgra,
+                pixel_format: dcp::PixelFormat::Rgba,
                 color_space: dcp::ColorSpace::Lrgb,
                 num_planes: 1,
             };
@@ -160,11 +160,6 @@ impl<'a, R: 'a + Read> ImageDecoder<'a> for AvifDecoder<R> {
             }
         }
 
-        // Convert Bgra to Rgba
-        for chunk in buf.chunks_exact_mut(4) {
-            chunk.swap(0, 2);
-        }
-
         Ok(())
     }
 }