summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2020-12-19 01:09:27 +1100
committerTomaž Vajngerl <quikee@gmail.com>2020-12-24 09:40:16 +0100
commit17aea7c41c95186c03c173a8c6f26cd2ebce4c54 (patch)
tree36c0743c40f3a85467247c585431682334ef3279 /canvas
parentd117d402853ee6c103142f0d0ccdb7cd4b8b8d05 (diff)
vcl: move access functions into appropriate bitmap access files
Split class functions into BitmapInfoAccess.cxx, BitmapReadAccess.cxx and BitmapWriteAccess.cxx Split header files into BitmapInfoAccess.hxx and BitmapReadAccess.hxx Change-Id: I7dcbe1d26c5b64d297658a6b809c93d7ad7f053d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108039 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'canvas')
-rw-r--r--canvas/inc/pch/precompiled_vclcanvas.hxx5
-rw-r--r--canvas/source/directx/dx_vcltools.cxx2
-rw-r--r--canvas/source/vcl/canvashelper.cxx2
3 files changed, 5 insertions, 4 deletions
diff --git a/canvas/inc/pch/precompiled_vclcanvas.hxx b/canvas/inc/pch/precompiled_vclcanvas.hxx
index b31a1cd02792..797c16e3b354 100644
--- a/canvas/inc/pch/precompiled_vclcanvas.hxx
+++ b/canvas/inc/pch/precompiled_vclcanvas.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-12-01 16:34:48 using:
+ Generated on 2020-12-23 06:21:15 using:
./bin/update_pch canvas vclcanvas --cutoff=1 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -21,6 +21,7 @@
*/
#if PCH_LEVEL >= 1
+#include <cstdlib>
#include <memory>
#include <tuple>
#include <boost/cast.hpp>
@@ -33,9 +34,9 @@
#include <sal/log.hxx>
#include <vcl/BitmapAlphaClampFilter.hxx>
#include <vcl/BitmapMonochromeFilter.hxx>
+#include <vcl/BitmapReadAccess.hxx>
#include <vcl/BitmapTools.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/bitmapaccess.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/dibtools.hxx>
diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx
index 6309ebaaacb3..968b15b1dca3 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/bitmapaccess.hxx>
+#include <vcl/BitmapReadAccess.hxx>
#include <vcl/canvastools.hxx>
#include "dx_impltools.hxx"
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 8930f8fccb80..1f95b900592f 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -38,7 +38,7 @@
#include <tools/diagnose_ex.h>
#include <tools/poly.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/bitmapaccess.hxx>
+#include <vcl/BitmapReadAccess.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/BitmapAlphaClampFilter.hxx>