diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-13 13:00:23 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-13 15:04:29 +0200 |
commit | b862ec6ac16f3e02be7845bb0db7a77250cb587d (patch) | |
tree | 3b860a05f2f79a7889822ea6cdaabe3aa4ada1fc /vcl/source | |
parent | 14653f89a83982ef36346ebc15f14099fd5cf8f1 (diff) |
merge UnoGraphicTransformer into UnoGraphic
it is never instantiated by itself. And this also means it now only has
one OWeakObject base class
Change-Id: I3074130539ab023fec5537e0e7794e1c2db7e6ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118835
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/graphic/UnoGraphic.cxx | 87 | ||||
-rw-r--r-- | vcl/source/graphic/UnoGraphicTransformer.cxx | 126 |
2 files changed, 87 insertions, 126 deletions
diff --git a/vcl/source/graphic/UnoGraphic.cxx b/vcl/source/graphic/UnoGraphic.cxx index 54887c96361a..2e850ef1b5dc 100644 --- a/vcl/source/graphic/UnoGraphic.cxx +++ b/vcl/source/graphic/UnoGraphic.cxx @@ -24,6 +24,9 @@ #include <com/sun/star/graphic/GraphicType.hpp> #include <com/sun/star/graphic/XGraphicTransformer.hpp> #include <vcl/dibtools.hxx> +#include <vcl/graph.hxx> +#include <vcl/BitmapColor.hxx> +#include <vcl/BitmapDuoToneFilter.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/queryinterface.hxx> @@ -186,6 +189,90 @@ sal_Int64 SAL_CALL Graphic::getSomething( const uno::Sequence< sal_Int8 >& rId ) reinterpret_cast<sal_Int64>(&maGraphic) : 0 ); } + +// XGraphicTransformer +uno::Reference< graphic::XGraphic > SAL_CALL Graphic::colorChange( + const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo ) +{ + ::Graphic aGraphic(rxGraphic); + ::Graphic aReturnGraphic; + + BitmapColor aBmpColorFrom(static_cast< sal_uInt8 >(nColorFrom), static_cast< sal_uInt8 >(nColorFrom >> 8), static_cast< sal_uInt8 >(nColorFrom >> 16)); + BitmapColor aBmpColorTo( static_cast< sal_uInt8 >(nColorTo), static_cast< sal_uInt8 >(nColorTo >> 8), static_cast< sal_uInt8 >(nColorTo >> 16)); + + Color aColorFrom(aBmpColorFrom); + Color aColorTo(aBmpColorTo); + + const sal_uInt8 cIndexFrom = aBmpColorFrom.GetIndex(); + + //TODO This code convert GdiMetafile(vector graphic) to Bitmap, which cause to information lost + if (aGraphic.GetType() == GraphicType::Bitmap || + aGraphic.GetType() == GraphicType::GdiMetafile) + { + BitmapEx aBitmapEx(aGraphic.GetBitmapEx()); + + if (aBitmapEx.IsAlpha()) + { + aBitmapEx.setAlphaFrom( cIndexFrom, 0xff - nAlphaTo ); + aBitmapEx.Replace(aColorFrom, aColorTo, nTolerance); + aReturnGraphic = ::Graphic(aBitmapEx); + } + else + { + if ((nAlphaTo == 0) || (nAlphaTo == sal::static_int_cast< sal_Int8 >(0xff))) + { + Bitmap aBitmap(aBitmapEx.GetBitmap()); + Bitmap aMask(aBitmap.CreateMask(aColorFrom, nTolerance)); + aBitmap.Replace(aColorFrom, aColorTo, nTolerance); + aReturnGraphic = ::Graphic(BitmapEx(aBitmap, aMask)); + } + else + { + aBitmapEx.setAlphaFrom(cIndexFrom, nAlphaTo); + aBitmapEx.Replace(aColorFrom, aColorTo, nTolerance); + aReturnGraphic = ::Graphic(aBitmapEx); + } + } + } + + aReturnGraphic.setOriginURL(aGraphic.getOriginURL()); + return aReturnGraphic.GetXGraphic(); +} + +uno::Reference< graphic::XGraphic > SAL_CALL Graphic::applyDuotone( + const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nColorOne, sal_Int32 nColorTwo ) +{ + ::Graphic aGraphic(rxGraphic); + ::Graphic aReturnGraphic; + + BitmapEx aBitmapEx( aGraphic.GetBitmapEx() ); + AlphaMask aMask( aBitmapEx.GetAlpha() ); + + BitmapEx aTmpBmpEx(aBitmapEx.GetBitmap()); + BitmapFilter::Filter(aTmpBmpEx, + BitmapDuoToneFilter( + Color(ColorTransparency, nColorOne), + Color(ColorTransparency, nColorTwo))); + + aReturnGraphic = ::Graphic( BitmapEx( aTmpBmpEx.GetBitmap(), aMask ) ); + aReturnGraphic.setOriginURL(aGraphic.getOriginURL()); + return aReturnGraphic.GetXGraphic(); +} + +uno::Reference< graphic::XGraphic > SAL_CALL Graphic::applyBrightnessContrast( + const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nBrightness, sal_Int32 nContrast, sal_Bool mso ) +{ + ::Graphic aGraphic(rxGraphic); + ::Graphic aReturnGraphic; + + BitmapEx aBitmapEx(aGraphic.GetBitmapEx()); + aBitmapEx.Adjust(nBrightness, nContrast, 0, 0, 0, 0, false, mso); + aReturnGraphic = ::Graphic(aBitmapEx); + aReturnGraphic.setOriginURL(aGraphic.getOriginURL()); + return aReturnGraphic.GetXGraphic(); +} + + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/graphic/UnoGraphicTransformer.cxx b/vcl/source/graphic/UnoGraphicTransformer.cxx deleted file mode 100644 index 9be6c2dbf4f6..000000000000 --- a/vcl/source/graphic/UnoGraphicTransformer.cxx +++ /dev/null @@ -1,126 +0,0 @@ -/* -*- 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 <graphic/UnoGraphicTransformer.hxx> - -#include <vcl/graph.hxx> -#include <vcl/BitmapColor.hxx> -#include <vcl/BitmapDuoToneFilter.hxx> - -using namespace com::sun::star; - -namespace unographic { - - -GraphicTransformer::GraphicTransformer() -{ -} - - -GraphicTransformer::~GraphicTransformer() -{ -} - - -// XGraphicTransformer -uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange( - const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo ) -{ - ::Graphic aGraphic(rxGraphic); - ::Graphic aReturnGraphic; - - BitmapColor aBmpColorFrom(static_cast< sal_uInt8 >(nColorFrom), static_cast< sal_uInt8 >(nColorFrom >> 8), static_cast< sal_uInt8 >(nColorFrom >> 16)); - BitmapColor aBmpColorTo( static_cast< sal_uInt8 >(nColorTo), static_cast< sal_uInt8 >(nColorTo >> 8), static_cast< sal_uInt8 >(nColorTo >> 16)); - - Color aColorFrom(aBmpColorFrom); - Color aColorTo(aBmpColorTo); - - const sal_uInt8 cIndexFrom = aBmpColorFrom.GetIndex(); - - //TODO This code convert GdiMetafile(vector graphic) to Bitmap, which cause to information lost - if (aGraphic.GetType() == GraphicType::Bitmap || - aGraphic.GetType() == GraphicType::GdiMetafile) - { - BitmapEx aBitmapEx(aGraphic.GetBitmapEx()); - - if (aBitmapEx.IsAlpha()) - { - aBitmapEx.setAlphaFrom( cIndexFrom, 0xff - nAlphaTo ); - aBitmapEx.Replace(aColorFrom, aColorTo, nTolerance); - aReturnGraphic = ::Graphic(aBitmapEx); - } - else - { - if ((nAlphaTo == 0) || (nAlphaTo == sal::static_int_cast< sal_Int8 >(0xff))) - { - Bitmap aBitmap(aBitmapEx.GetBitmap()); - Bitmap aMask(aBitmap.CreateMask(aColorFrom, nTolerance)); - aBitmap.Replace(aColorFrom, aColorTo, nTolerance); - aReturnGraphic = ::Graphic(BitmapEx(aBitmap, aMask)); - } - else - { - aBitmapEx.setAlphaFrom(cIndexFrom, nAlphaTo); - aBitmapEx.Replace(aColorFrom, aColorTo, nTolerance); - aReturnGraphic = ::Graphic(aBitmapEx); - } - } - } - - aReturnGraphic.setOriginURL(aGraphic.getOriginURL()); - return aReturnGraphic.GetXGraphic(); -} - -uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::applyDuotone( - const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nColorOne, sal_Int32 nColorTwo ) -{ - ::Graphic aGraphic(rxGraphic); - ::Graphic aReturnGraphic; - - BitmapEx aBitmapEx( aGraphic.GetBitmapEx() ); - AlphaMask aMask( aBitmapEx.GetAlpha() ); - - BitmapEx aTmpBmpEx(aBitmapEx.GetBitmap()); - BitmapFilter::Filter(aTmpBmpEx, - BitmapDuoToneFilter( - Color(ColorTransparency, nColorOne), - Color(ColorTransparency, nColorTwo))); - - aReturnGraphic = ::Graphic( BitmapEx( aTmpBmpEx.GetBitmap(), aMask ) ); - aReturnGraphic.setOriginURL(aGraphic.getOriginURL()); - return aReturnGraphic.GetXGraphic(); -} - -uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::applyBrightnessContrast( - const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nBrightness, sal_Int32 nContrast, sal_Bool mso ) -{ - ::Graphic aGraphic(rxGraphic); - ::Graphic aReturnGraphic; - - BitmapEx aBitmapEx(aGraphic.GetBitmapEx()); - aBitmapEx.Adjust(nBrightness, nContrast, 0, 0, 0, 0, false, mso); - aReturnGraphic = ::Graphic(aBitmapEx); - aReturnGraphic.setOriginURL(aGraphic.getOriginURL()); - return aReturnGraphic.GetXGraphic(); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |