remove BitmapEx
all use-sites have been converted to Bitmap Change-Id: I1a8842217a266eef100bd387ab013b004e532256 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190618 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins
This commit is contained in:
Noel Grandin
committed by
Noel Grandin
Noel Grandin
parent
a65a224c2b
commit
6d0e5ddede
@@ -33,7 +33,7 @@
|
||||
#include <comphelper/scopeguard.hxx>
|
||||
#include <tools/urlobj.hxx>
|
||||
#include <unotools/securityoptions.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/sysdata.hxx>
|
||||
#include <vcl/commandevent.hxx>
|
||||
#include <vcl/event.hxx>
|
||||
|
||||
@@ -112,7 +112,6 @@
|
||||
#include <vcl/animate/AnimationFrame.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmap/BitmapTypes.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/builderpage.hxx>
|
||||
#include <vcl/cairo.hxx>
|
||||
#include <vcl/checksum.hxx>
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
#include <rtl/math.hxx>
|
||||
#include <sal/log.hxx>
|
||||
#include <vcl/BitmapTools.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/cairo.hxx>
|
||||
#include <vcl/canvastools.hxx>
|
||||
#include <vcl/dibtools.hxx>
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
#include <vcl/BitmapTools.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/bitmap/BitmapAlphaClampFilter.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/canvastools.hxx>
|
||||
#include <vcl/dibtools.hxx>
|
||||
#include <vcl/gradient.hxx>
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <basegfx/utils/canvastools.hxx>
|
||||
#include <basegfx/utils/unopolypolygon.hxx>
|
||||
#include <tools/stream.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/canvastools.hxx>
|
||||
#include <vcl/dibtools.hxx>
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#include <cppuhelper/supportsservice.hxx>
|
||||
#include <comphelper/diagnose_ex.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
#include <canvas/canvastools.hxx>
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <sal/config.h>
|
||||
|
||||
#include <osl/diagnose.h>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
|
||||
#include "bitmapbackbuffer.hxx"
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <vcl/virdev.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
#include <vclwrapper.hxx>
|
||||
#include "outdevprovider.hxx"
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <sal/config.h>
|
||||
|
||||
#include <cppuhelper/supportsservice.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
|
||||
#include "canvasbitmap.hxx"
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#include <canvas/canvastools.hxx>
|
||||
#include <comphelper/diagnose_ex.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/BitmapTools.hxx>
|
||||
#include <vcl/canvastools.hxx>
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "canvashelper.hxx"
|
||||
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
#include "bitmapbackbuffer.hxx"
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
#include <rtl/math.hxx>
|
||||
#include <comphelper/diagnose_ex.hxx>
|
||||
#include <tools/poly.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/BitmapReadAccess.hxx>
|
||||
#include <vcl/canvastools.hxx>
|
||||
#include <vcl/bitmap/BitmapAlphaClampFilter.hxx>
|
||||
|
||||
@@ -36,7 +36,8 @@
|
||||
#include <rtl/math.hxx>
|
||||
#include <comphelper/diagnose_ex.hxx>
|
||||
#include <tools/poly.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/canvastools.hxx>
|
||||
#include <vcl/virdev.hxx>
|
||||
#include <vcl/gradient.hxx>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <rtl/math.hxx>
|
||||
#include <comphelper/diagnose_ex.hxx>
|
||||
#include <sal/log.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/canvastools.hxx>
|
||||
#include <vcl/BitmapTools.hxx>
|
||||
#include <vcl/metric.hxx>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <sal/config.h>
|
||||
|
||||
#include <osl/diagnose.h>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/dibtools.hxx>
|
||||
#include <tools/stream.hxx>
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <rtl/math.hxx>
|
||||
#include <comphelper/diagnose_ex.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/canvastools.hxx>
|
||||
#include <vcl/outdev.hxx>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
#include <base/canvascustomspritehelper.hxx>
|
||||
#include <base/spritesurface.hxx>
|
||||
|
||||
@@ -113,7 +113,6 @@
|
||||
#include <vcl/animate/AnimationFrame.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmap/BitmapTypes.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/builderpage.hxx>
|
||||
#include <vcl/cairo.hxx>
|
||||
#include <vcl/checksum.hxx>
|
||||
|
||||
@@ -106,7 +106,6 @@
|
||||
#include <vcl/animate/AnimationFrame.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmap/BitmapTypes.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/checksum.hxx>
|
||||
#include <vcl/dllapi.h>
|
||||
#include <vcl/gfxlink.hxx>
|
||||
|
||||
@@ -84,7 +84,6 @@ def is_ignore(srcLoc):
|
||||
"vcl/source/filter/wmf/winmtf.hxx",
|
||||
"vcl/source/filter/sgvmain.hxx",
|
||||
"vcl/source/filter/jpeg/transupp.h",
|
||||
"include/vcl/bitmapex.hxx", # TransparentType
|
||||
"vcl/inc/sft.hxx", # CompositeFlags, WidthClass, WeightClass
|
||||
"vcl/inc/CommonSalLayout.hxx", # VerticalOrientation
|
||||
"include/tools/fontenum.hxx", # part of GDI file format
|
||||
|
||||
@@ -46,6 +46,7 @@
|
||||
#include <basegfx/polygon/b2dpolygonclipper.hxx>
|
||||
#include <canvas/canvastools.hxx>
|
||||
#include <rtl/ustrbuf.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/canvastools.hxx>
|
||||
#include <vcl/gdimtf.hxx>
|
||||
#include <vcl/metaact.hxx>
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
#include <com/sun/star/rendering/XCanvas.hpp>
|
||||
|
||||
#include <vcl/metaact.hxx>
|
||||
//#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
#include <vcl/virdev.hxx>
|
||||
#include <vcl/gdimtf.hxx>
|
||||
|
||||
@@ -111,7 +111,6 @@
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmap/BitmapFilter.hxx>
|
||||
#include <vcl/bitmap/BitmapTypes.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/builderpage.hxx>
|
||||
#include <vcl/cairo.hxx>
|
||||
#include <vcl/checksum.hxx>
|
||||
|
||||
@@ -94,7 +94,6 @@
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmap/BitmapTypes.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/checksum.hxx>
|
||||
#include <vcl/dllapi.h>
|
||||
#include <vcl/mapmod.hxx>
|
||||
|
||||
@@ -77,7 +77,6 @@
|
||||
#include <vcl/Scanline.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/cairo.hxx>
|
||||
#include <vcl/ctrl.hxx>
|
||||
#include <vcl/dllapi.h>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <strings.hrc>
|
||||
#include <bitmaps.hlst>
|
||||
#include <sfx2/thumbnailviewitem.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/event.hxx>
|
||||
#include <vcl/i18nhelp.hxx>
|
||||
#include <vcl/mnemonic.hxx>
|
||||
|
||||
@@ -99,7 +99,6 @@
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmap/BitmapTypes.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/checksum.hxx>
|
||||
#include <vcl/dllapi.h>
|
||||
#include <comphelper/errcode.hxx>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
|
||||
#include <sal/log.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
#include <vcl/salnativewidgets.hxx>
|
||||
|
||||
|
||||
@@ -59,7 +59,6 @@
|
||||
#include <sal/log.hxx>
|
||||
#include <sal/types.h>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/canvastools.hxx>
|
||||
#include <vcl/dllapi.h>
|
||||
#include <vcl/graph.hxx>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <drawinglayer/primitive2d/primitivetools2d.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/wall.hxx>
|
||||
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <texture/texture.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/BitmapReadAccess.hxx>
|
||||
|
||||
namespace drawinglayer::primitive3d {
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <cppuhelper/supportsservice.hxx>
|
||||
#include <drawinglayer/geometry/viewinformation2d.hxx>
|
||||
#include <basegfx/numeric/ftools.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/canvastools.hxx>
|
||||
#include <com/sun/star/geometry/RealRectangle2D.hpp>
|
||||
#include <basegfx/matrix/b2dhommatrixtools.hxx>
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <vcl/svapp.hxx>
|
||||
#include <com/sun/star/awt/PosSize.hpp>
|
||||
#include <com/sun/star/awt/XWindow2.hpp>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
|
||||
#include <comphelper/diagnose_ex.hxx>
|
||||
#include <basegfx/polygon/b2dpolygontools.hxx>
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
|
||||
#include <utility>
|
||||
#include <vcl/animate/Animation.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/graph.hxx>
|
||||
#include <vcl/virdev.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <drawinglayer/processor2d/SDPRProcessor2dTools.hxx>
|
||||
#include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
|
||||
#include <drawinglayer/geometry/viewinformation2d.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/graph.hxx>
|
||||
#include <basegfx/range/b2drange.hxx>
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <drawinglayer/processor2d/d2dpixelprocessor2d.hxx>
|
||||
#include <drawinglayer/processor2d/SDPRProcessor2dTools.hxx>
|
||||
#include <sal/log.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/outdev.hxx>
|
||||
#include <basegfx/polygon/b2dpolygontools.hxx>
|
||||
#include <basegfx/polygon/b2dpolypolygontools.hxx>
|
||||
|
||||
@@ -26,7 +26,8 @@
|
||||
|
||||
#include "vclhelperbufferdevice.hxx"
|
||||
#include <basegfx/range/b2drange.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <basegfx/matrix/b2dhommatrix.hxx>
|
||||
#include <basegfx/matrix/b2dhommatrixtools.hxx>
|
||||
#include <vcl/timer.hxx>
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <com/sun/star/drawing/ShadeMode.hpp>
|
||||
#include <drawinglayer/primitive3d/transformprimitive3d.hxx>
|
||||
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <drawinglayer/attribute/sdrsceneattribute3d.hxx>
|
||||
#include <drawinglayer/attribute/sdrlightingattribute3d.hxx>
|
||||
#include <vcl/graph.hxx>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
|
||||
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
|
||||
#include <drawinglayer/processor2d/processor2dtools.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
#include <vcl/virdev.hxx>
|
||||
#include <com/sun/star/geometry/RealRectangle2D.hpp>
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include <wmfemfhelper.hxx>
|
||||
#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/lineinfo.hxx>
|
||||
#include <vcl/metaact.hxx>
|
||||
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
|
||||
|
||||
@@ -105,7 +105,6 @@
|
||||
#include <vcl/animate/AnimationFrame.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmap/BitmapTypes.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/checksum.hxx>
|
||||
#include <vcl/dllapi.h>
|
||||
#include <vcl/font.hxx>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "bitmapcreator.hxx"
|
||||
|
||||
#include <cppuhelper/supportsservice.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <toolkit/helper/vclunohelper.hxx>
|
||||
#include <tools/stream.hxx>
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <basegfx/utils/b2dclipstate.hxx>
|
||||
#include <tools/poly.hxx>
|
||||
#include <vcl/font.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/lineinfo.hxx>
|
||||
#include <vcl/rendercontext/State.hxx>
|
||||
#include <vcl/metaact.hxx>
|
||||
|
||||
@@ -39,7 +39,6 @@
|
||||
#include <sal/log.hxx>
|
||||
#include <sal/macros.h>
|
||||
#include <sal/types.h>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/dllapi.h>
|
||||
#endif // PCH_LEVEL >= 2
|
||||
#if PCH_LEVEL >= 3
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <tools/stream.hxx>
|
||||
#include <memory>
|
||||
#include <comphelper/configuration.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/graph.hxx>
|
||||
#include <vcl/pdfread.hxx>
|
||||
#include <rtl/bootstrap.hxx>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <cmath>
|
||||
|
||||
#include "grid.hxx"
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/customweld.hxx>
|
||||
#include <vcl/event.hxx>
|
||||
#include <vcl/settings.hxx>
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <o3tl/sprintf.hxx>
|
||||
#include <tools/config.hxx>
|
||||
#include <unotools/resmgr.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/customweld.hxx>
|
||||
#include <vcl/dibtools.hxx>
|
||||
#include <vcl/lineinfo.hxx>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#include <o3tl/any.hxx>
|
||||
#include <o3tl/safeint.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
|
||||
#include <com/sun/star/drawing/LineStyle.hpp>
|
||||
#include <com/sun/star/drawing/LineDash.hpp>
|
||||
|
||||
@@ -24,9 +24,10 @@
|
||||
#include <com/sun/star/ui/ItemType.hpp>
|
||||
#include <com/sun/star/ui/ItemStyle.hpp>
|
||||
#include <utility>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/dibtools.hxx>
|
||||
#include <vcl/graph.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <sfx2/objsh.hxx>
|
||||
#include <filter/msfilter/msvbahelper.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <cppuhelper/supportsservice.hxx>
|
||||
#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
|
||||
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/pdfread.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
#include <vcl/outdev.hxx>
|
||||
|
||||
@@ -96,7 +96,6 @@
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmap/BitmapTypes.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/checksum.hxx>
|
||||
#include <vcl/commandinfoprovider.hxx>
|
||||
#include <vcl/dllapi.h>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
|
||||
|
||||
namespace drawinglayer
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#include <drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx>
|
||||
#include <basegfx/matrix/b2dhommatrix.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
namespace drawinglayer::primitive2d
|
||||
{
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
|
||||
#include <basegfx/matrix/b2dhommatrix.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
namespace drawinglayer::primitive2d
|
||||
{
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx>
|
||||
#include <basegfx/matrix/b2dhommatrix.hxx>
|
||||
#include <drawinglayer/attribute/fillgraphicattribute.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
namespace drawinglayer::primitive2d
|
||||
{
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <drawinglayer/drawinglayerdllapi.h>
|
||||
#include <drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx>
|
||||
#include <basegfx/polygon/b2dpolypolygon.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
|
||||
namespace drawinglayer::primitive2d
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <drawinglayer/primitive3d/baseprimitive3d.hxx>
|
||||
#include <drawinglayer/geometry/viewinformation3d.hxx>
|
||||
#include <basegfx/matrix/b2dhommatrix.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <drawinglayer/attribute/sdrsceneattribute3d.hxx>
|
||||
#include <drawinglayer/attribute/sdrlightingattribute3d.hxx>
|
||||
|
||||
|
||||
@@ -37,7 +37,6 @@ class B2DRange;
|
||||
}
|
||||
|
||||
class Bitmap;
|
||||
class BitmapEx;
|
||||
|
||||
namespace drawinglayer::processor2d
|
||||
{
|
||||
|
||||
@@ -62,7 +62,6 @@ class B2DHomMatrixBufferedOnDemandDecompose;
|
||||
}
|
||||
|
||||
class Bitmap;
|
||||
class BitmapEx;
|
||||
class OutputDevice;
|
||||
class SalLayout;
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#define INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSOR2DTOOLS_HXX
|
||||
|
||||
#include <drawinglayer/drawinglayerdllapi.h>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <memory>
|
||||
|
||||
namespace drawinglayer::geometry { class ViewInformation2D; }
|
||||
|
||||
@@ -41,6 +41,7 @@
|
||||
#include <sal/types.h>
|
||||
#include <svx/msdffdef.hxx>
|
||||
#include <comphelper/errcode.hxx>
|
||||
#include <tools/color.hxx>
|
||||
#include <tools/degree.hxx>
|
||||
#include <tools/gen.hxx>
|
||||
#include <tools/ref.hxx>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <rtl/ustring.hxx>
|
||||
#include <sal/types.h>
|
||||
#include <tools/stream.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
namespace com::sun::star {
|
||||
namespace beans { struct PropertyValue; }
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <sal/types.h>
|
||||
#include <comphelper/errcode.hxx>
|
||||
#include <svl/poolitem.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <tools/link.hxx>
|
||||
#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
|
||||
#include <unordered_map>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <com/sun/star/uno/Reference.h>
|
||||
#include <com/sun/star/uno/Sequence.hxx>
|
||||
#include <com/sun/star/frame/XModel3.hpp>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
#include <svl/poolitem.hxx>
|
||||
#include <sot/formats.hxx>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <sfx2/dllapi.h>
|
||||
#include <sfx2/basedlgs.hxx>
|
||||
#include <sal/types.h>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/builderpage.hxx>
|
||||
#include <svl/itempool.hxx>
|
||||
#include <svl/itemset.hxx>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#define INCLUDED_SFX2_TEMPLATEPROPERTIES_HXX
|
||||
|
||||
#include <rtl/ustring.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
struct TemplateItemProperties
|
||||
{
|
||||
|
||||
@@ -20,9 +20,10 @@
|
||||
#pragma once
|
||||
|
||||
#include <config_options.h>
|
||||
#include <basegfx/color/bcolor.hxx>
|
||||
#include <basegfx/vector/b2dvector.hxx>
|
||||
#include <drawinglayer/attribute/fontattribute.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <sfx2/dllapi.h>
|
||||
#include <rtl/ref.hxx>
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <svx/svxdllapi.h>
|
||||
#include <svx/galmisc.hxx>
|
||||
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <tools/urlobj.hxx>
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <tools/debug.hxx>
|
||||
#include <tools/urlobj.hxx>
|
||||
#include <tools/datetime.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <svl/SfxBroadcaster.hxx>
|
||||
#include <svx/galmisc.hxx>
|
||||
#include <memory>
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX
|
||||
|
||||
#include <svx/sdr/overlay/overlayobject.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
|
||||
namespace sdr::overlay
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYBITMAPEX_HXX
|
||||
|
||||
#include <svx/sdr/overlay/overlayobject.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
|
||||
namespace sdr::overlay
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <com/sun/star/awt/MouseEvent.hpp>
|
||||
#include <com/sun/star/awt/Rectangle.hpp>
|
||||
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/font.hxx>
|
||||
#include <vcl/region.hxx>
|
||||
#include <tools/mapunit.hxx>
|
||||
|
||||
@@ -27,8 +27,6 @@
|
||||
#include <vcl/dllapi.h>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
class BitmapEx;
|
||||
|
||||
class VCL_DLLPUBLIC AlphaMask final
|
||||
{
|
||||
public:
|
||||
@@ -109,7 +107,6 @@ public:
|
||||
{ return maBitmap.CopyPixel_AlphaOptimized(rRectDst, rRectSrc, rBmpSrc); }
|
||||
|
||||
private:
|
||||
friend class BitmapEx;
|
||||
friend class ::OutputDevice;
|
||||
|
||||
Bitmap maBitmap;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <tools/solar.h>
|
||||
#include <vcl/dllapi.h>
|
||||
#include <vcl/timer.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/animate/AnimationFrame.hxx>
|
||||
|
||||
#define ANIMATION_TIMEOUT_ON_CLICK 2147483647L
|
||||
|
||||
@@ -1,453 +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 .
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_VCL_BITMAPEX_HXX
|
||||
#define INCLUDED_VCL_BITMAPEX_HXX
|
||||
|
||||
#include <vcl/dllapi.h>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/Scanline.hxx>
|
||||
#include <tools/color.hxx>
|
||||
#include <tools/degree.hxx>
|
||||
|
||||
#include <sal/types.h>
|
||||
|
||||
namespace com::sun::star::uno { template <class interface_type> class Reference; }
|
||||
namespace basegfx { class BColorModifierStack; }
|
||||
|
||||
class SAL_WARN_UNUSED VCL_DLLPUBLIC BitmapEx
|
||||
{
|
||||
public:
|
||||
|
||||
BitmapEx();
|
||||
BitmapEx( const BitmapEx& rBitmapEx );
|
||||
BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, Size aSize );
|
||||
BitmapEx(Size aSize, vcl::PixelFormat ePixelFormat);
|
||||
explicit BitmapEx( const Bitmap& rBmp );
|
||||
BitmapEx( const Bitmap& rBmp, const Bitmap& rMask );
|
||||
BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask );
|
||||
BitmapEx( const Bitmap& rBmp, const Color& rTransparentColor );
|
||||
|
||||
BitmapEx& operator=( const BitmapEx& rBitmapEx );
|
||||
BitmapEx& operator=( const Bitmap& rBitmap ) { return operator=(BitmapEx(rBitmap)); }
|
||||
bool operator==( const BitmapEx& rBitmapEx ) const;
|
||||
bool operator!=( const BitmapEx& rBitmapEx ) const { return !(*this==rBitmapEx); }
|
||||
|
||||
bool IsEmpty() const;
|
||||
void SetEmpty();
|
||||
SAL_DLLPRIVATE void Clear();
|
||||
SAL_DLLPRIVATE void ClearAlpha();
|
||||
|
||||
Bitmap GetBitmap( Color aTransparentReplaceColor ) const;
|
||||
/// Gives direct access to the contained bitmap.
|
||||
const Bitmap& GetBitmap() const;
|
||||
|
||||
bool IsAlpha() const;
|
||||
const AlphaMask & GetAlphaMask() const { return maAlphaMask; }
|
||||
|
||||
const Size& GetSizePixel() const { return maBitmapSize; }
|
||||
|
||||
const Size& GetPrefSize() const { return maBitmap.GetPrefSize(); }
|
||||
void SetPrefSize( const Size& rPrefSize ) { maBitmap.SetPrefSize( rPrefSize ); }
|
||||
|
||||
const MapMode& GetPrefMapMode() const { return maBitmap.GetPrefMapMode(); }
|
||||
void SetPrefMapMode( const MapMode& rPrefMapMode ) { maBitmap.SetPrefMapMode( rPrefMapMode ); }
|
||||
|
||||
vcl::PixelFormat getPixelFormat() const
|
||||
{
|
||||
return maBitmap.getPixelFormat();
|
||||
}
|
||||
|
||||
sal_Int64 GetSizeBytes() const;
|
||||
BitmapChecksum GetChecksum() const;
|
||||
|
||||
/** Convert bitmap format
|
||||
|
||||
@param eConversion
|
||||
The format this bitmap should be converted to.
|
||||
|
||||
@return true, if the conversion was completed successfully.
|
||||
*/
|
||||
bool Convert( BmpConversion eConversion );
|
||||
|
||||
/** Crop the bitmap
|
||||
|
||||
@param rRectPixel
|
||||
A rectangle specifying the crop amounts on all four sides of
|
||||
the bitmap. If the upper left corner of the bitmap is assigned
|
||||
(0,0), then this method cuts out the given rectangle from the
|
||||
bitmap. Note that the rectangle is clipped to the bitmap's
|
||||
dimension, i.e. negative left,top rectangle coordinates or
|
||||
exceeding width or height is ignored.
|
||||
|
||||
@return true, if cropping was performed successfully. If
|
||||
nothing had to be cropped, because e.g. the crop rectangle
|
||||
included the bitmap, false is returned, too!
|
||||
*/
|
||||
bool Crop( const tools::Rectangle& rRectPixel );
|
||||
|
||||
/** Expand the bitmap by pixel padding
|
||||
|
||||
@param nDX
|
||||
Number of pixel to pad at the right border of the bitmap
|
||||
|
||||
@param nDY
|
||||
Number of scanlines to pad at the bottom border of the bitmap
|
||||
|
||||
@param bExpandTransparent
|
||||
Whether to expand the transparency color or not.
|
||||
*/
|
||||
void Expand(
|
||||
sal_Int32 nDX, sal_Int32 nDY,
|
||||
bool bExpandTransparent = false );
|
||||
|
||||
/** Copy a rectangular area from another bitmap
|
||||
|
||||
@param rRectDst
|
||||
Destination rectangle in this bitmap. This is clipped to the
|
||||
bitmap dimensions.
|
||||
|
||||
@param rRectSrc
|
||||
Source rectangle in pBmpSrc. This is clipped to the source
|
||||
bitmap dimensions. Note further that no scaling takes place
|
||||
during this copy operation, i.e. only the minimum of source
|
||||
and destination rectangle's width and height are used.
|
||||
|
||||
@param rBmpExSrc
|
||||
The source bitmap to copy from.
|
||||
|
||||
@return true, if the operation completed successfully. false
|
||||
is not only returned when the operation failed, but also if
|
||||
nothing had to be done, e.g. because one of the rectangles are
|
||||
empty.
|
||||
*/
|
||||
bool CopyPixel(
|
||||
const tools::Rectangle& rRectDst,
|
||||
const tools::Rectangle& rRectSrc,
|
||||
const BitmapEx& rBmpExSrc );
|
||||
|
||||
/** Fill the entire bitmap with the given color
|
||||
|
||||
@param rFillColor
|
||||
Color value to use for filling. Set the transparency part of
|
||||
the color to fill the mask.
|
||||
|
||||
@return true, if the operation was completed successfully.
|
||||
*/
|
||||
bool Erase( const Color& rFillColor );
|
||||
|
||||
/** Perform the Invert operation on every pixel
|
||||
|
||||
@return true, if the operation was completed successfully.
|
||||
*/
|
||||
bool Invert();
|
||||
|
||||
/** Mirror the bitmap
|
||||
|
||||
@param nMirrorFlags
|
||||
About which axis (horizontal, vertical, or both) to mirror
|
||||
|
||||
@return true, if the operation was completed successfully.
|
||||
*/
|
||||
bool Mirror( BmpMirrorFlags nMirrorFlags );
|
||||
|
||||
/** Scale the bitmap
|
||||
|
||||
@param rNewSize
|
||||
The resulting size of the scaled bitmap
|
||||
|
||||
@param nScaleFlag
|
||||
The algorithm to be used for scaling
|
||||
|
||||
@return true, if the operation was completed successfully.
|
||||
*/
|
||||
bool Scale(
|
||||
const Size& rNewSize,
|
||||
BmpScaleFlag nScaleFlag = BmpScaleFlag::Default );
|
||||
|
||||
/** Scale the bitmap
|
||||
|
||||
@param rScaleX
|
||||
The scale factor in x direction.
|
||||
|
||||
@param rScaleY
|
||||
The scale factor in y direction.
|
||||
|
||||
@param nScaleFlag
|
||||
The algorithm to be used for scaling
|
||||
|
||||
@return true, if the operation was completed successfully.
|
||||
*/
|
||||
bool Scale(
|
||||
const double& rScaleX,
|
||||
const double& rScaleY,
|
||||
BmpScaleFlag nScaleFlag = BmpScaleFlag::Default );
|
||||
|
||||
/** Rotate bitmap by the specified angle
|
||||
|
||||
@param nAngle10
|
||||
The rotation angle in tenth of a degree. The bitmap is always rotated around its center.
|
||||
|
||||
@param rFillColor
|
||||
The color to use for filling blank areas. During rotation, the
|
||||
bitmap is enlarged such that the whole rotation result fits
|
||||
in. The empty spaces around that rotated original bitmap are
|
||||
then filled with this color.
|
||||
|
||||
@return true, if the operation was completed successfully.
|
||||
*/
|
||||
bool Rotate(
|
||||
Degree10 nAngle10,
|
||||
const Color& rFillColor );
|
||||
|
||||
/** Replace all pixel having the search color with the specified color
|
||||
|
||||
@param rSearchColor
|
||||
Color specifying which pixel should be replaced
|
||||
|
||||
@param rReplaceColor
|
||||
Color to be placed in all changed pixel
|
||||
*/
|
||||
void Replace(
|
||||
const Color& rSearchColor,
|
||||
const Color& rReplaceColor );
|
||||
|
||||
/** Replace all pixel having the search color with the specified color
|
||||
|
||||
@param rSearchColor
|
||||
Color specifying which pixel should be replaced
|
||||
|
||||
@param rReplaceColor
|
||||
Color to be placed in all changed pixel
|
||||
|
||||
@param nTolerance
|
||||
Tolerance value. Specifies the maximal difference between
|
||||
rSearchColor and the individual pixel values, such that the
|
||||
corresponding pixel is still regarded a match.
|
||||
*/
|
||||
SAL_DLLPRIVATE void Replace(
|
||||
const Color& rSearchColor,
|
||||
const Color& rReplaceColor,
|
||||
sal_uInt8 nTolerance );
|
||||
|
||||
/** Replace all pixel having one the search colors with the corresponding replace color
|
||||
|
||||
@param pSearchColors
|
||||
Array of colors specifying which pixel should be replaced
|
||||
|
||||
@param pReplaceColors
|
||||
Array of colors to be placed in all changed pixel
|
||||
|
||||
@param nColorCount
|
||||
Size of the aforementioned color arrays
|
||||
|
||||
@param pTols
|
||||
Tolerance value. Specifies the maximal difference between
|
||||
pSearchColor colors and the individual pixel values, such that
|
||||
the corresponding pixel is still regarded a match.
|
||||
*/
|
||||
void Replace(
|
||||
const Color* pSearchColors,
|
||||
const Color* pReplaceColors,
|
||||
size_t nColorCount );
|
||||
|
||||
/** Replace all pixel having one the search colors with the corresponding replace color
|
||||
|
||||
@param pSearchColors
|
||||
Array of colors specifying which pixel should be replaced
|
||||
|
||||
@param rReplaceColors
|
||||
Array of colors to be placed in all changed pixel
|
||||
|
||||
@param nColorCount
|
||||
Size of the aforementioned color arrays
|
||||
|
||||
@param pTols
|
||||
Tolerance value. Specifies the maximal difference between
|
||||
pSearchColor colors and the individual pixel values, such that
|
||||
the corresponding pixel is still regarded a match.
|
||||
|
||||
@return true, if the operation was completed successfully.
|
||||
*/
|
||||
void Replace(
|
||||
const Color* pSearchColors,
|
||||
const Color* pReplaceColors,
|
||||
size_t nColorCount,
|
||||
sal_uInt8 const * pTols );
|
||||
|
||||
/** Replace transparency with given color.
|
||||
*/
|
||||
void ReplaceTransparency( const Color& rColor );
|
||||
|
||||
/** Get contours in image */
|
||||
tools::Polygon GetContour( bool bContourEdgeDetect, const tools::Rectangle* pWorkRect );
|
||||
|
||||
/** Change various global color characteristics
|
||||
|
||||
@param nLuminancePercent
|
||||
Percent of luminance change, valid range [-100,100]. Values outside this range are clipped to the valid range.
|
||||
|
||||
@param nContrastPercent
|
||||
Percent of contrast change, valid range [-100,100]. Values outside this range are clipped to the valid range.
|
||||
|
||||
@param nChannelRPercent
|
||||
Percent of red channel change, valid range [-100,100]. Values outside this range are clipped to the valid range.
|
||||
|
||||
@param nChannelGPercent
|
||||
Percent of green channel change, valid range [-100,100]. Values outside this range are clipped to the valid range.
|
||||
|
||||
@param nChannelBPercent
|
||||
Percent of blue channel change, valid range [-100,100]. Values outside this range are clipped to the valid range.
|
||||
|
||||
@param fGamma
|
||||
Exponent of the gamma function applied to the bitmap. The
|
||||
value 1.0 results in no change, the valid range is
|
||||
(0.0,10.0]. Values outside this range are regarded as 1.0.
|
||||
|
||||
@param bInvert
|
||||
If true, invert the channel values with the logical 'not' operator
|
||||
|
||||
@param msoBrightness
|
||||
Use the same formula for brightness as used by MSOffice.
|
||||
|
||||
@return true, if the operation was completed successfully.
|
||||
*/
|
||||
bool Adjust(
|
||||
short nLuminancePercent,
|
||||
short nContrastPercent,
|
||||
short nChannelRPercent,
|
||||
short nChannelGPercent,
|
||||
short nChannelBPercent,
|
||||
double fGamma = 1.0,
|
||||
bool bInvert = false,
|
||||
bool msoBrightness = false );
|
||||
|
||||
/** Get alpha at given position
|
||||
|
||||
@param nX
|
||||
integer X-Position in Bitmap
|
||||
|
||||
@param nY
|
||||
integer Y-Position in Bitmap
|
||||
|
||||
@return alpha value in the range of [0 .. 255] where
|
||||
0 is fully transparent, 255 is not transparent
|
||||
*/
|
||||
sal_uInt8 GetAlpha(
|
||||
sal_Int32 nX,
|
||||
sal_Int32 nY) const;
|
||||
|
||||
/** Get pixel color (including alpha) at given position
|
||||
|
||||
@param nX
|
||||
integer X-Position in Bitmap
|
||||
|
||||
@param nY
|
||||
integer Y-Position in Bitmap
|
||||
*/
|
||||
::Color GetPixelColor(
|
||||
sal_Int32 nX,
|
||||
sal_Int32 nY) const;
|
||||
|
||||
/** Create transformed Bitmap
|
||||
|
||||
@param fWidth
|
||||
The target width in pixels
|
||||
|
||||
@param fHeight
|
||||
The target height in pixels
|
||||
|
||||
@param rTransformation
|
||||
The back transformation for each pixel in (0 .. fWidth),(0 .. fHeight) to
|
||||
local pixel coordinates
|
||||
*/
|
||||
[[nodiscard]]
|
||||
BitmapEx TransformBitmapEx(
|
||||
double fWidth,
|
||||
double fHeight,
|
||||
const basegfx::B2DHomMatrix& rTransformation) const;
|
||||
|
||||
/** Create transformed Bitmap
|
||||
|
||||
@param rTransformation
|
||||
The transformation from unit coordinates to the unit range
|
||||
|
||||
@param rVisibleRange
|
||||
The relative visible range in unit coordinates, relative to (0,0,1,1) which
|
||||
defines the whole target area
|
||||
|
||||
@param fMaximumArea
|
||||
A limitation for the maximum size of pixels to use for the result
|
||||
|
||||
The target size of the result bitmap is defined by transforming the given
|
||||
rTargetRange with the given rTransformation; the area of the result is
|
||||
linearly scaled to not exceed the given fMaximumArea
|
||||
|
||||
@return The transformed bitmap
|
||||
*/
|
||||
[[nodiscard]]
|
||||
SAL_DLLPRIVATE BitmapEx getTransformed(
|
||||
const basegfx::B2DHomMatrix& rTransformation,
|
||||
const basegfx::B2DRange& rVisibleRange,
|
||||
double fMaximumArea) const;
|
||||
|
||||
/** Create ColorStack-modified version of this BitmapEx
|
||||
|
||||
@param rBColorModifierStack
|
||||
A ColrModifierStack which defines how each pixel has to be modified
|
||||
*/
|
||||
[[nodiscard]]
|
||||
BitmapEx ModifyBitmapEx( const basegfx::BColorModifierStack& rBColorModifierStack) const;
|
||||
|
||||
SAL_DLLPRIVATE void ChangeColorAlpha( sal_uInt8 cIndexFrom, sal_Int8 nAlphaTo );
|
||||
|
||||
/**
|
||||
* Adds a constant value to the alpha layer
|
||||
*/
|
||||
SAL_DLLPRIVATE void AdjustTransparency( sal_uInt8 cTrans );
|
||||
|
||||
/**
|
||||
* Blends, i.e. multiplies the alpha layer with the new alpha value.
|
||||
*/
|
||||
void BlendAlpha( sal_uInt8 nAlpha );
|
||||
|
||||
|
||||
void CombineMaskOr(Color maskColor, sal_uInt8 nTol);
|
||||
|
||||
/**
|
||||
* Retrieves the color model data we need for the XImageConsumer stuff.
|
||||
*/
|
||||
void GetColorModel(css::uno::Sequence< sal_Int32 >& rRGBPalette,
|
||||
sal_uInt32& rnRedMask, sal_uInt32& rnGreenMask, sal_uInt32& rnBlueMask, sal_uInt32& rnAlphaMask, sal_uInt32& rnTransparencyIndex,
|
||||
sal_uInt32& rnWidth, sal_uInt32& rnHeight, sal_uInt8& rnBitCount);
|
||||
|
||||
SAL_DLLPRIVATE std::shared_ptr<SalBitmap> const & ImplGetBitmapSalBitmap() const { return maBitmap.ImplGetSalBitmap(); }
|
||||
|
||||
private:
|
||||
friend class ImpGraphic;
|
||||
friend class OutputDevice;
|
||||
|
||||
Bitmap maBitmap;
|
||||
AlphaMask maAlphaMask;
|
||||
Size maBitmapSize;
|
||||
};
|
||||
|
||||
#endif // INCLUDED_VCL_BITMAPEX_HXX
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
@@ -32,7 +32,6 @@ class OutputDevice;
|
||||
class MetaAction;
|
||||
class Color;
|
||||
class Bitmap;
|
||||
class BitmapEx;
|
||||
namespace tools {
|
||||
class Polygon;
|
||||
class PolyPolygon;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <com/sun/star/uno/Reference.hxx>
|
||||
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/dllapi.h>
|
||||
|
||||
namespace com::sun::star::awt
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <tools/color.hxx>
|
||||
#include <basegfx/polygon/b2dpolygon.hxx>
|
||||
#include <basegfx/point/b2dpoint.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
namespace vcl::pdf
|
||||
{
|
||||
|
||||
@@ -53,7 +53,6 @@ namespace svl::crypto
|
||||
class SigningContext;
|
||||
}
|
||||
class Bitmap;
|
||||
class BitmapEx;
|
||||
class Gradient;
|
||||
class Hatch;
|
||||
class Wallpaper;
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#define INCLUDED_VCL_VECTORGRAPHICDATA_HXX
|
||||
|
||||
#include <basegfx/range/b2drange.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/BinaryDataContainer.hxx>
|
||||
#include <rtl/ustring.hxx>
|
||||
#include <deque>
|
||||
|
||||
@@ -89,7 +89,6 @@
|
||||
#include <vcl/GraphicExternalLink.hxx>
|
||||
#include <vcl/animate/Animation.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/cairo.hxx>
|
||||
#include <vcl/dllapi.h>
|
||||
#include <vcl/fntstyle.hxx>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <svx/svdograf.hxx>
|
||||
#include <svx/svdview.hxx>
|
||||
#include <tools/color.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
using namespace css;
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
#include <comphelper/propertyvalue.hxx>
|
||||
#include <drawingml/graphicproperties.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/graph.hxx>
|
||||
#include <vcl/bitmap/BitmapMonochromeFilter.hxx>
|
||||
#include <docmodel/uno/UnoComplexColor.hxx>
|
||||
|
||||
@@ -116,6 +116,7 @@
|
||||
#include <tools/stream.hxx>
|
||||
#include <tools/UnitConversion.hxx>
|
||||
#include <unotools/fontdefs.hxx>
|
||||
#include <vcl/alpha.hxx>
|
||||
#include <vcl/cvtgrf.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
#include <vcl/embeddedfontsmanager.hxx>
|
||||
|
||||
@@ -110,7 +110,6 @@
|
||||
#include <vcl/animate/AnimationFrame.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmap/BitmapTypes.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/cairo.hxx>
|
||||
#include <vcl/checksum.hxx>
|
||||
#include <vcl/dllapi.h>
|
||||
|
||||
@@ -112,7 +112,6 @@
|
||||
#include <vcl/animate/AnimationFrame.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmap/BitmapTypes.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/builderpage.hxx>
|
||||
#include <vcl/cairo.hxx>
|
||||
#include <vcl/checksum.hxx>
|
||||
|
||||
@@ -210,7 +210,6 @@ class SvtBroadcaster;
|
||||
enum class ScDBDataPortion;
|
||||
enum class ScSheetEventId;
|
||||
class Bitmap;
|
||||
class BitmapEx;
|
||||
class ScColumnsRange;
|
||||
struct ScFilterEntries;
|
||||
typedef o3tl::sorted_vector<sal_uInt32> ScCondFormatIndexes;
|
||||
|
||||
@@ -124,7 +124,6 @@
|
||||
#include <vcl/animate/AnimationFrame.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmap/BitmapTypes.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/checksum.hxx>
|
||||
#include <vcl/commandevent.hxx>
|
||||
#include <vcl/ctrl.hxx>
|
||||
|
||||
@@ -85,7 +85,6 @@
|
||||
#include <vcl/GraphicExternalLink.hxx>
|
||||
#include <vcl/GraphicObject.hxx>
|
||||
#include <vcl/animate/Animation.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/checksum.hxx>
|
||||
#include <vcl/dllapi.h>
|
||||
#include <comphelper/errcode.hxx>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <scitems.hxx>
|
||||
|
||||
#include <formula/token.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
@@ -89,7 +89,6 @@
|
||||
#include <vcl/EnumContext.hxx>
|
||||
#include <vcl/GraphicObject.hxx>
|
||||
#include <vcl/InterimItemWindow.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/commandevent.hxx>
|
||||
#include <vcl/commandinfoprovider.hxx>
|
||||
#include <vcl/customweld.hxx>
|
||||
|
||||
@@ -116,7 +116,6 @@
|
||||
#include <vcl/animate/AnimationFrame.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/bitmap/BitmapTypes.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/builderpage.hxx>
|
||||
#include <vcl/cairo.hxx>
|
||||
#include <vcl/checksum.hxx>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include <vcl/mapmod.hxx>
|
||||
#include <tools/color.hxx>
|
||||
#include <tools/stream.hxx>
|
||||
#include <tools/fract.hxx>
|
||||
#include <tools/gen.hxx>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <sfx2/ctrlitem.hxx>
|
||||
#include <sfx2/progress.hxx>
|
||||
#include <misc/scopelock.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/customweld.hxx>
|
||||
#include <vcl/weld.hxx>
|
||||
#include <vcl/weldutils.hxx>
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include <cache/SlsPageCache.hxx>
|
||||
#include <cache/SlsCacheContext.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <sdpage.hxx>
|
||||
#include <cppcanvas/vclfactory.hxx>
|
||||
#include <cppuhelper/supportsservice.hxx>
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <mutex>
|
||||
#include <memory>
|
||||
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@
|
||||
#include "SlsBitmapCompressor.hxx"
|
||||
|
||||
#include <tools/stream.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <vcl/filter/PngImageReader.hxx>
|
||||
#include <vcl/filter/PngImageWriter.hxx>
|
||||
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@
|
||||
|
||||
#include <PreviewRenderer.hxx>
|
||||
#include <sdpage.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
namespace sd::slidesorter::view {
|
||||
class SlideSorterView;
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
#include "SlsRequestQueue.hxx"
|
||||
#include <memory>
|
||||
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
namespace sd::slidesorter::cache {
|
||||
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <cache/SlsCacheContext.hxx>
|
||||
#include <vcl/bitmapex.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
#include <memory>
|
||||
|
||||
class Size;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user