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

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

3 files changed, 174 insertions, 0 deletions

diff --git a/cppcanvas/qa/extras/emfplus/data/fdo77229.emf b/cppcanvas/qa/extras/emfplus/data/fdo77229.emf
new file mode 100644
index 000000000..1f12717fa
--- /dev/null
+++ b/cppcanvas/qa/extras/emfplus/data/fdo77229.emf
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx
new file mode 100644
index 000000000..6866310b5
--- /dev/null
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -0,0 +1,89 @@
+/* -*- 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/.
+ */
+
+#include <com/sun/star/frame/Desktop.hpp>
+
+#include <comphelper/processfactory.hxx>
+#include <sfx2/app.hxx>
+#include <sfx2/objsh.hxx>
+#include <sfx2/sfxbasemodel.hxx>
+#include <test/unoapi_test.hxx>
+#include <vcl/BitmapReadAccess.hxx>
+#include <vcl/pngwrite.hxx>
+#include <vcl/gdimtf.hxx>
+#include <tools/stream.hxx>
+
+using namespace com::sun::star;
+
+class Test : public UnoApiTest
+{
+public:
+    Test()
+        : UnoApiTest("/cppcanvas/qa/extras/emfplus/data/")
+    {
+    }
+
+    virtual void setUp() override
+    {
+        UnoApiTest::setUp();
+        mxDesktop.set(
+            frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
+        SfxApplication::GetOrCreate();
+    };
+
+    virtual void tearDown() override
+    {
+        if (mxComponent.is())
+        {
+            closeDocument(mxComponent);
+            mxComponent->dispose();
+        }
+        UnoApiTest::tearDown();
+    };
+
+    Bitmap load(const char* pName)
+    {
+        OUString aFileURL;
+        createFileURL(OUString::createFromAscii(pName), aFileURL);
+        mxComponent = loadFromDesktop(aFileURL, "com.sun.star.drawing.DrawingDocument");
+        SfxBaseModel* pModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
+        CPPUNIT_ASSERT(pModel);
+        SfxObjectShell* pShell = pModel->GetObjectShell();
+        std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
+        BitmapEx aResultBitmap;
+        CPPUNIT_ASSERT(xMetaFile->CreateThumbnail(aResultBitmap));
+        // If this is set, the metafile will be dumped as a PNG one for debug purposes.
+        char* pEnv = getenv("CPPCANVAS_DEBUG_EMFPLUS_DUMP_TO");
+        if (pEnv)
+        {
+            SvFileStream aStream(OUString::fromUtf8(pEnv), StreamMode::WRITE);
+            vcl::PNGWriter aWriter(aResultBitmap);
+            CPPUNIT_ASSERT(aWriter.Write(aStream));
+        }
+
+        return aResultBitmap.GetBitmap();
+    }
+
+    uno::Reference<lang::XComponent> mxComponent;
+};
+
+CPPUNIT_TEST_FIXTURE(Test, testFdo77229)
+{
+    Bitmap aBitmap = load("fdo77229.emf");
+    Bitmap::ScopedReadAccess pAccess(aBitmap);
+    // The green star was missing.
+    Color aColor(pAccess->GetPixel(284, 280));
+    CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), aColor.GetRed());
+    CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), aColor.GetBlue());
+    CPPUNIT_ASSERT(aColor.GetGreen() == 0xfe || aColor.GetGreen() == 0xff);
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx
new file mode 100644
index 000000000..303eecd86
--- /dev/null
+++ b/cppcanvas/qa/unit/test.cxx
@@ -0,0 +1,85 @@
+/* -*- 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/.
+ */
+
+#include <sal/config.h>
+
+#include <test/bootstrapfixture.hxx>
+
+#include <vcl/wrkwin.hxx>
+#include <vcl/canvastools.hxx>
+
+#include <com/sun/star/rendering/XBitmap.hpp>
+#include <com/sun/star/rendering/XCanvas.hpp>
+#include <com/sun/star/rendering/XBitmapCanvas.hpp>
+
+using namespace ::com::sun::star;
+
+class CanvasTest : public test::BootstrapFixture
+{
+public:
+    CanvasTest() : BootstrapFixture(true, false) {}
+
+    void testComposite();
+
+    CPPUNIT_TEST_SUITE(CanvasTest);
+    CPPUNIT_TEST(testComposite);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+void CanvasTest::testComposite()
+{
+#ifdef LINUX
+    ScopedVclPtrInstance<WorkWindow> pWin( nullptr, WB_STDWORK );
+
+    uno::Reference<rendering::XCanvas> xCanvas = pWin->GetOutDev()->GetCanvas ();
+    if( !xCanvas.is() )
+        return; // can't get a canvas working at all - truly headless ?
+
+    // a huge canvas ...
+    Size aSize (1, 1);
+    uno::Reference<rendering::XBitmap> xBitmap = xCanvas->getDevice ()->createCompatibleAlphaBitmap(
+                        vcl::unotools::integerSize2DFromSize( aSize ) );
+    CPPUNIT_ASSERT( xBitmap.is() );
+
+    uno::Reference< rendering::XBitmapCanvas > xBitmapCanvas( xBitmap, uno::UNO_QUERY );
+    CPPUNIT_ASSERT( xBitmapCanvas.is() );
+
+    BitmapEx aBitmapEx;
+    {
+        // clear the canvas and basic sanity check ...
+        xBitmapCanvas->clear();
+        CPPUNIT_ASSERT( aBitmapEx.Create( xBitmapCanvas, aSize ) );
+        CPPUNIT_ASSERT( aBitmapEx.IsAlpha() );
+        CPPUNIT_ASSERT( !aBitmapEx.GetAlpha().IsEmpty() );
+    }
+
+    {
+        // render something
+        rendering::RenderState aDefaultState;
+        uno::Sequence< double > aRedTransparent{ 1.0, // R
+                                                 0.0, // G
+                                                 0.0, // B
+                                                 0.5 }; // A
+        aDefaultState.DeviceColor = aRedTransparent;
+#if 0
+        // words fail me to describe the sheer beauty of allocating a UNO
+        // object to represent a polygon, and manually handling the ViewState
+        // and there being no public helper for this - to render ... a rectangle.
+        XCachedPrimitive    fillPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState )
+#endif
+    }
+
+#endif
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(CanvasTest);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */