summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2019-04-16 22:59:35 +0900
committerTomaž Vajngerl <quikee@gmail.com>2019-04-17 02:35:01 +0200
commit976ad787b5243d3365a829cb0ddd2f4e8eddd0c6 (patch)
tree214813ce27e67b2d6b14a408d4946b31b8ba3d73
parentf6a64f9bdce16cc18bb086b0de894fba7e1538c3 (diff)
move BitmapAccessMode enum from salbtype to its own file
First plan was to move it to bitmapaccess.hxx, but that would add dependency for the backends, which only need BitmapAccessMode. Change-Id: Id8ed980207da5b0c7d4de48d82446b33f6b76b13 Reviewed-on: https://gerrit.libreoffice.org/70827 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
-rw-r--r--include/vcl/BitmapAccessMode.hxx32
-rw-r--r--include/vcl/bitmapaccess.hxx6
-rw-r--r--include/vcl/salbtype.hxx8
3 files changed, 37 insertions, 9 deletions
diff --git a/include/vcl/BitmapAccessMode.hxx b/include/vcl/BitmapAccessMode.hxx
new file mode 100644
index 000000000000..66cc2b56bcd9
--- /dev/null
+++ b/include/vcl/BitmapAccessMode.hxx
@@ -0,0 +1,32 @@
+/* -*- 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_BITMAPACCESSMODE_HXX
+#define INCLUDED_VCL_BITMAPACCESSMODE_HXX
+
+enum class BitmapAccessMode
+{
+ Info,
+ Read,
+ Write
+};
+
+#endif // INCLUDED_VCL_BITMAPACCESSMODE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
index d7b1f2838bad..db426fa3e4e2 100644
--- a/include/vcl/bitmapaccess.hxx
+++ b/include/vcl/bitmapaccess.hxx
@@ -21,13 +21,15 @@
#define INCLUDED_VCL_BMPACC_HXX
#include <vcl/dllapi.h>
-#include <vcl/salbtype.hxx>
#include <vcl/bitmap.hxx>
+#include <vcl/Scanline.hxx>
+#include <vcl/BitmapBuffer.hxx>
+#include <vcl/BitmapColor.hxx>
+#include <vcl/BitmapAccessMode.hxx>
typedef BitmapColor (*FncGetPixel)(ConstScanline pScanline, long nX, const ColorMask& rMask);
typedef void (*FncSetPixel)(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
-
class VCL_DLLPUBLIC BitmapInfoAccess
{
friend class BitmapReadAccess;
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 17d86ed3e4f9..7eabfe7791a8 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -25,13 +25,7 @@
#include <vcl/BitmapPalette.hxx>
#include <vcl/ColorMask.hxx>
#include <vcl/BitmapBuffer.hxx>
-
-enum class BitmapAccessMode
-{
- Info,
- Read,
- Write
-};
+#include <vcl/BitmapAccessMode.hxx>
#endif // INCLUDED_VCL_SALBTYPE_HXX