vcl/source/filter/webp/reader.cxx | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
New commits:
commit 5de3f31897d3514bb79aafecb14526e8592f1179
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Sep 12 09:50:33 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Sep 12 14:47:35 2025 +0200
there is no difference between PixelMode::Split and PixelMode::Direct
Change-Id: I6b8f588c3ced2a7f9e864d9de67a15f1ad55035a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190863
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/vcl/source/filter/webp/reader.cxx
b/vcl/source/filter/webp/reader.cxx
index 59267e959805..07454f96b8bd 100644
--- a/vcl/source/filter/webp/reader.cxx
+++ b/vcl/source/filter/webp/reader.cxx
@@ -86,7 +86,6 @@ static bool readWebp(SvStream& stream, Graphic& graphic)
enum class PixelMode
{
DirectRead, // read data directly to the bitmap
- Split, // read to tmp buffer and split to rgb and alpha
SetPixel // read to tmp buffer and use setPixel()
};
PixelMode pixelMode = PixelMode::SetPixel;
@@ -100,11 +99,11 @@ static bool readWebp(SvStream& stream, Graphic& graphic)
{
case ScanlineFormat::N24BitTcRgb:
config.output.colorspace = MODE_RGBA;
- pixelMode = PixelMode::Split;
+ pixelMode = PixelMode::DirectRead;
break;
case ScanlineFormat::N24BitTcBgr:
config.output.colorspace = MODE_BGRA;
- pixelMode = PixelMode::Split;
+ pixelMode = PixelMode::DirectRead;
break;
default:
config.output.colorspace = MODE_RGBA;
@@ -194,21 +193,6 @@ static bool readWebp(SvStream& stream, Graphic& graphic)
}
break;
}
- case PixelMode::Split:
- {
- for (tools::Long y = 0, nHeight = access->Height(); y < nHeight;
++y)
- {
- const unsigned char* src = tmpRgbaData.data() + width * 4 * y;
- unsigned char* dst = access->GetScanline(y);
- for (tools::Long x = 0, nWidth = access->Width(); x < nWidth;
++x)
- {
- memcpy(dst, src, 4);
- src += 4;
- dst += 4;
- }
- }
- break;
- }
case PixelMode::SetPixel:
{
for (tools::Long y = 0, nHeight = access->Height(); y < nHeight;
++y)
