From 88730cdae3520b18fc073dc59bd0ed660e15d6b4 Mon Sep 17 00:00:00 2001
From: Chris Sherlock <chris.sherlock79@gmail.com>
Date: Sat, 6 Feb 2016 21:03:41 +1100
Subject: vcl: bmpacc.hxx -> bitmapaccess.hxx
Change-Id: I4bb19d6103c4a6a902d86b62a857e3478493924c
---
avmedia/source/gstreamer/gstframegrabber.cxx | 2 +-
avmedia/source/opengl/oglframegrabber.cxx | 2 +-
avmedia/source/vlc/vlcframegrabber.cxx | 2 +-
canvas/source/cairo/cairo_canvasbitmap.cxx | 2 +-
canvas/source/cairo/cairo_canvashelper.cxx | 2 +-
canvas/source/directx/dx_vcltools.cxx | 2 +-
canvas/source/vcl/bitmapbackbuffer.cxx | 2 +-
canvas/source/vcl/canvasbitmap.cxx | 2 +-
canvas/source/vcl/canvasbitmaphelper.cxx | 2 +-
canvas/source/vcl/canvashelper.cxx | 2 +-
canvas/source/vcl/canvashelper_texturefill.cxx | 2 +-
canvas/source/vcl/impltools.cxx | 2 +-
chart2/source/view/main/3DChartObjects.cxx | 2 +-
cppcanvas/qa/extras/emfplus/emfplus.cxx | 2 +-
cui/source/dialogs/colorpicker.cxx | 2 +-
cui/source/tabpages/tpbitmap.cxx | 2 +-
.../source/primitive3d/sdrdecompositiontools3d.cxx | 2 +-
.../source/processor3d/zbufferprocessor3d.cxx | 2 +-
drawinglayer/source/texture/texture3d.cxx | 2 +-
filter/source/flash/swfwriter1.cxx | 2 +-
filter/source/graphicfilter/egif/giflzwc.hxx | 2 +-
filter/source/graphicfilter/eps/eps.cxx | 2 +-
filter/source/graphicfilter/etiff/etiff.cxx | 2 +-
filter/source/graphicfilter/icgm/bitmap.hxx | 2 +-
filter/source/graphicfilter/ieps/ieps.cxx | 2 +-
filter/source/graphicfilter/ipbm/ipbm.cxx | 2 +-
filter/source/graphicfilter/ipcd/ipcd.cxx | 2 +-
filter/source/graphicfilter/ipcx/ipcx.cxx | 2 +-
filter/source/graphicfilter/ipict/ipict.cxx | 2 +-
filter/source/graphicfilter/ipsd/ipsd.cxx | 2 +-
filter/source/graphicfilter/iras/iras.cxx | 2 +-
filter/source/graphicfilter/itga/itga.cxx | 2 +-
filter/source/graphicfilter/itiff/itiff.cxx | 2 +-
filter/source/msfilter/msdffimp.cxx | 2 +-
filter/source/msfilter/svdfppt.cxx | 2 +-
filter/source/pdf/pdfexport.cxx | 2 +-
forms/source/component/imgprod.cxx | 2 +-
include/vcl/bitmapaccess.hxx | 430 +++++++++++++++++++++
include/vcl/bmpacc.hxx | 430 ---------------------
lotuswordpro/source/filter/lwpbackgroundstuff.cxx | 2 +-
reportdesign/source/ui/dlg/Condition.cxx | 2 +-
sc/source/filter/excel/excimp8.cxx | 2 +-
sc/source/filter/excel/xeescher.cxx | 2 +-
sc/source/ui/sidebar/CellBorderUpdater.cxx | 2 +-
sd/inc/pch/precompiled_sd.hxx | 2 +-
sd/source/filter/eppt/eppt.cxx | 2 +-
sd/source/filter/eppt/epptso.cxx | 2 +-
sd/source/filter/eppt/pptx-epptbase.cxx | 2 +-
sd/source/filter/html/htmlex.cxx | 2 +-
sd/source/filter/ppt/pptin.cxx | 2 +-
sd/source/ui/dlg/vectdlg.cxx | 2 +-
.../ui/slidesorter/cache/SlsBitmapFactory.cxx | 2 +-
sd/source/ui/slidesorter/view/SlsFramePainter.cxx | 2 +-
sd/source/ui/table/TableDesignPane.cxx | 2 +-
svtools/source/graphic/grfmgr2.cxx | 2 +-
svtools/source/graphic/transformer.cxx | 2 +-
svx/inc/pch/precompiled_svxcore.hxx | 2 +-
svx/source/dialog/dlgctrl.cxx | 2 +-
svx/source/sdr/primitive2d/sdrprimitivetools.cxx | 2 +-
svx/source/svdraw/svdetc.cxx | 2 +-
svx/source/svdraw/svdfmtf.cxx | 2 +-
svx/source/svdraw/svdhdl.cxx | 2 +-
svx/source/svdraw/svdoashp.cxx | 2 +-
svx/source/tbxctrls/tbcontrl.cxx | 2 +-
svx/source/tbxctrls/tbxcolorupdate.cxx | 2 +-
svx/source/xoutdev/_xoutbmp.cxx | 2 +-
svx/source/xoutdev/xattrbmp.cxx | 2 +-
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 +-
sw/source/core/view/viewsh.cxx | 2 +-
vcl/inc/BitmapSymmetryCheck.hxx | 2 +-
vcl/inc/canvasbitmap.hxx | 2 +-
vcl/inc/pch/precompiled_vcl.hxx | 2 +-
vcl/qa/cppunit/BitmapTest.cxx | 2 +-
vcl/qa/cppunit/canvasbitmaptest.cxx | 2 +-
vcl/qa/cppunit/outdev.cxx | 2 +-
vcl/source/bitmap/BitmapProcessor.cxx | 2 +-
vcl/source/bitmap/BitmapScaleConvolution.cxx | 2 +-
vcl/source/bitmap/bitmapscalesuper.cxx | 2 +-
vcl/source/filter/igif/decode.hxx | 2 +-
vcl/source/filter/igif/gifread.hxx | 2 +-
vcl/source/filter/ixbm/xbmread.hxx | 2 +-
vcl/source/filter/ixpm/xpmread.cxx | 2 +-
vcl/source/filter/jpeg/JpegReader.cxx | 2 +-
vcl/source/filter/jpeg/JpegWriter.cxx | 2 +-
vcl/source/filter/jpeg/jpeg.cxx | 2 +-
vcl/source/filter/wmf/winmtf.hxx | 2 +-
vcl/source/gdi/alpha.cxx | 2 +-
vcl/source/gdi/bitmap.cxx | 2 +-
vcl/source/gdi/bitmap3.cxx | 2 +-
vcl/source/gdi/bitmap4.cxx | 2 +-
vcl/source/gdi/bitmapex.cxx | 2 +-
vcl/source/gdi/bmpacc.cxx | 2 +-
vcl/source/gdi/bmpacc2.cxx | 2 +-
vcl/source/gdi/bmpacc3.cxx | 2 +-
vcl/source/gdi/bmpfast.cxx | 2 +-
vcl/source/gdi/dibtools.cxx | 2 +-
vcl/source/gdi/impvect.cxx | 2 +-
vcl/source/gdi/octree.cxx | 2 +-
vcl/source/gdi/pdfwriter_impl.cxx | 2 +-
vcl/source/gdi/pdfwriter_impl2.cxx | 2 +-
vcl/source/gdi/pngread.cxx | 2 +-
vcl/source/gdi/pngwrite.cxx | 2 +-
vcl/source/gdi/print2.cxx | 2 +-
vcl/source/gdi/salmisc.cxx | 2 +-
vcl/source/helper/canvasbitmap.cxx | 2 +-
vcl/source/helper/canvastools.cxx | 2 +-
vcl/source/image/ImageArrayData.cxx | 2 +-
vcl/source/image/ImplImage.cxx | 2 +-
vcl/source/image/ImplImageList.cxx | 2 +-
vcl/source/opengl/OpenGLContext.cxx | 2 +-
vcl/source/opengl/OpenGLHelper.cxx | 2 +-
vcl/source/outdev/bitmap.cxx | 2 +-
vcl/source/outdev/text.cxx | 2 +-
vcl/source/outdev/transparent.cxx | 2 +-
vcl/unx/generic/gdi/salgdi2.cxx | 2 +-
vcl/unx/generic/print/genpspgraphics.cxx | 2 +-
vcl/unx/generic/window/salframe.cxx | 2 +-
vcl/win/gdi/salgdi2.cxx | 2 +-
vcl/workben/svptest.cxx | 2 +-
vcl/workben/vcldemo.cxx | 2 +-
120 files changed, 548 insertions(+), 548 deletions(-)
create mode 100644 include/vcl/bitmapaccess.hxx
delete mode 100644 include/vcl/bmpacc.hxx
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index 9608e7e36c36..9a37b06402a9 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -27,7 +27,7 @@
#include <gst/video/gstvideosink.h>
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <string>
diff --git a/avmedia/source/opengl/oglframegrabber.cxx b/avmedia/source/opengl/oglframegrabber.cxx
index 083cb60be74b..3b71b23c87f1 100644
--- a/avmedia/source/opengl/oglframegrabber.cxx
+++ b/avmedia/source/opengl/oglframegrabber.cxx
@@ -13,7 +13,7 @@
#include <vcl/bitmapex.hxx>
#include <vcl/graph.hxx>
#include <vcl/salbtype.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index 850b72f1cb3d..da663e1fdcae 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -22,7 +22,7 @@
#include <osl/conditn.hxx>
#include <osl/file.hxx>
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/pngread.hxx>
#include <avmedia/mediawindow.hxx>
#include <unotools/tempfile.hxx>
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 947d1857c16c..2e5f88626040 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -22,7 +22,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <canvas/canvastools.hxx>
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index fa766268e931..f35cc6346464 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -47,7 +47,7 @@
#include <rtl/math.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/virdev.hxx>
diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx
index 38462b4690cd..3b032cfd06ca 100644
--- a/canvas/source/directx/dx_vcltools.cxx
+++ b/canvas/source/directx/dx_vcltools.cxx
@@ -25,7 +25,7 @@
#include <tools/diagnose_ex.h>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/canvastools.hxx>
#include "dx_impltools.hxx"
diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx
index c746b189b433..96404f46d74f 100644
--- a/canvas/source/vcl/bitmapbackbuffer.cxx
+++ b/canvas/source/vcl/bitmapbackbuffer.cxx
@@ -21,7 +21,7 @@
#include <osl/mutex.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/svapp.hxx>
#include "bitmapbackbuffer.hxx"
diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx
index a254f00f99a4..562e8a46196b 100644
--- a/canvas/source/vcl/canvasbitmap.cxx
+++ b/canvas/source/vcl/canvasbitmap.cxx
@@ -21,7 +21,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include "canvasbitmap.hxx"
diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx
index 28ab1aaf93b0..6f5340f74127 100644
--- a/canvas/source/vcl/canvasbitmaphelper.cxx
+++ b/canvas/source/vcl/canvasbitmaphelper.cxx
@@ -29,7 +29,7 @@
#include <tools/diagnose_ex.h>
#include <tools/poly.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/window.hxx>
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index ec736cb57e59..82ee7704da22 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -43,7 +43,7 @@
#include <tools/diagnose_ex.h>
#include <tools/poly.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/window.hxx>
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index 4f9d6000d8a6..09910edacbea 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -43,7 +43,7 @@
#include <tools/diagnose_ex.h>
#include <tools/poly.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/virdev.hxx>
#include <vcl/window.hxx>
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 49afca1d78dd..a6e1d7eab563 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -40,7 +40,7 @@
#include <rtl/math.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/metric.hxx>
#include <vcl/salbtype.hxx>
diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx
index 737ebf4066c3..50ca93944910 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -13,7 +13,7 @@
#include <vcl/opengl/GLMHelper.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
namespace chart {
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index f2a41cf57812..5eeb5f34d7c3 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -17,7 +17,7 @@
#include <sfx2/sfxbasemodel.hxx>
#include <test/unoapi_test.hxx>
#include <unotest/macros_test.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/pngwrite.hxx>
using namespace com::sun::star;
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index b5b1fdbf35b8..6c8d01514596 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -33,7 +33,7 @@
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
#include <vcl/field.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/decoview.hxx>
#include <vcl/svapp.hxx>
#include <vcl/builderfactory.hxx>
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 460fef5b15a9..3026a8679797 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -28,7 +28,7 @@
#include <unotools/localfilehelper.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include <svx/dialmgr.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/settings.hxx>
#include <svx/dialogs.hrc>
diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
index 08be61105710..46bf8645c992 100644
--- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
@@ -27,7 +27,7 @@
#include <vcl/vclenum.hxx>
#include <drawinglayer/attribute/fillgraphicattribute.hxx>
#include <drawinglayer/attribute/sdrfillgraphicattribute.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <basegfx/polygon/b3dpolypolygontools.hxx>
#include <drawinglayer/primitive3d/textureprimitive3d.hxx>
#include <drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx>
diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index f29a04b19c50..0334c911ba76 100644
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
@@ -19,7 +19,7 @@
#include <drawinglayer/processor3d/zbufferprocessor3d.hxx>
#include <basegfx/raster/bpixelraster.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <basegfx/raster/rasterconvert3d.hxx>
#include <basegfx/raster/bzpixelraster.hxx>
#include <drawinglayer/attribute/materialattribute3d.hxx>
diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx
index 0f74d37d06d6..547ea0e0bde2 100644
--- a/drawinglayer/source/texture/texture3d.cxx
+++ b/drawinglayer/source/texture/texture3d.cxx
@@ -18,7 +18,7 @@
*/
#include <drawinglayer/texture/texture3d.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <drawinglayer/primitive3d/hatchtextureprimitive3d.hxx>
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 2c98e937dc18..200d424897f4 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -24,7 +24,7 @@
#include "swfwriter.hxx"
#include <vcl/metaact.hxx>
#include <vcl/gdimtf.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/virdev.hxx>
#include <vcl/metric.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/filter/source/graphicfilter/egif/giflzwc.hxx b/filter/source/graphicfilter/egif/giflzwc.hxx
index 6159e55673d1..bfe9784803d3 100644
--- a/filter/source/graphicfilter/egif/giflzwc.hxx
+++ b/filter/source/graphicfilter/egif/giflzwc.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_EGIF_GIFLZWC_HXX
#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_EGIF_GIFLZWC_HXX
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
// - GIFLZWCompressor -
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 16edc2e77148..33aa48214f5c 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -24,7 +24,7 @@
#include <vcl/svapp.hxx>
#include <vcl/metaact.hxx>
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/region.hxx>
#include <vcl/metric.hxx>
#include <vcl/font.hxx>
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index caee92ef46fc..4bf1b2d1ae01 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -21,7 +21,7 @@
#include <vcl/graph.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <svl/solar.hrc>
#include <vcl/fltcall.hxx>
#include <vcl/FilterConfigItem.hxx>
diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx b/filter/source/graphicfilter/icgm/bitmap.hxx
index 96639d12ebcd..6614a0e571a4 100644
--- a/filter/source/graphicfilter/icgm/bitmap.hxx
+++ b/filter/source/graphicfilter/icgm/bitmap.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_BITMAP_HXX
#include "cgm.hxx"
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
class CGM;
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 8b4383221e89..b904bc37b2a4 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -29,7 +29,7 @@
#include <vcl/metaact.hxx>
#include <vcl/virdev.hxx>
#include <vcl/cvtgrf.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/tempfile.hxx>
#include <osl/process.h>
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index a7f5d1137ffc..ec13ccc3c55d 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -21,7 +21,7 @@
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
//============================ PBMReader ==================================
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index 35c351f4c91b..87b3d950731c 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -20,7 +20,7 @@
#include "rtl/alloc.h"
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/svapp.hxx>
#include <vcl/fltcall.hxx>
#include <svl/solar.hrc>
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index 6710f5d5f782..b5cef0429929 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -19,7 +19,7 @@
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
class FilterConfigItem;
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 576aff5d2e28..22d7e96fbec7 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -19,7 +19,7 @@
#include <string.h>
#include <osl/thread.h>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/graph.hxx>
#include <tools/poly.hxx>
#include <tools/fract.hxx>
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index a8ec8d5e337b..74f3349a5696 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -19,7 +19,7 @@
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/outdev.hxx>
#include <tools/fract.hxx>
#include <memory>
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 814166874585..45d62927a229 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -19,7 +19,7 @@
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
class FilterConfigItem;
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index e36146b571db..ad3960e03c56 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -19,7 +19,7 @@
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
class FilterConfigItem;
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index d4f283bbf1b6..b8f8368548bd 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -21,7 +21,7 @@
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/animate.hxx>
#include <tools/fract.hxx>
#include "lzwdecom.hxx"
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 6cb3b25e83a6..a6ee333a38af 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -63,7 +63,7 @@
#include <vcl/graphicfilter.hxx>
#include <tools/urlobj.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <sot/storage.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/docfilt.hxx>
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index f36c3c2e0874..42c47b89a79f 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -80,7 +80,7 @@
#include <editeng/ulspitem.hxx>
#include <editeng/lrspitem.hxx>
#include <vcl/metric.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <svx/svditer.hxx>
#include <svx/svdoedge.hxx>
#include <svx/sxekitm.hxx>
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index eaa699b0edac..1a749eb67637 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -31,7 +31,7 @@
#include "vcl/metaact.hxx"
#include "vcl/gdimtf.hxx"
#include "vcl/jobset.hxx"
-#include "vcl/bmpacc.hxx"
+#include "vcl/bitmapaccess.hxx"
#include "vcl/svapp.hxx"
#include "toolkit/awt/vclxdevice.hxx"
#include <vcl/FilterConfigItem.hxx>
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index 6fce82364851..0c66a21d1c96 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -20,7 +20,7 @@
#include "imgprod.hxx"
#include "services.hxx"
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/svapp.hxx>
#include <unotools/ucbstreamhelper.hxx>
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
new file mode 100644
index 000000000000..4e9c44f81578
--- /dev/null
+++ b/include/vcl/bitmapaccess.hxx
@@ -0,0 +1,430 @@
+/* -*- 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_BMPACC_HXX
+#define INCLUDED_VCL_BMPACC_HXX
+
+#include <tools/solar.h>
+#include <vcl/dllapi.h>
+#include <vcl/salbtype.hxx>
+#include <vcl/bitmap.hxx>
+
+// - Access functions -
+typedef BitmapColor (*FncGetPixel)(ConstScanline pScanline, long nX, const ColorMask& rMask);
+typedef void (*FncSetPixel)(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+
+// - BitmapInfoAccess -
+class VCL_DLLPUBLIC BitmapInfoAccess
+{
+ friend class BitmapReadAccess;
+
+public:
+ BitmapInfoAccess(Bitmap& rBitmap);
+ virtual ~BitmapInfoAccess();
+
+ inline bool operator!() const;
+
+ inline long Width() const;
+ inline long Height() const;
+
+ inline bool IsTopDown() const;
+ inline bool IsBottomUp() const;
+
+ inline sal_uLong GetScanlineFormat() const;
+ inline sal_uLong GetScanlineSize() const;
+
+ inline sal_uInt16 GetBitCount() const;
+ inline BitmapColor GetBestMatchingColor(const BitmapColor& rBitmapColor);
+
+ inline bool HasPalette() const;
+ inline const BitmapPalette& GetPalette() const;
+ inline sal_uInt16 GetPaletteEntryCount() const;
+ inline const BitmapColor& GetPaletteColor(sal_uInt16 nColor) const;
+ inline const BitmapColor& GetBestPaletteColor(const BitmapColor& rBitmapColor) const;
+ sal_uInt16 GetBestPaletteIndex(const BitmapColor& rBitmapColor) const;
+
+ inline ColorMask& GetColorMask() const;
+
+private:
+ BitmapInfoAccess()
+ {}
+
+ BitmapInfoAccess(const BitmapInfoAccess&)
+ {}
+
+ BitmapInfoAccess& operator=(const BitmapInfoAccess&)
+ {
+ return *this;
+ }
+
+protected:
+ Bitmap maBitmap;
+ BitmapBuffer* mpBuffer;
+ ColorMask maColorMask;
+ BitmapAccessMode mnAccessMode;
+
+ SAL_DLLPRIVATE void ImplCreate(Bitmap& rBitmap);
+ SAL_DLLPRIVATE void ImplDestroy();
+
+protected:
+ BitmapInfoAccess(Bitmap& rBitmap, BitmapAccessMode nMode);
+};
+
+// - BitmapReadAccess -
+class VCL_DLLPUBLIC BitmapReadAccess : public BitmapInfoAccess
+{
+ friend class BitmapWriteAccess;
+
+public:
+ BitmapReadAccess(Bitmap& rBitmap);
+ virtual ~BitmapReadAccess();
+
+ inline Scanline GetBuffer() const;
+ inline Scanline GetScanline( long nY ) const;
+
+ inline BitmapColor GetPixelFromData( const sal_uInt8* pData, long nX ) const;
+ inline void SetPixelOnData( sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor );
+
+ inline BitmapColor GetPixel( long nY, long nX ) const;
+ inline BitmapColor GetColor( long nY, long nX ) const;
+ inline sal_uInt8 GetPixelIndex( long nY, long nX ) const;
+ inline sal_uInt8 GetLuminance( long nY, long nX ) const;
+
+ /** Get the interpolated color at coordinates fY, fX; if outside, return rFallback */
+ BitmapColor GetInterpolatedColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const;
+
+ /** Get the color at coordinates fY, fX; if outside, return rFallback. Automatically does the correct
+ inside/outside checks, e.g. static_cast< sal_uInt32 >(-0.25) *is* 0, not -1 and has to be outside */
+ BitmapColor GetColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const;
+
+private:
+
+ BitmapReadAccess()
+ {}
+
+ BitmapReadAccess(const BitmapReadAccess&)
+ : BitmapInfoAccess()
+ {}
+
+ BitmapReadAccess& operator=(const BitmapReadAccess&)
+ {
+ return *this;
+ }
+
+protected:
+ Scanline* mpScanBuf;
+ FncGetPixel mFncGetPixel;
+ FncSetPixel mFncSetPixel;
+
+ SAL_DLLPRIVATE void ImplInitScanBuffer( Bitmap& rBitmap );
+ SAL_DLLPRIVATE void ImplClearScanBuffer();
+ SAL_DLLPRIVATE bool ImplSetAccessPointers( sal_uLong nFormat );
+
+public:
+
+ SAL_DLLPRIVATE BitmapBuffer* ImplGetBitmapBuffer() const
+ {
+ return mpBuffer;
+ }
+
+ static BitmapColor GetPixelFor_1BIT_MSB_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_1BIT_LSB_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_4BIT_MSN_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_4BIT_LSN_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_8BIT_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_8BIT_TC_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_16BIT_TC_MSB_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_16BIT_TC_LSB_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_24BIT_TC_BGR(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_24BIT_TC_RGB(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_24BIT_TC_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_32BIT_TC_ABGR(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_32BIT_TC_ARGB(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_32BIT_TC_BGRA(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_32BIT_TC_RGBA(ConstScanline pScanline, long nX, const ColorMask& rMask);
+ static BitmapColor GetPixelFor_32BIT_TC_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask);
+
+ static void SetPixelFor_1BIT_MSB_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_1BIT_LSB_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_4BIT_MSN_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_4BIT_LSN_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_8BIT_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_8BIT_TC_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_16BIT_TC_MSB_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_16BIT_TC_LSB_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_24BIT_TC_BGR(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_24BIT_TC_RGB(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_24BIT_TC_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_32BIT_TC_ABGR(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_32BIT_TC_ARGB(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_32BIT_TC_BGRA(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_32BIT_TC_RGBA(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+ static void SetPixelFor_32BIT_TC_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
+
+protected:
+ BitmapReadAccess(Bitmap& rBitmap, BitmapAccessMode nMode);
+};
+
+// - BitmapWriteAccess -
+class VCL_DLLPUBLIC BitmapWriteAccess : public BitmapReadAccess
+{
+public:
+ BitmapWriteAccess(Bitmap& rBitmap);
+ virtual ~BitmapWriteAccess();
+
+ void CopyScanline(long nY, const BitmapReadAccess& rReadAcc);
+ void CopyScanline(long nY,
+ ConstScanline aSrcScanline,
+ sal_uLong nSrcScanlineFormat,
+ sal_uLong nSrcScanlineSize);
+
+ void CopyBuffer( const BitmapReadAccess& rReadAcc );
+
+ inline void SetPalette(const BitmapPalette& rPalette);
+ inline void SetPaletteEntryCount(sal_uInt16 nCount);
+ inline void SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor);
+
+ inline void SetPixel(long nY, long nX, const BitmapColor& rBitmapColor);
+ inline void SetPixelIndex(long nY, long nX, sal_uInt8 cIndex);
+
+ void SetLineColor(const Color& rColor);
+
+ void SetFillColor();
+ void SetFillColor(const Color& rColor);
+
+ void Erase(const Color& rColor);
+
+ void DrawLine(const Point& rStart, const Point& rEnd);
+
+ void FillRect(const Rectangle& rRect);
+ void DrawRect(const Rectangle& rRect);
+
+private:
+
+ std::unique_ptr<BitmapColor> mpLineColor;
+ std::unique_ptr<BitmapColor> mpFillColor;
+
+ BitmapWriteAccess()
+ {}
+
+ BitmapWriteAccess(const BitmapWriteAccess&)
+ : BitmapReadAccess()
+ {}
+
+ BitmapWriteAccess& operator=(const BitmapWriteAccess&)
+ {
+ return *this;
+ }
+};
+
+// - Inlines -
+inline bool BitmapInfoAccess::operator!() const
+{
+ return mpBuffer == nullptr;
+}
+
+inline long BitmapInfoAccess::Width() const
+{
+ return mpBuffer ? mpBuffer->mnWidth : 0L;
+}
+
+inline long BitmapInfoAccess::Height() const
+{
+ return mpBuffer ? mpBuffer->mnHeight : 0L;
+}
+
+inline bool BitmapInfoAccess::IsTopDown() const
+{
+ assert(mpBuffer && "Access is not valid!");
+
+ return mpBuffer && (BMP_SCANLINE_ADJUSTMENT(mpBuffer->mnFormat) == BMP_FORMAT_TOP_DOWN);
+}
+
+inline bool BitmapInfoAccess::IsBottomUp() const
+{
+ return !IsTopDown();
+}
+
+inline sal_uLong BitmapInfoAccess::GetScanlineFormat() const
+{
+ assert(mpBuffer && "Access is not valid!");
+
+ return mpBuffer ? BMP_SCANLINE_FORMAT(mpBuffer->mnFormat) : 0UL;
+}
+
+inline sal_uLong BitmapInfoAccess::GetScanlineSize() const
+{
+ assert(mpBuffer && "Access is not valid!");
+
+ return mpBuffer ? mpBuffer->mnScanlineSize : 0UL;
+}
+
+inline sal_uInt16 BitmapInfoAccess::GetBitCount() const
+{
+ assert(mpBuffer && "Access is not valid!");
+
+ return mpBuffer ? mpBuffer->mnBitCount : 0;
+}
+
+inline BitmapColor BitmapInfoAccess::GetBestMatchingColor(const BitmapColor& rBitmapColor)
+{
+ if (HasPalette())
+ return BitmapColor((sal_uInt8) GetBestPaletteIndex(rBitmapColor));
+ else
+ return rBitmapColor;
+}
+
+inline bool BitmapInfoAccess::HasPalette() const
+{
+ assert(mpBuffer && "Access is not valid!");
+
+ return mpBuffer && !!mpBuffer->maPalette;
+}
+
+inline const BitmapPalette& BitmapInfoAccess::GetPalette() const
+{
+ assert(mpBuffer && "Access is not valid!");
+
+ return mpBuffer->maPalette;
+}
+
+inline sal_uInt16 BitmapInfoAccess::GetPaletteEntryCount() const
+{
+ assert(HasPalette() && "Bitmap has no palette!");
+
+ return HasPalette() ? mpBuffer->maPalette.GetEntryCount() : 0;
+}
+
+inline const BitmapColor& BitmapInfoAccess::GetPaletteColor( sal_uInt16 nColor ) const
+{
+ assert(mpBuffer && "Access is not valid!");
+ assert(HasPalette() && "Bitmap has no palette!");
+
+ return mpBuffer->maPalette[nColor];
+}
+
+inline const BitmapColor& BitmapInfoAccess::GetBestPaletteColor(const BitmapColor& rBitmapColor) const
+{
+ return GetPaletteColor(GetBestPaletteIndex(rBitmapColor));
+}
+
+
+
+inline ColorMask& BitmapInfoAccess::GetColorMask() const
+{
+ assert(mpBuffer && "Access is not valid!");
+
+ return mpBuffer->maColorMask;
+}
+
+inline Scanline BitmapReadAccess::GetBuffer() const
+{
+ assert(mpBuffer && "Access is not valid!");
+
+ return mpBuffer ? mpBuffer->mpBits : nullptr;
+}
+
+inline Scanline BitmapReadAccess::GetScanline(long nY) const
+{
+ assert(mpBuffer && mpScanBuf && "Access is not valid!");
+ assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!");
+
+ return mpScanBuf[nY];
+}
+
+inline BitmapColor BitmapReadAccess::GetPixel(long nY, long nX) const
+{
+ assert(mpBuffer && mpScanBuf && "Access is not valid!");
+ assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!");
+ assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!");
+
+ return mFncGetPixel(mpScanBuf[nY], nX, maColorMask );
+}
+
+inline sal_uInt8 BitmapReadAccess::GetPixelIndex(long nY, long nX) const
+{
+ return GetPixel(nY, nX).GetBlueOrIndex();
+}
+
+inline BitmapColor BitmapReadAccess::GetPixelFromData(const sal_uInt8* pData, long nX) const
+{
+ assert(pData && "Access is not valid!");
+
+ return mFncGetPixel( pData, nX, maColorMask );
+}
+
+inline void BitmapReadAccess::SetPixelOnData(sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor)
+{
+ assert(pData && "Access is not valid!");
+
+ mFncSetPixel(pData, nX, rBitmapColor, maColorMask);
+}
+
+inline BitmapColor BitmapReadAccess::GetColor(long nY, long nX) const
+{
+ if (HasPalette())
+ return mpBuffer->maPalette[GetPixelIndex(nY, nX)];
+ else
+ return GetPixel(nY, nX);
+}
+
+inline sal_uInt8 BitmapReadAccess::GetLuminance(long nY, long nX) const
+{
+ return GetColor(nY, nX).GetLuminance();
+}
+
+inline void BitmapWriteAccess::SetPalette(const BitmapPalette& rPalette)
+{
+ assert(mpBuffer && "Access is not valid!");
+
+ mpBuffer->maPalette = rPalette;
+}
+
+inline void BitmapWriteAccess::SetPaletteEntryCount(sal_uInt16 nCount)
+{
+ assert(mpBuffer && "Access is not valid!");
+
+ mpBuffer->maPalette.SetEntryCount(nCount);
+}
+
+inline void BitmapWriteAccess::SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor)
+{
+ assert(mpBuffer && "Access is not valid!");
+ assert(HasPalette() && "Bitmap has no palette!");
+
+ mpBuffer->maPalette[nColor] = rBitmapColor;
+}
+
+inline void BitmapWriteAccess::SetPixel(long nY, long nX, const BitmapColor& rBitmapColor)
+{
+ assert(mpBuffer && "Access is not valid!");
+ assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!");
+ assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!");
+
+ mFncSetPixel(mpScanBuf[nY], nX, rBitmapColor, maColorMask);
+}
+
+inline void BitmapWriteAccess::SetPixelIndex(long nY, long nX, sal_uInt8 cIndex)
+{
+ SetPixel(nY, nX, BitmapColor(cIndex));
+}
+
+#endif // INCLUDED_VCL_BMPACC_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx
deleted file mode 100644
index 4e9c44f81578..000000000000
--- a/include/vcl/bmpacc.hxx
+++ /dev/null
@@ -1,430 +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_BMPACC_HXX
-#define INCLUDED_VCL_BMPACC_HXX
-
-#include <tools/solar.h>
-#include <vcl/dllapi.h>
-#include <vcl/salbtype.hxx>
-#include <vcl/bitmap.hxx>
-
-// - Access functions -
-typedef BitmapColor (*FncGetPixel)(ConstScanline pScanline, long nX, const ColorMask& rMask);
-typedef void (*FncSetPixel)(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
-
-// - BitmapInfoAccess -
-class VCL_DLLPUBLIC BitmapInfoAccess
-{
- friend class BitmapReadAccess;
-
-public:
- BitmapInfoAccess(Bitmap& rBitmap);
- virtual ~BitmapInfoAccess();
-
- inline bool operator!() const;
-
- inline long Width() const;
- inline long Height() const;
-
- inline bool IsTopDown() const;
- inline bool IsBottomUp() const;
-
- inline sal_uLong GetScanlineFormat() const;
- inline sal_uLong GetScanlineSize() const;
-
- inline sal_uInt16 GetBitCount() const;
- inline BitmapColor GetBestMatchingColor(const BitmapColor& rBitmapColor);
-
- inline bool HasPalette() const;
- inline const BitmapPalette& GetPalette() const;
- inline sal_uInt16 GetPaletteEntryCount() const;
- inline const BitmapColor& GetPaletteColor(sal_uInt16 nColor) const;
- inline const BitmapColor& GetBestPaletteColor(const BitmapColor& rBitmapColor) const;
- sal_uInt16 GetBestPaletteIndex(const BitmapColor& rBitmapColor) const;
-
- inline ColorMask& GetColorMask() const;
-
-private:
- BitmapInfoAccess()
- {}
-
- BitmapInfoAccess(const BitmapInfoAccess&)
- {}
-
- BitmapInfoAccess& operator=(const BitmapInfoAccess&)
- {
- return *this;
- }
-
-protected:
- Bitmap maBitmap;
- BitmapBuffer* mpBuffer;
- ColorMask maColorMask;
- BitmapAccessMode mnAccessMode;
-
- SAL_DLLPRIVATE void ImplCreate(Bitmap& rBitmap);
- SAL_DLLPRIVATE void ImplDestroy();
-
-protected:
- BitmapInfoAccess(Bitmap& rBitmap, BitmapAccessMode nMode);
-};
-
-// - BitmapReadAccess -
-class VCL_DLLPUBLIC BitmapReadAccess : public BitmapInfoAccess
-{
- friend class BitmapWriteAccess;
-
-public:
- BitmapReadAccess(Bitmap& rBitmap);
- virtual ~BitmapReadAccess();
-
- inline Scanline GetBuffer() const;
- inline Scanline GetScanline( long nY ) const;
-
- inline BitmapColor GetPixelFromData( const sal_uInt8* pData, long nX ) const;
- inline void SetPixelOnData( sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor );
-
- inline BitmapColor GetPixel( long nY, long nX ) const;
- inline BitmapColor GetColor( long nY, long nX ) const;
- inline sal_uInt8 GetPixelIndex( long nY, long nX ) const;
- inline sal_uInt8 GetLuminance( long nY, long nX ) const;
-
- /** Get the interpolated color at coordinates fY, fX; if outside, return rFallback */
- BitmapColor GetInterpolatedColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const;
-
- /** Get the color at coordinates fY, fX; if outside, return rFallback. Automatically does the correct
- inside/outside checks, e.g. static_cast< sal_uInt32 >(-0.25) *is* 0, not -1 and has to be outside */
- BitmapColor GetColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const;
-
-private:
-
- BitmapReadAccess()
- {}
-
- BitmapReadAccess(const BitmapReadAccess&)
- : BitmapInfoAccess()
- {}
-
- BitmapReadAccess& operator=(const BitmapReadAccess&)
- {
- return *this;
- }
-
-protected:
- Scanline* mpScanBuf;
- FncGetPixel mFncGetPixel;
- FncSetPixel mFncSetPixel;
-
- SAL_DLLPRIVATE void ImplInitScanBuffer( Bitmap& rBitmap );
- SAL_DLLPRIVATE void ImplClearScanBuffer();
- SAL_DLLPRIVATE bool ImplSetAccessPointers( sal_uLong nFormat );
-
-public:
-
- SAL_DLLPRIVATE BitmapBuffer* ImplGetBitmapBuffer() const
- {
- return mpBuffer;
- }
-
- static BitmapColor GetPixelFor_1BIT_MSB_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_1BIT_LSB_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_4BIT_MSN_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_4BIT_LSN_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_8BIT_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_8BIT_TC_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_16BIT_TC_MSB_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_16BIT_TC_LSB_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_24BIT_TC_BGR(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_24BIT_TC_RGB(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_24BIT_TC_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_32BIT_TC_ABGR(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_32BIT_TC_ARGB(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_32BIT_TC_BGRA(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_32BIT_TC_RGBA(ConstScanline pScanline, long nX, const ColorMask& rMask);
- static BitmapColor GetPixelFor_32BIT_TC_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask);
-
- static void SetPixelFor_1BIT_MSB_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_1BIT_LSB_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_4BIT_MSN_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_4BIT_LSN_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_8BIT_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_8BIT_TC_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_16BIT_TC_MSB_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_16BIT_TC_LSB_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_24BIT_TC_BGR(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_24BIT_TC_RGB(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_24BIT_TC_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_32BIT_TC_ABGR(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_32BIT_TC_ARGB(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_32BIT_TC_BGRA(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_32BIT_TC_RGBA(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
- static void SetPixelFor_32BIT_TC_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
-
-protected:
- BitmapReadAccess(Bitmap& rBitmap, BitmapAccessMode nMode);
-};
-
-// - BitmapWriteAccess -
-class VCL_DLLPUBLIC BitmapWriteAccess : public BitmapReadAccess
-{
-public:
- BitmapWriteAccess(Bitmap& rBitmap);
- virtual ~BitmapWriteAccess();
-
- void CopyScanline(long nY, const BitmapReadAccess& rReadAcc);
- void CopyScanline(long nY,
- ConstScanline aSrcScanline,
- sal_uLong nSrcScanlineFormat,
- sal_uLong nSrcScanlineSize);
-
- void CopyBuffer( const BitmapReadAccess& rReadAcc );
-
- inline void SetPalette(const BitmapPalette& rPalette);
- inline void SetPaletteEntryCount(sal_uInt16 nCount);
- inline void SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor);
-
- inline void SetPixel(long nY, long nX, const BitmapColor& rBitmapColor);
- inline void SetPixelIndex(long nY, long nX, sal_uInt8 cIndex);
-
- void SetLineColor(const Color& rColor);
-
- void SetFillColor();
- void SetFillColor(const Color& rColor);
-
- void Erase(const Color& rColor);
-
- void DrawLine(const Point& rStart, const Point& rEnd);
-
- void FillRect(const Rectangle& rRect);
- void DrawRect(const Rectangle& rRect);
-
-private:
-
- std::unique_ptr<BitmapColor> mpLineColor;
- std::unique_ptr<BitmapColor> mpFillColor;
-
- BitmapWriteAccess()
- {}
-
- BitmapWriteAccess(const BitmapWriteAccess&)
- : BitmapReadAccess()
- {}
-
- BitmapWriteAccess& operator=(const BitmapWriteAccess&)
- {
- return *this;
- }
-};
-
-// - Inlines -
-inline bool BitmapInfoAccess::operator!() const
-{
- return mpBuffer == nullptr;
-}
-
-inline long BitmapInfoAccess::Width() const
-{
- return mpBuffer ? mpBuffer->mnWidth : 0L;
-}
-
-inline long BitmapInfoAccess::Height() const
-{
- return mpBuffer ? mpBuffer->mnHeight : 0L;
-}
-
-inline bool BitmapInfoAccess::IsTopDown() const
-{
- assert(mpBuffer && "Access is not valid!");
-
- return mpBuffer && (BMP_SCANLINE_ADJUSTMENT(mpBuffer->mnFormat) == BMP_FORMAT_TOP_DOWN);
-}
-
-inline bool BitmapInfoAccess::IsBottomUp() const
-{
- return !IsTopDown();
-}
-
-inline sal_uLong BitmapInfoAccess::GetScanlineFormat() const
-{
- assert(mpBuffer && "Access is not valid!");
-
- return mpBuffer ? BMP_SCANLINE_FORMAT(mpBuffer->mnFormat) : 0UL;
-}
-
-inline sal_uLong BitmapInfoAccess::GetScanlineSize() const
-{
- assert(mpBuffer && "Access is not valid!");
-
- return mpBuffer ? mpBuffer->mnScanlineSize : 0UL;
-}
-
-inline sal_uInt16 BitmapInfoAccess::GetBitCount() const
-{
- assert(mpBuffer && "Access is not valid!");
-
- return mpBuffer ? mpBuffer->mnBitCount : 0;
-}
-
-inline BitmapColor BitmapInfoAccess::GetBestMatchingColor(const BitmapColor& rBitmapColor)
-{
- if (HasPalette())
- return BitmapColor((sal_uInt8) GetBestPaletteIndex(rBitmapColor));
- else
- return rBitmapColor;
-}
-
-inline bool BitmapInfoAccess::HasPalette() const
-{
- assert(mpBuffer && "Access is not valid!");
-
- return mpBuffer && !!mpBuffer->maPalette;
-}
-
-inline const BitmapPalette& BitmapInfoAccess::GetPalette() const
-{
- assert(mpBuffer && "Access is not valid!");
-
- return mpBuffer->maPalette;
-}
-
-inline sal_uInt16 BitmapInfoAccess::GetPaletteEntryCount() const
-{
- assert(HasPalette() && "Bitmap has no palette!");
-
- return HasPalette() ? mpBuffer->maPalette.GetEntryCount() : 0;
-}
-
-inline const BitmapColor& BitmapInfoAccess::GetPaletteColor( sal_uInt16 nColor ) const
-{
- assert(mpBuffer && "Access is not valid!");
- assert(HasPalette() && "Bitmap has no palette!");
-
- return mpBuffer->maPalette[nColor];
-}
-
-inline const BitmapColor& BitmapInfoAccess::GetBestPaletteColor(const BitmapColor& rBitmapColor) const
-{
- return GetPaletteColor(GetBestPaletteIndex(rBitmapColor));
-}
-
-
-
-inline ColorMask& BitmapInfoAccess::GetColorMask() const
-{
- assert(mpBuffer && "Access is not valid!");
-
- return mpBuffer->maColorMask;
-}
-
-inline Scanline BitmapReadAccess::GetBuffer() const
-{
- assert(mpBuffer && "Access is not valid!");
-
- return mpBuffer ? mpBuffer->mpBits : nullptr;
-}
-
-inline Scanline BitmapReadAccess::GetScanline(long nY) const
-{
- assert(mpBuffer && mpScanBuf && "Access is not valid!");
- assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!");
-
- return mpScanBuf[nY];
-}
-
-inline BitmapColor BitmapReadAccess::GetPixel(long nY, long nX) const
-{
- assert(mpBuffer && mpScanBuf && "Access is not valid!");
- assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!");
- assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!");
-
- return mFncGetPixel(mpScanBuf[nY], nX, maColorMask );
-}
-
-inline sal_uInt8 BitmapReadAccess::GetPixelIndex(long nY, long nX) const
-{
- return GetPixel(nY, nX).GetBlueOrIndex();
-}
-
-inline BitmapColor BitmapReadAccess::GetPixelFromData(const sal_uInt8* pData, long nX) const
-{
- assert(pData && "Access is not valid!");
-
- return mFncGetPixel( pData, nX, maColorMask );
-}
-
-inline void BitmapReadAccess::SetPixelOnData(sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor)
-{
- assert(pData && "Access is not valid!");
-
- mFncSetPixel(pData, nX, rBitmapColor, maColorMask);
-}
-
-inline BitmapColor BitmapReadAccess::GetColor(long nY, long nX) const
-{
- if (HasPalette())
- return mpBuffer->maPalette[GetPixelIndex(nY, nX)];
- else
- return GetPixel(nY, nX);
-}
-
-inline sal_uInt8 BitmapReadAccess::GetLuminance(long nY, long nX) const
-{
- return GetColor(nY, nX).GetLuminance();
-}
-
-inline void BitmapWriteAccess::SetPalette(const BitmapPalette& rPalette)
-{
- assert(mpBuffer && "Access is not valid!");
-
- mpBuffer->maPalette = rPalette;
-}
-
-inline void BitmapWriteAccess::SetPaletteEntryCount(sal_uInt16 nCount)
-{
- assert(mpBuffer && "Access is not valid!");
-
- mpBuffer->maPalette.SetEntryCount(nCount);
-}
-
-inline void BitmapWriteAccess::SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor)
-{
- assert(mpBuffer && "Access is not valid!");
- assert(HasPalette() && "Bitmap has no palette!");
-
- mpBuffer->maPalette[nColor] = rBitmapColor;
-}
-
-inline void BitmapWriteAccess::SetPixel(long nY, long nX, const BitmapColor& rBitmapColor)
-{
- assert(mpBuffer && "Access is not valid!");
- assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!");
- assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!");
-
- mFncSetPixel(mpScanBuf[nY], nX, rBitmapColor, maColorMask);
-}
-
-inline void BitmapWriteAccess::SetPixelIndex(long nY, long nX, sal_uInt8 cIndex)
-{
- SetPixel(nY, nX, BitmapColor(cIndex));
-}
-
-#endif // INCLUDED_VCL_BMPACC_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
index 9df07b1c3a3d..a32d5d22e70c 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
@@ -65,7 +65,7 @@
#include <tools/stream.hxx>
#include <vcl/dibtools.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <svx/xbitmap.hxx>
void LwpBackgroundStuff::Read(LwpObjectStream* pStrm)
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index f5b47a5fec43..142be8abb782 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -43,7 +43,7 @@
#include <svtools/imgdef.hxx>
#include <unotools/pathoptions.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/settings.hxx>
#include <tools/diagnose_ex.h>
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index b5e7e1b9ede5..0f59686d62b5 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -51,7 +51,7 @@
#include <svx/xflclit.hxx>
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <sot/exchange.hxx>
#include <svl/stritem.hxx>
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 7c7d4d88b542..a835a43c7b97 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -37,7 +37,7 @@
#include <set>
#include <rtl/ustrbuf.h>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdocapt.hxx>
#include <editeng/outlobj.hxx>
diff --git a/sc/source/ui/sidebar/CellBorderUpdater.cxx b/sc/source/ui/sidebar/CellBorderUpdater.cxx
index a7c3d5c13684..80fb3461f4a8 100644
--- a/sc/source/ui/sidebar/CellBorderUpdater.cxx
+++ b/sc/source/ui/sidebar/CellBorderUpdater.cxx
@@ -18,7 +18,7 @@
*/
#include "CellBorderUpdater.hxx"
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index cff3d760dea6..454dfe354839 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -83,7 +83,7 @@
#include <sal/types.h>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/button.hxx>
#include <vcl/checksum.hxx>
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 9e93b31f2bff..5d7da71a2797 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -22,7 +22,7 @@
#include <tools/globname.hxx>
#include <tools/poly.hxx>
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/gradient.hxx>
#include <rtl/ustring.hxx>
#include <tools/stream.hxx>
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 901a1c0354d4..3addfbfc5194 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -27,7 +27,7 @@
#include "epptdef.hxx"
#include "escherex.hxx"
#include <tools/poly.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/gradient.hxx>
#include <vcl/gfxlink.hxx>
#include <tools/stream.hxx>
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 1dc3cd1aa2e5..3695252facd3 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -25,7 +25,7 @@
#include <tools/poly.hxx>
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/gradient.hxx>
#include <vcl/virdev.hxx>
#include <rtl/ustring.hxx>
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 85d962ca1a96..9bbe92cc5071 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -65,7 +65,7 @@
#include <svx/svdogrp.hxx>
#include <svx/svdotable.hxx>
#include <tools/urlobj.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <svtools/sfxecode.hxx>
#include <com/sun/star/beans/PropertyState.hpp>
#include <tools/resmgr.hxx>
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 4d4d96510419..844ae34c0b43 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -67,7 +67,7 @@
#include <svx/svdogrp.hxx>
#include "propread.hxx"
#include <cusshow.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include "customshowlist.hxx"
#include "sddll.hxx"
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 9a016f3b33ef..9b4e191e78c1 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -26,7 +26,7 @@
#include "sdmod.hxx"
#include "sdiocmpt.hxx"
#include "vectdlg.hxx"
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/metaact.hxx>
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
index 7ad3ea278097..934536b5e070 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
@@ -28,7 +28,7 @@
#include <svx/svdtypes.hxx>
#include <svx/svdpage.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/pngwrite.hxx>
namespace sd { namespace slidesorter { namespace view {
diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
index 638a215e7c95..f1c0140697aa 100644
--- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
@@ -19,7 +19,7 @@
#include "SlsFramePainter.hxx"
#include <vcl/outdev.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
namespace sd { namespace slidesorter { namespace view {
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 2bd52b51a924..2720f6370af4 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -27,7 +27,7 @@
#include <comphelper/processfactory.hxx>
#include <sfx2/viewfrm.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/layout.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 54376d43269e..42dcb619262a 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -21,7 +21,7 @@
#include <cstdlib>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <tools/poly.hxx>
#include <vcl/outdev.hxx>
#include <vcl/window.hxx>
diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx
index 46fe571ab296..eddfaa705b57 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ -28,7 +28,7 @@
#include <svl/solar.hrc>
#include <vcl/salbtype.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <com/sun/star/text/GraphicCrop.hpp>
#include "graphic.hxx"
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index 70a6671d8aed..40a0e322b4f7 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -104,7 +104,7 @@
#include <vcl/animate.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/builder.hxx>
#include <vcl/button.hxx>
#include <vcl/checksum.hxx>
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index d1b9a485f61a..20f70ec86a26 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -45,7 +45,7 @@
#include <svx/svdopath.hxx>
#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
#include <svx/sdr/contact/displayinfo.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <svx/xbtmpit.hxx>
#define OUTPUT_DRAWMODE_COLOR (DrawModeFlags::Default)
diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index 78a27d92fc92..31758b6d8a7a 100644
--- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
@@ -18,7 +18,7 @@
*/
#include <sdr/primitive2d/sdrprimitivetools.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <osl/mutex.hxx>
#include <vcl/lazydelete.hxx>
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 90c3383825b3..cc4fa7e16103 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -29,7 +29,7 @@
#include "svx/svdviter.hxx"
#include <svx/svdview.hxx>
#include <svx/svdoutl.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <editeng/editdata.hxx>
#include <editeng/eeitem.hxx>
#include <svl/itemset.hxx>
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 0f44f35cd274..0067d86f80cd 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -63,7 +63,7 @@
#include <basegfx/polygon/b2dpolygonclipper.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/xfltrit.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <svx/xflbmtit.hxx>
#include <svx/xflbstit.hxx>
#include <svx/svdpntv.hxx>
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 12815c00f023..058f7bdd67e4 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -29,7 +29,7 @@
#include <vcl/settings.hxx>
#include <vcl/virdev.hxx>
#include <tools/poly.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <svx/sxekitm.hxx>
#include "svx/svdstr.hrc"
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index e69eaa4854a5..1038d3f3fd9c 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -73,7 +73,7 @@
#include <svx/xflgrit.hxx>
#include <svx/xflhtit.hxx>
#include <svx/xbtmpit.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <svx/svdview.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index b544df07f90c..fa1416489350 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -25,7 +25,7 @@
#include <svl/eitem.hxx>
#include <svl/itemset.hxx>
#include <vcl/toolbox.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/menubtn.hxx>
#include <svtools/valueset.hxx>
#include <svtools/ctrlbox.hxx>
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 37076ad7a534..c0f199aebfc8 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -23,7 +23,7 @@
#include <svx/xdef.hxx>
#include <vcl/toolbox.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/settings.hxx>
#include <tools/debug.hxx>
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 3825ffbf9021..90e11b12094b 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -20,7 +20,7 @@
#include <sal/config.h>
#include <tools/poly.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/virdev.hxx>
#include <vcl/wrkwin.hxx>
#include <svl/solar.hrc>
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index d4ce5bf63753..e86cb4aafc63 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -37,7 +37,7 @@
#include <svx/xbitmap.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <vcl/salbtype.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/dibtools.hxx>
#include <libxml/xmlwriter.h>
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2e43da1c9a56..f21037037d0a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -67,7 +67,7 @@
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/document/XImporter.hpp>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/svapp.hxx>
#include <unotest/assertion_traits.hxx>
#include <unotools/fltrcfg.hxx>
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 6483c0217596..ecd8d671c8c4 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -60,7 +60,7 @@
#include <accmap.hxx>
#include <vcl/bitmapex.hxx>
#include <svtools/colorcfg.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/alpha.hxx>
#include <svtools/accessibilityoptions.hxx>
#include <accessibilityoptions.hxx>
diff --git a/vcl/inc/BitmapSymmetryCheck.hxx b/vcl/inc/BitmapSymmetryCheck.hxx
index 586b498ec6ea..c6a02fa83a7f 100644
--- a/vcl/inc/BitmapSymmetryCheck.hxx
+++ b/vcl/inc/BitmapSymmetryCheck.hxx
@@ -12,7 +12,7 @@
#define INCLUDED_VCL_INC_BITMAPSYMMETRYCHECK_HXX
#include <vcl/bitmap.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
class VCL_DLLPUBLIC BitmapSymmetryCheck
{
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index 024232b46067..a278b240947f 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/rendering/XBitmapPalette.hpp>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
namespace vcl
{
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 5b1302cbf3c7..4d79b7caac3b 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -130,7 +130,7 @@
#include <vcl/alpha.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/button.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/configsettings.hxx>
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index 7813adbcff73..7455b4b2bdf2 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -15,7 +15,7 @@
#include <unordered_map>
#include <vcl/bitmap.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/virdev.hxx>
#include <rtl/strbuf.hxx>
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index ae47526b2405..8b79f650decc 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -36,7 +36,7 @@
#include "vcl/canvastools.hxx"
#include "vcl/dialog.hxx"
#include "vcl/outdev.hxx"
-#include "vcl/bmpacc.hxx"
+#include "vcl/bitmapaccess.hxx"
#include "vcl/virdev.hxx"
#include "vcl/bitmapex.hxx"
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index a32ee7d3fd94..4a447701b0b3 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -12,7 +12,7 @@
#include <vcl/virdev.hxx>
#include <vcl/salbtype.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/wrkwin.hxx>
#include <tools/stream.hxx>
diff --git a/vcl/source/bitmap/BitmapProcessor.cxx b/vcl/source/bitmap/BitmapProcessor.cxx
index bdc7b489bf33..4d1500049592 100644
--- a/vcl/source/bitmap/BitmapProcessor.cxx
+++ b/vcl/source/bitmap/BitmapProcessor.cxx
@@ -9,7 +9,7 @@
*/
#include <vcl/BitmapProcessor.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <basegfx/color/bcolortools.hxx>
BitmapEx BitmapProcessor::createLightImage(const BitmapEx& rBitmapEx)
diff --git a/vcl/source/bitmap/BitmapScaleConvolution.cxx b/vcl/source/bitmap/BitmapScaleConvolution.cxx
index a596603f827e..abdc475d45cb 100644
--- a/vcl/source/bitmap/BitmapScaleConvolution.cxx
+++ b/vcl/source/bitmap/BitmapScaleConvolution.cxx
@@ -20,7 +20,7 @@
#include "BitmapScaleConvolution.hxx"
#include "ResampleKernel.hxx"
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <osl/diagnose.h>
#include <algorithm>
diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx b/vcl/source/bitmap/bitmapscalesuper.cxx
index c0b53be8b124..33645f618129 100644
--- a/vcl/source/bitmap/bitmapscalesuper.cxx
+++ b/vcl/source/bitmap/bitmapscalesuper.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/bitmapscalesuper.hxx>
#include <algorithm>
diff --git a/vcl/source/filter/igif/decode.hxx b/vcl/source/filter/igif/decode.hxx
index 93840f1ade1b..d4a99a71d240 100644
--- a/vcl/source/filter/igif/decode.hxx
+++ b/vcl/source/filter/igif/decode.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_SOURCE_FILTER_IGIF_DECODE_HXX
#define INCLUDED_VCL_SOURCE_FILTER_IGIF_DECODE_HXX
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
struct GIFLZWTableEntry;
diff --git a/vcl/source/filter/igif/gifread.hxx b/vcl/source/filter/igif/gifread.hxx
index 25120aaf710e..5ac60cc183b7 100644
--- a/vcl/source/filter/igif/gifread.hxx
+++ b/vcl/source/filter/igif/gifread.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_SOURCE_FILTER_IGIF_GIFREAD_HXX
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#ifdef _GIFPRIVATE
diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx
index 3794a374ca4b..52082c22ada5 100644
--- a/vcl/source/filter/ixbm/xbmread.hxx
+++ b/vcl/source/filter/ixbm/xbmread.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_SOURCE_FILTER_IXBM_XBMREAD_HXX
#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#ifdef _XBMPRIVATE
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index cfc7956f33cd..931629879787 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/graph.hxx>
#include "rgbtable.hxx"
#define _XPMPRIVATE
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx
index 78e818d8d8da..eb019128c10e 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -24,7 +24,7 @@
#include <jerror.h>
#include "JpegReader.hxx"
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graphicfilter.hxx>
#include <tools/fract.hxx>
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 38c65a504027..94632167e003 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -24,7 +24,7 @@
#include <jerror.h>
#include "JpegWriter.hxx"
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx
index b2e46720790d..c3769870aa3f 100644
--- a/vcl/source/filter/jpeg/jpeg.cxx
+++ b/vcl/source/filter/jpeg/jpeg.cxx
@@ -21,7 +21,7 @@
#include "JpegWriter.hxx"
#include "jpeg.hxx"
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index 23ce3ad5e3b3..0d0f96b74a34 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -25,7 +25,7 @@
#include <vcl/graph.hxx>
#include <basegfx/tools/b2dclipstate.hxx>
#include <vcl/font.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/lineinfo.hxx>
#include <vcl/fltcall.hxx>
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx
index 371f044633d5..f3217b295f84 100644
--- a/vcl/source/gdi/alpha.cxx
+++ b/vcl/source/gdi/alpha.cxx
@@ -18,7 +18,7 @@
*/
#include <tools/debug.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <tools/color.hxx>
#include <vcl/alpha.hxx>
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index d0f266626256..f182eb23be15 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -23,7 +23,7 @@
#include <tools/poly.hxx>
#include <tools/rc.h>
#include <vcl/salbtype.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/outdev.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 12efd66ae8b5..9251af18a766 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -20,7 +20,7 @@
#include <math.h>
#include <stdlib.h>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapscalesuper.hxx>
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index 2b5723cc1af7..8174c3afdd02 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <osl/diagnose.h>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/bitmap.hxx>
#define S2(a,b) { long t; if( ( t = b - a ) < 0 ) { a += t; b -= t; } }
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 7af0f149016c..c98acddcac0f 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -32,7 +32,7 @@
#include <vcl/dibtools.hxx>
#include <vcl/pngread.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/virdev.hxx>
#include <vcl/settings.hxx>
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index 74edb56856a4..b1d59820ba15 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -19,7 +19,7 @@
#include <vcl/salbtype.hxx>
#include <vcl/bitmap.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <impbmp.hxx>
diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/gdi/bmpacc2.cxx
index 286ea8fca26a..9d447500af59 100644
--- a/vcl/source/gdi/bmpacc2.cxx
+++ b/vcl/source/gdi/bmpacc2.cxx
@@ -18,7 +18,7 @@
*/
#include <vcl/salbtype.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
BitmapColor BitmapReadAccess::GetPixelFor_1BIT_MSB_PAL(ConstScanline pScanline, long nX, const ColorMask&)
{
diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx
index 5d680c76ba72..754a4bb6cc53 100644
--- a/vcl/source/gdi/bmpacc3.cxx
+++ b/vcl/source/gdi/bmpacc3.cxx
@@ -22,7 +22,7 @@
#include <vcl/salbtype.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/region.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <bmpfast.hxx>
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 76b2aa54d750..bed0528b8a00 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -19,7 +19,7 @@
#include <bmpfast.hxx>
#include <tools/debug.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#define FAST_ARGB_BGRA
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index afb0a64bfd2a..a1b05157fadb 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -27,7 +27,7 @@
#include <tools/stream.hxx>
#include <tools/fract.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/outdev.hxx>
#include <memory>
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 1fce7910b23f..4e496f7862fa 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -18,7 +18,7 @@
*/
#include <stdlib.h>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <tools/poly.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index d65e012ae3a1..e56f3d3d647e 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -19,7 +19,7 @@
#include <limits.h>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include "octree.hxx"
#include "impoctree.hxx"
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 3ab051d63670..22f32eb2ad10 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -51,7 +51,7 @@
#include <tools/urlobj.hxx>
#include <tools/zcodec.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/image.hxx>
#include <vcl/lineinfo.hxx>
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 8e47b843b136..bad799439e6c 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -23,7 +23,7 @@
#include "vcl/virdev.hxx"
#include "vcl/gdimtf.hxx"
#include "vcl/metaact.hxx"
-#include "vcl/bmpacc.hxx"
+#include "vcl/bitmapaccess.hxx"
#include "vcl/graph.hxx"
#include "svdata.hxx"
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 60b8d033479c..1077d68a5742 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -24,7 +24,7 @@
#include <rtl/alloc.h>
#include <tools/zcodec.hxx>
#include <tools/stream.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/svapp.hxx>
#include <vcl/alpha.hxx>
#include <osl/endian.h>
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index f7c7ed8b6675..f4eb63912490 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.cxx
@@ -25,7 +25,7 @@
#include <rtl/alloc.h>
#include <tools/zcodec.hxx>
#include <tools/stream.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/svapp.hxx>
#include <vcl/alpha.hxx>
#include <osl/endian.h>
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 84acd47b3036..d7056bc897e8 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -33,7 +33,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/print.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <print.h>
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index 6141b2aae55e..1754a9a905b6 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/salbtype.hxx>
#include <bmpfast.hxx>
#include <osl/diagnose.h>
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index bd09b4c41346..6d594b30a638 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -28,7 +28,7 @@
#include <tools/diagnose_ex.h>
#include <canvasbitmap.hxx>
#include <vcl/canvastools.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/svapp.hxx>
#include <algorithm>
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index 3b76ab42a617..ec023935a860 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -52,7 +52,7 @@
#include <rtl/uuid.h>
#include <vcl/salbtype.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/bitmapex.hxx>
#include <canvasbitmap.hxx>
diff --git a/vcl/source/image/ImageArrayData.cxx b/vcl/source/image/ImageArrayData.cxx
index d7b3bbbcf0ba..cee50461dd82 100644
--- a/vcl/source/image/ImageArrayData.cxx
+++ b/vcl/source/image/ImageArrayData.cxx
@@ -21,7 +21,7 @@
#include <vcl/bitmapex.hxx>
#include <vcl/alpha.hxx>
#include <vcl/window.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/virdev.hxx>
#include <vcl/image.hxx>
#include <vcl/settings.hxx>
diff --git a/vcl/source/image/ImplImage.cxx b/vcl/source/image/ImplImage.cxx
index 4b9fba12666d..52e5083e8372 100644
--- a/vcl/source/image/ImplImage.cxx
+++ b/vcl/source/image/ImplImage.cxx
@@ -21,7 +21,7 @@
#include <vcl/bitmapex.hxx>
#include <vcl/alpha.hxx>
#include <vcl/window.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/virdev.hxx>
#include <vcl/image.hxx>
#include <vcl/settings.hxx>
diff --git a/vcl/source/image/ImplImageList.cxx b/vcl/source/image/ImplImageList.cxx
index bc137fc9e2e8..56750f5d7cf1 100644
--- a/vcl/source/image/ImplImageList.cxx
+++ b/vcl/source/image/ImplImageList.cxx
@@ -21,7 +21,7 @@
#include <vcl/bitmapex.hxx>
#include <vcl/alpha.hxx>
#include <vcl/window.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/virdev.hxx>
#include <vcl/image.hxx>
#include <vcl/settings.hxx>
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index d40564a3cea9..8c18d591cb75 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -16,7 +16,7 @@
#include <vcl/sysdata.hxx>
#include <vcl/pngwrite.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/graph.hxx>
#include <osl/thread.hxx>
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index f98acbef27d9..1ef72473ad1d 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -17,7 +17,7 @@
#include <rtl/ustring.hxx>
#include <config_folders.h>
#include <vcl/salbtype.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <memory>
#include <vcl/pngwrite.hxx>
#include <vcl/graph.hxx>
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 4c125c3768db..52aec2948db5 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -21,7 +21,7 @@
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 810d5b50413b..3f134f4931c0 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -27,7 +27,7 @@
#include <vcl/textrectinfo.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/controllayout.hxx>
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index 6d60524ece91..040c717bfa6f 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -24,7 +24,7 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <memory>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/outdev.hxx>
#include <vcl/settings.hxx>
#include <vcl/virdev.hxx>
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 0ac44aae0e67..3d1481cde4c2 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -36,7 +36,7 @@
#include "unx/printergfx.hxx"
-#include "vcl/bmpacc.hxx"
+#include "vcl/bitmapaccess.hxx"
#include <outdata.hxx>
void X11SalGraphics::CopyScreenArea( Display* pDisplay,
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 580c0ff3d923..85b6f17cfe3b 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -34,7 +34,7 @@
#include <comphelper/string.hxx>
#include <i18nlangtag/mslangid.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/jobdata.hxx>
#include <vcl/printerinfomanager.hxx>
#include <vcl/settings.hxx>
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 4b496d67bff7..533582fc8216 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -33,7 +33,7 @@
#include "vcl/layout.hxx"
#include "vcl/printerinfomanager.hxx"
#include "vcl/settings.hxx"
-#include "vcl/bmpacc.hxx"
+#include "vcl/bitmapaccess.hxx"
#include "vcl/opengl/OpenGLContext.hxx"
#include <prex.h>
diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index a73724a855dd..49dedcc2b339 100644
--- a/vcl/win/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
@@ -31,7 +31,7 @@
#include <win/salframe.h>
#include "vcl/salbtype.hxx"
-#include "vcl/bmpacc.hxx"
+#include "vcl/bitmapaccess.hxx"
#include "outdata.hxx"
#include "salgdiimpl.hxx"
#include "opengl/win/gdiimpl.hxx"
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 2bb8f4318876..1610fb3d3633 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -32,7 +32,7 @@
#include <vcl/gradient.hxx>
#include <vcl/lineinfo.hxx>
#include <vcl/bitmap.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/metric.hxx>
#include <vcl/vclptr.hxx>
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index aa5140fad08c..889db52d08a9 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -35,7 +35,7 @@
#include <vcl/pngwrite.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/salbtype.hxx>
-#include <vcl/bmpacc.hxx>
+#include <vcl/bitmapaccess.hxx>
#include <vcl/help.hxx>
#include <vcl/menu.hxx>
--
cgit