ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

there is no difference between PixelMode::Split and PixelMode::Direct

Browse Source 
Change-Id: I6b8f588c3ced2a7f9e864d9de67a15f1ad55035a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190863
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Caolán McNamara
2025-09-12 14:47:35 +02:00
parent 75bd7f0945
commit 5de3f31897
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vcl/source/filter/webp/reader.cxx
+2 -18
View File
@@ -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)