diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-04-22 14:52:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-04-22 21:24:17 +0200 |
| commit | c503b6eef32055f75dc9cf761bd20eda4f161dd4 (patch) | |
| tree | 4096cea4df83170353188fc2a7d296d0df464f6d | |
| parent | 5740d3fa83e9725a2771e5f00ba4aaf9965f0be2 (diff) | |
tdf#160431 Inverts webp file image when inserted
regression from
commit 81994cb2b8b32453a92bcb011830fcb884f22ff3
Author: Noel Grandin <noelgrandin@gmail.com>
Date: Fri Apr 16 20:33:10 2021 +0200
Convert internal vcl bitmap formats transparency->alpha (II)
Change-Id: I3b2959c99a2e18c3972920f8ca86072566d54225
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166450
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx | 12 | ||||
| -rw-r--r-- | vcl/source/filter/webp/reader.cxx | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx index d3c43f48191f..cbc23315ca30 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx @@ -141,10 +141,10 @@ void WebpFilterTest::testRoundtrip(bool lossy) } AlphaMask tmpAlpha = aResultBitmap.GetAlphaMask(); BitmapScopedReadAccess pAccessAlpha(tmpAlpha); - CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), pAccessAlpha->GetPixelIndex(0, 0)); - CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), pAccessAlpha->GetPixelIndex(0, 19)); - CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), pAccessAlpha->GetPixelIndex(19, 0)); - CPPUNIT_ASSERT_EQUAL(sal_uInt8(64), pAccessAlpha->GetPixelIndex(19, 19)); + CPPUNIT_ASSERT_EQUAL(sal_uInt8(255), pAccessAlpha->GetPixelIndex(0, 0)); + CPPUNIT_ASSERT_EQUAL(sal_uInt8(255), pAccessAlpha->GetPixelIndex(0, 19)); + CPPUNIT_ASSERT_EQUAL(sal_uInt8(255), pAccessAlpha->GetPixelIndex(19, 0)); + CPPUNIT_ASSERT_EQUAL(sal_uInt8(191), pAccessAlpha->GetPixelIndex(19, 19)); } aStream.Seek(STREAM_SEEK_TO_BEGIN); @@ -192,8 +192,8 @@ void WebpFilterTest::testRead(std::u16string_view rName, bool lossy, bool alpha) { AlphaMask tmpAlpha = aResultBitmap.GetAlphaMask(); BitmapScopedReadAccess pAccessAlpha(tmpAlpha); - CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), pAccessAlpha->GetPixelIndex(0, 0)); - CPPUNIT_ASSERT_EQUAL(sal_uInt8(255), pAccessAlpha->GetPixelIndex(0, 9)); + CPPUNIT_ASSERT_EQUAL(sal_uInt8(255), pAccessAlpha->GetPixelIndex(0, 0)); + CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), pAccessAlpha->GetPixelIndex(0, 9)); } } } diff --git a/vcl/source/filter/webp/reader.cxx b/vcl/source/filter/webp/reader.cxx index 61af0d3c0241..a5ff3aaca916 100644 --- a/vcl/source/filter/webp/reader.cxx +++ b/vcl/source/filter/webp/reader.cxx @@ -241,7 +241,7 @@ static bool readWebp(SvStream& stream, Graphic& graphic) for (tools::Long x = 0; x < access->Width(); ++x) { memcpy(dstB, src, 3); - *dstA = 255 - *(src + 3); + *dstA = *(src + 3); src += 4; dstB += 3; dstA += 1; @@ -273,7 +273,7 @@ static bool readWebp(SvStream& stream, Graphic& graphic) for (tools::Long x = 0; x < accessAlpha->Width(); ++x) { sal_uInt8 a = src[3]; - accessAlpha->SetPixelIndex(y, x, 255 - a); + accessAlpha->SetPixelIndex(y, x, a); src += 4; } } |