diff options
| -rw-r--r-- | vcl/CppunitTest_vcl_gen.mk | 42 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 6 | ||||
| -rw-r--r-- | vcl/opengl/salbmp.cxx | 7 | ||||
| -rw-r--r-- | vcl/qa/cppunit/gen/data/tdf121120.png | bin | 0 -> 3196 bytes | |||
| -rw-r--r-- | vcl/qa/cppunit/gen/gen.cxx | 84 |
5 files changed, 132 insertions, 7 deletions
diff --git a/vcl/CppunitTest_vcl_gen.mk b/vcl/CppunitTest_vcl_gen.mk new file mode 100644 index 000000000000..84dd0ca25bb0 --- /dev/null +++ b/vcl/CppunitTest_vcl_gen.mk @@ -0,0 +1,42 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# 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/. +# +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,vcl_gen)) + +$(eval $(call gb_CppunitTest_add_exception_objects,vcl_gen, \ + vcl/qa/cppunit/gen/gen \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,vcl_gen, \ + comphelper \ + cppu \ + cppuhelper \ + sal \ + sfx \ + subsequenttest \ + test \ + tl \ + unotest \ + vcl \ +)) + +$(eval $(call gb_CppunitTest_use_external,vcl_gen,boost_headers)) + +$(eval $(call gb_CppunitTest_use_sdk_api,vcl_gen)) + +$(eval $(call gb_CppunitTest_use_ure,vcl_gen)) +$(eval $(call gb_CppunitTest_use_vcl_non_headless,vcl_gen)) + +$(eval $(call gb_CppunitTest_use_rdb,vcl_gen,services)) + +$(eval $(call gb_CppunitTest_use_configuration,vcl_gen)) + +# vim: set noet sw=4 ts=4: diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index c3b491e23088..6c7ed89dfb23 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -247,4 +247,10 @@ $(eval $(call gb_Module_add_screenshot_targets,vcl,\ CppunitTest_vcl_dialogs_test \ )) +ifneq ($(DISPLAY),) +$(eval $(call gb_Module_add_slowcheck_targets,vcl,\ + CppunitTest_vcl_gen \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx index 8e2eed0479ec..dc7418799e34 100644 --- a/vcl/opengl/salbmp.cxx +++ b/vcl/opengl/salbmp.cxx @@ -496,13 +496,6 @@ GLuint OpenGLSalBitmap::CreateTexture() determineTextureFormat(mnBits, nFormat, nType); } - else if( mnBits == 8 && maPalette.IsGreyPalette() ) - { - // no conversion needed for grayscale - pData = mpUserBuffer.get(); - nFormat = GL_LUMINANCE; - nType = GL_UNSIGNED_BYTE; - } else { VCL_GL_INFO( "::CreateTexture - convert from " << mnBits << " to 24 bits" ); diff --git a/vcl/qa/cppunit/gen/data/tdf121120.png b/vcl/qa/cppunit/gen/data/tdf121120.png Binary files differnew file mode 100644 index 000000000000..8e48fba385f9 --- /dev/null +++ b/vcl/qa/cppunit/gen/data/tdf121120.png diff --git a/vcl/qa/cppunit/gen/gen.cxx b/vcl/qa/cppunit/gen/gen.cxx new file mode 100644 index 000000000000..f5d1c1c6769c --- /dev/null +++ b/vcl/qa/cppunit/gen/gen.cxx @@ -0,0 +1,84 @@ +/* -*- 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/bitmapaccess.hxx> +#include <vcl/pngwrite.hxx> +#include <vcl/gdimtf.hxx> +#include <tools/stream.hxx> + +using namespace com::sun::star; + +/// This test uses the gen backend (i.e. intentionally not the svp one, which is the default.) +class GenTest : public UnoApiTest +{ +public: + GenTest() + : UnoApiTest("/vcl/qa/cppunit/gen/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)); + return aResultBitmap.GetBitmap(); + } + + uno::Reference<lang::XComponent> mxComponent; +}; + +CPPUNIT_TEST_FIXTURE(GenTest, testTdf121120) +{ + Bitmap aBitmap = load("tdf121120.png"); + Bitmap::ScopedReadAccess pAccess(aBitmap); + const Size& rSize = aBitmap.GetPrefSize(); + Color aColor(pAccess->GetPixel(rSize.getWidth() / 2, rSize.getHeight() / 2).GetColor()); + // Without the accompanying fix in place, this test would have failed with 'Expected: 255; + // Actual : 1'. I.e. center if the preview (which has the background color) was ~black, not + // white. + CPPUNIT_ASSERT_EQUAL(0xff, int(aColor.GetRed())); + CPPUNIT_ASSERT_EQUAL(0xff, int(aColor.GetBlue())); + CPPUNIT_ASSERT_EQUAL(0xff, int(aColor.GetGreen())); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |
