Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 252 insertions, 0 deletions

diff --git a/vcl/qa/cppunit/png/PngFilterTest.cxx b/vcl/qa/cppunit/png/PngFilterTest.cxx
new file mode 100644
index 000000000..c167c4c9c
--- /dev/null
+++ b/vcl/qa/cppunit/png/PngFilterTest.cxx
@@ -0,0 +1,252 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <sal/config.h>
+
+#include <string_view>
+
+#include <test/bootstrapfixture.hxx>
+#include <tools/stream.hxx>
+#include <vcl/filter/PngImageReader.hxx>
+#include <vcl/BitmapReadAccess.hxx>
+#include <vcl/alpha.hxx>
+#include <vcl/graphicfilter.hxx>
+
+using namespace css;
+
+class PngFilterTest : public test::BootstrapFixture
+{
+    OUString maDataUrl;
+
+    OUString getFullUrl(std::u16string_view sFileName)
+    {
+        return m_directories.getURLFromSrc(maDataUrl) + sFileName;
+    }
+
+public:
+    PngFilterTest()
+        : BootstrapFixture(true, false)
+        , maDataUrl("/vcl/qa/cppunit/png/data/")
+    {
+    }
+
+    void testPng();
+    void testMsGifInPng();
+
+    CPPUNIT_TEST_SUITE(PngFilterTest);
+    CPPUNIT_TEST(testPng);
+    CPPUNIT_TEST(testMsGifInPng);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+void PngFilterTest::testPng()
+{
+    for (const OUString& aFileName : { OUString("rect-1bit-pal.png") })
+    {
+        SvFileStream aFileStream(getFullUrl(aFileName), StreamMode::READ);
+
+        vcl::PngImageReader aPngReader(aFileStream);
+        BitmapEx aBitmapEx;
+        aPngReader.read(aBitmapEx);
+
+        Bitmap aBitmap = aBitmapEx.GetBitmap();
+        {
+            Bitmap::ScopedReadAccess pAccess(aBitmap);
+            CPPUNIT_ASSERT_EQUAL(tools::Long(4), pAccess->Width());
+            CPPUNIT_ASSERT_EQUAL(tools::Long(4), pAccess->Height());
+
+            if (pAccess->GetBitCount() == 24 || pAccess->GetBitCount() == 32)
+            {
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00),
+                                     pAccess->GetPixel(0, 0));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00),
+                                     pAccess->GetPixel(3, 3));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00),
+                                     pAccess->GetPixel(3, 0));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00),
+                                     pAccess->GetPixel(0, 3));
+
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0x00, 0x00),
+                                     pAccess->GetPixel(1, 1));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0x00, 0x00),
+                                     pAccess->GetPixel(1, 2));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0x00, 0x00),
+                                     pAccess->GetPixel(2, 1));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0x00, 0x00),
+                                     pAccess->GetPixel(2, 2));
+            }
+            else
+            {
+                CPPUNIT_ASSERT_MESSAGE("Bitmap is not 24 or 32 bit.", false);
+            }
+        }
+    }
+
+    OUString aFilenames[] = {
+        OUString("color-rect-8bit-RGB.png"),
+        OUString("color-rect-8bit-RGB-interlaced.png"),
+        OUString("color-rect-4bit-pal.png"),
+    };
+
+    for (const OUString& aFileName : aFilenames)
+    {
+        SvFileStream aFileStream(getFullUrl(aFileName), StreamMode::READ);
+
+        vcl::PngImageReader aPngReader(aFileStream);
+        BitmapEx aBitmapEx;
+        aPngReader.read(aBitmapEx);
+
+        Bitmap aBitmap = aBitmapEx.GetBitmap();
+        {
+            Bitmap::ScopedReadAccess pAccess(aBitmap);
+            CPPUNIT_ASSERT_EQUAL(tools::Long(4), pAccess->Width());
+            CPPUNIT_ASSERT_EQUAL(tools::Long(4), pAccess->Height());
+            if (pAccess->GetBitCount() == 24 || pAccess->GetBitCount() == 32)
+            {
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00),
+                                     pAccess->GetPixel(0, 0));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00),
+                                     pAccess->GetPixel(3, 3));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00),
+                                     pAccess->GetPixel(3, 0));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00),
+                                     pAccess->GetPixel(0, 3));
+
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0x00, 0x00, 0x00),
+                                     pAccess->GetPixel(1, 1));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0xFF, 0x00, 0x00),
+                                     pAccess->GetPixel(1, 2));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0xFF, 0x00),
+                                     pAccess->GetPixel(2, 1));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0x00, 0x00),
+                                     pAccess->GetPixel(2, 2));
+            }
+            else
+            {
+                CPPUNIT_ASSERT_MESSAGE("Bitmap is not 24 or 32 bit.", false);
+            }
+        }
+    }
+    for (const OUString& aFileName : { OUString("alpha-rect-8bit-RGBA.png") })
+    {
+        SvFileStream aFileStream(getFullUrl(aFileName), StreamMode::READ);
+
+        vcl::PngImageReader aPngReader(aFileStream);
+        BitmapEx aBitmapEx;
+        aPngReader.read(aBitmapEx);
+
+        Bitmap aBitmap = aBitmapEx.GetBitmap();
+        {
+            Bitmap::ScopedReadAccess pAccess(aBitmap);
+            CPPUNIT_ASSERT_EQUAL(tools::Long(4), pAccess->Width());
+            CPPUNIT_ASSERT_EQUAL(tools::Long(4), pAccess->Height());
+
+            if (pAccess->GetBitCount() == 24)
+            {
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00),
+                                     pAccess->GetPixel(0, 0));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00),
+                                     pAccess->GetPixel(3, 3));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00),
+                                     pAccess->GetPixel(3, 0));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00),
+                                     pAccess->GetPixel(0, 3));
+
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0x00, 0x00, 0x00),
+                                     pAccess->GetPixel(1, 1));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0xFF, 0x00, 0x00),
+                                     pAccess->GetPixel(1, 2));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0xFF, 0x00),
+                                     pAccess->GetPixel(2, 1));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0x00, 0x00),
+                                     pAccess->GetPixel(2, 2));
+
+                AlphaMask aAlpha = aBitmapEx.GetAlpha();
+                {
+                    AlphaMask::ScopedReadAccess pAlphaAccess(aAlpha);
+                    CPPUNIT_ASSERT_EQUAL(sal_uInt16(8), pAlphaAccess->GetBitCount());
+                    CPPUNIT_ASSERT_EQUAL(tools::Long(4), pAlphaAccess->Width());
+                    CPPUNIT_ASSERT_EQUAL(tools::Long(4), pAlphaAccess->Height());
+
+                    CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0x80, 0x00),
+                                         pAlphaAccess->GetPixel(0, 0));
+                    CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0x80, 0x00),
+                                         pAlphaAccess->GetPixel(3, 3));
+                    CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0x80, 0x00),
+                                         pAlphaAccess->GetPixel(3, 0));
+                    CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0x80, 0x00),
+                                         pAlphaAccess->GetPixel(0, 3));
+
+                    CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0x40, 0x00),
+                                         pAlphaAccess->GetPixel(1, 1));
+                    CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0xC0, 0x00),
+                                         pAlphaAccess->GetPixel(1, 2));
+                    CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0xC0, 0x00),
+                                         pAlphaAccess->GetPixel(2, 1));
+                    CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0x40, 0x00),
+                                         pAlphaAccess->GetPixel(2, 2));
+                }
+            }
+            else if (pAccess->GetBitCount() == 32)
+            {
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x80),
+                                     pAccess->GetPixel(0, 0));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x80),
+                                     pAccess->GetPixel(3, 3));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x80),
+                                     pAccess->GetPixel(3, 0));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x80),
+                                     pAccess->GetPixel(0, 3));
+
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0x00, 0x00, 0x40),
+                                     pAccess->GetPixel(1, 1));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0xFF, 0x00, 0xC0),
+                                     pAccess->GetPixel(1, 2));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0x00, 0x00, 0xFF, 0xC0),
+                                     pAccess->GetPixel(2, 1));
+                CPPUNIT_ASSERT_EQUAL(BitmapColor(ColorTransparency, 0xFF, 0xFF, 0x00, 0x40),
+                                     pAccess->GetPixel(2, 2));
+            }
+            else
+            {
+                CPPUNIT_ASSERT_MESSAGE("Bitmap is not 24 or 32 bit.", false);
+            }
+        }
+    }
+}
+
+void PngFilterTest::testMsGifInPng()
+{
+    Graphic aGraphic;
+    const OUString aURL(getFullUrl(u"ms-gif.png"));
+    SvFileStream aFileStream(aURL, StreamMode::READ);
+    GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
+    ErrCode aResult = rFilter.ImportGraphic(aGraphic, aURL, aFileStream);
+    CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, aResult);
+    CPPUNIT_ASSERT(aGraphic.IsGfxLink());
+    // The image is technically a PNG, but it has an animated Gif as a chunk (Microsoft extension).
+    CPPUNIT_ASSERT_EQUAL(GfxLinkType::NativeGif, aGraphic.GetSharedGfxLink()->GetType());
+    CPPUNIT_ASSERT(aGraphic.IsAnimated());
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(PngFilterTest);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qa/cppunit/png/data/alpha-rect-8bit-RGBA.png b/vcl/qa/cppunit/png/data/alpha-rect-8bit-RGBA.png
new file mode 100644
index 000000000..1e90e1a6c
--- /dev/null
+++ b/vcl/qa/cppunit/png/data/alpha-rect-8bit-RGBA.png
diff --git a/vcl/qa/cppunit/png/data/color-rect-4bit-pal.png b/vcl/qa/cppunit/png/data/color-rect-4bit-pal.png
new file mode 100644
index 000000000..740eede51
--- /dev/null
+++ b/vcl/qa/cppunit/png/data/color-rect-4bit-pal.png
diff --git a/vcl/qa/cppunit/png/data/color-rect-8bit-RGB-interlaced.png b/vcl/qa/cppunit/png/data/color-rect-8bit-RGB-interlaced.png
new file mode 100644
index 000000000..17ca9a350
--- /dev/null
+++ b/vcl/qa/cppunit/png/data/color-rect-8bit-RGB-interlaced.png
diff --git a/vcl/qa/cppunit/png/data/color-rect-8bit-RGB.png b/vcl/qa/cppunit/png/data/color-rect-8bit-RGB.png
new file mode 100644
index 000000000..727859d8a
--- /dev/null
+++ b/vcl/qa/cppunit/png/data/color-rect-8bit-RGB.png
diff --git a/vcl/qa/cppunit/png/data/ms-gif.png b/vcl/qa/cppunit/png/data/ms-gif.png
new file mode 100644
index 000000000..1f683241f
--- /dev/null
+++ b/vcl/qa/cppunit/png/data/ms-gif.png
diff --git a/vcl/qa/cppunit/png/data/rect-1bit-pal.png b/vcl/qa/cppunit/png/data/rect-1bit-pal.png
new file mode 100644
index 000000000..cf7ac3e7c
--- /dev/null
+++ b/vcl/qa/cppunit/png/data/rect-1bit-pal.png