solenv/clang-format/excludelist | 1 vcl/Library_vcl.mk | 1 vcl/source/outdev/eps.cxx | 84 ++++++++++++++++++++++++++++++++++++++++ vcl/source/outdev/outdev.cxx | 59 ---------------------------- 4 files changed, 86 insertions(+), 59 deletions(-)
New commits: commit 4a388f5e01ebb5a512931d11e48c4380382239c8 Author: Chris Sherlock <[email protected]> AuthorDate: Wed Nov 3 01:35:12 2021 +1100 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Wed Jan 19 01:44:01 2022 +0100 vcl: move eps functions to eps.cxx Change-Id: I0d61835d0964e18b578ec42b7002671310a8a36d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124603 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 10175a4c0422..3d4638abf382 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -14942,6 +14942,7 @@ vcl/source/outdev/bitmap.cxx vcl/source/outdev/bitmapex.cxx vcl/source/outdev/clipping.cxx vcl/source/outdev/curvedshapes.cxx +vcl/source/outdev/eps.cxx vcl/source/outdev/fill.cxx vcl/source/outdev/font.cxx vcl/source/outdev/gradient.cxx diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index f201cb273524..7664927c257a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -213,6 +213,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/toolkit/group \ vcl/source/toolkit/morebtn \ vcl/source/outdev/background \ + vcl/source/outdev/eps \ vcl/source/outdev/outdev \ vcl/source/outdev/stack \ vcl/source/outdev/clipping \ diff --git a/vcl/source/outdev/eps.cxx b/vcl/source/outdev/eps.cxx new file mode 100644 index 000000000000..f65c8aa97217 --- /dev/null +++ b/vcl/source/outdev/eps.cxx @@ -0,0 +1,84 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * 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 <vcl/gfxlink.hxx> +#include <vcl/graph.hxx> +#include <vcl/metaact.hxx> +#include <vcl/virdev.hxx> + +#include <salgdi.hxx> + +bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, + const GfxLink& rGfxLink, GDIMetaFile* pSubst ) +{ + bool bDrawn(true); + + if ( mpMetaFile ) + { + GDIMetaFile aSubst; + + if( pSubst ) + aSubst = *pSubst; + + mpMetaFile->AddAction( new MetaEPSAction( rPoint, rSize, rGfxLink, aSubst ) ); + } + + if ( !IsDeviceOutputNecessary() || ImplIsRecordLayout() ) + return bDrawn; + + if( mbOutputClipped ) + return bDrawn; + + tools::Rectangle aRect( ImplLogicToDevicePixel( tools::Rectangle( rPoint, rSize ) ) ); + + if( !aRect.IsEmpty() ) + { + // draw the real EPS graphics + if( rGfxLink.GetData() && rGfxLink.GetDataSize() ) + { + if( !mpGraphics && !AcquireGraphics() ) + return bDrawn; + assert(mpGraphics); + + if( mbInitClipRegion ) + InitClipRegion(); + + aRect.Justify(); + bDrawn = mpGraphics->DrawEPS( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), + const_cast<sal_uInt8*>(rGfxLink.GetData()), rGfxLink.GetDataSize(), *this ); + } + + // else draw the substitution graphics + if( !bDrawn && pSubst ) + { + GDIMetaFile* pOldMetaFile = mpMetaFile; + + mpMetaFile = nullptr; + Graphic(*pSubst).Draw(*this, rPoint, rSize); + mpMetaFile = pOldMetaFile; + } + } + + if( mpAlphaVDev ) + mpAlphaVDev->DrawEPS( rPoint, rSize, rGfxLink, pSubst ); + + return bDrawn; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 7f8167b5180b..708a283f44a8 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -720,65 +720,6 @@ bool OutputDevice::ImplIsRecordLayout() const return mpOutDevData->mpRecordLayout; } -// EPS public function - -bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, - const GfxLink& rGfxLink, GDIMetaFile* pSubst ) -{ - bool bDrawn(true); - - if ( mpMetaFile ) - { - GDIMetaFile aSubst; - - if( pSubst ) - aSubst = *pSubst; - - mpMetaFile->AddAction( new MetaEPSAction( rPoint, rSize, rGfxLink, aSubst ) ); - } - - if ( !IsDeviceOutputNecessary() || ImplIsRecordLayout() ) - return bDrawn; - - if( mbOutputClipped ) - return bDrawn; - - tools::Rectangle aRect( ImplLogicToDevicePixel( tools::Rectangle( rPoint, rSize ) ) ); - - if( !aRect.IsEmpty() ) - { - // draw the real EPS graphics - if( rGfxLink.GetData() && rGfxLink.GetDataSize() ) - { - if( !mpGraphics && !AcquireGraphics() ) - return bDrawn; - assert(mpGraphics); - - if( mbInitClipRegion ) - InitClipRegion(); - - aRect.Justify(); - bDrawn = mpGraphics->DrawEPS( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), - const_cast<sal_uInt8*>(rGfxLink.GetData()), rGfxLink.GetDataSize(), *this ); - } - - // else draw the substitution graphics - if( !bDrawn && pSubst ) - { - GDIMetaFile* pOldMetaFile = mpMetaFile; - - mpMetaFile = nullptr; - Graphic(*pSubst).Draw(*this, rPoint, rSize); - mpMetaFile = pOldMetaFile; - } - } - - if( mpAlphaVDev ) - mpAlphaVDev->DrawEPS( rPoint, rSize, rGfxLink, pSubst ); - - return bDrawn; -} - css::awt::DeviceInfo OutputDevice::GetCommonDeviceInfo(Size const& rDevSz) const { css::awt::DeviceInfo aInfo;
