drawinglayer/source/processor2d/cairopixelprocessor2d.cxx | 1
include/vcl/CairoFormats.hxx | 59 ++++++++++++++
include/vcl/cairo.hxx | 36 --------
vcl/headless/BitmapHelper.cxx | 1
vcl/headless/CairoCommon.cxx | 1
vcl/headless/svpbmp.cxx | 2
6 files changed, 63 insertions(+), 37 deletions(-)
New commits:
commit 1aac139d504c9f7b60edeadba3c52a14524e5694
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Thu Apr 3 16:00:18 2025 +1030
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Thu Apr 3 11:30:05 2025 +0200
vcl: cairo: split cairo format defines into new header
Change-Id: I1d9b05c600cea860df0596d63e817b30347f563c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183651
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Reviewed-by: Aron Budea <aron.bu...@collabora.com>
Tested-by: Jenkins
diff --git a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
index 790c5c7ab5b8..63eba355290d 100644
--- a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
@@ -16,6 +16,7 @@
#include <vcl/BitmapWriteAccess.hxx>
#include <vcl/alpha.hxx>
#include <vcl/cairo.hxx>
+#include <vcl/CairoFormats.hxx>
#include <vcl/outdev.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/svapp.hxx>
diff --git a/include/vcl/CairoFormats.hxx b/include/vcl/CairoFormats.hxx
new file mode 100644
index 000000000000..1d2f3b426e8d
--- /dev/null
+++ b/include/vcl/CairoFormats.hxx
@@ -0,0 +1,59 @@
+/* -*- 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 .
+ */
+
+#pragma once
+
+#include <osl/endian.h>
+#include <vcl/Scanline.hxx>
+#include <config_cairo_rgba.h>
+
+// Using formats that match cairo's formats.
+// SVP_24BIT_FORMAT is used to store 24-bit images in 3-byte pixels to
conserve memory.
+
+/*
+ For internal cairo we have the option --enable-cairo-rgba which is potentially
+ useful for Android or Online to switch the rgb components. For Android cairo
then
+ matches the OpenGL GL_RGBA format so we can use it there where we don't have
+ GL_BGRA support. Similarly for Online we can then use cairo's pixel data
+ without needing to swizzle it for use as a canvas ImageData.
+*/
+#if ENABLE_CAIRO_RGBA
+#define SVP_24BIT_FORMAT (ScanlineFormat::N24BitTcRgb)
+#define SVP_CAIRO_FORMAT (ScanlineFormat::N32BitTcRgbx)
+#define SVP_CAIRO_BLUE 2
+#define SVP_CAIRO_GREEN 1
+#define SVP_CAIRO_RED 0
+#define SVP_CAIRO_ALPHA 3
+#elif defined OSL_BIGENDIAN
+#define SVP_24BIT_FORMAT (ScanlineFormat::N24BitTcRgb)
+#define SVP_CAIRO_FORMAT (ScanlineFormat::N32BitTcXrgb)
+#define SVP_CAIRO_BLUE 3
+#define SVP_CAIRO_GREEN 2
+#define SVP_CAIRO_RED 1
+#define SVP_CAIRO_ALPHA 0
+#else
+#define SVP_24BIT_FORMAT (ScanlineFormat::N24BitTcBgr)
+#define SVP_CAIRO_FORMAT (ScanlineFormat::N32BitTcBgrx)
+#define SVP_CAIRO_BLUE 0
+#define SVP_CAIRO_GREEN 1
+#define SVP_CAIRO_RED 2
+#define SVP_CAIRO_ALPHA 3
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/include/vcl/cairo.hxx b/include/vcl/cairo.hxx
index 57306cf19aec..74d4fde02bf3 100644
--- a/include/vcl/cairo.hxx
+++ b/include/vcl/cairo.hxx
@@ -19,45 +19,9 @@
#pragma once
-#include <sal/config.h>
-#include <osl/endian.h>
#include <vcl/vclptr.hxx>
-#include <config_cairo_rgba.h>
#include <memory>
-// Using formats that match cairo's formats.
-// SVP_24BIT_FORMAT is used to store 24-bit images in 3-byte pixels to
conserve memory.
-
-/*
- For internal cairo we have the option --enable-cairo-rgba which is potentially
- useful for Android or Online to switch the rgb components. For Android cairo
then
- matches the OpenGL GL_RGBA format so we can use it there where we don't have
- GL_BGRA support. Similarly for Online we can then use cairo's pixel data
- without needing to swizzle it for use as a canvas ImageData.
-*/
-#if ENABLE_CAIRO_RGBA
-#define SVP_24BIT_FORMAT (ScanlineFormat::N24BitTcRgb)
-#define SVP_CAIRO_FORMAT (ScanlineFormat::N32BitTcRgbx)
-#define SVP_CAIRO_BLUE 2
-#define SVP_CAIRO_GREEN 1
-#define SVP_CAIRO_RED 0
-#define SVP_CAIRO_ALPHA 3
-#elif defined OSL_BIGENDIAN
-#define SVP_24BIT_FORMAT (ScanlineFormat::N24BitTcRgb)
-#define SVP_CAIRO_FORMAT (ScanlineFormat::N32BitTcXrgb)
-#define SVP_CAIRO_BLUE 3
-#define SVP_CAIRO_GREEN 2
-#define SVP_CAIRO_RED 1
-#define SVP_CAIRO_ALPHA 0
-#else
-#define SVP_24BIT_FORMAT (ScanlineFormat::N24BitTcBgr)
-#define SVP_CAIRO_FORMAT (ScanlineFormat::N32BitTcBgrx)
-#define SVP_CAIRO_BLUE 0
-#define SVP_CAIRO_GREEN 1
-#define SVP_CAIRO_RED 2
-#define SVP_CAIRO_ALPHA 3
-#endif
-
typedef struct _cairo_surface cairo_surface_t;
typedef struct _cairo cairo_t;
diff --git a/vcl/headless/BitmapHelper.cxx b/vcl/headless/BitmapHelper.cxx
index cfa9f1556eeb..2a1343223309 100644
--- a/vcl/headless/BitmapHelper.cxx
+++ b/vcl/headless/BitmapHelper.cxx
@@ -19,6 +19,7 @@
#include <headless/BitmapHelper.hxx>
#include <vcl/cairo.hxx>
+#include <vcl/CairoFormats.hxx>
#include <vcl/svapp.hxx>
#include <utility>
diff --git a/vcl/headless/CairoCommon.cxx b/vcl/headless/CairoCommon.cxx
index 033fc8407d0c..f7bfe3dd19a6 100644
--- a/vcl/headless/CairoCommon.cxx
+++ b/vcl/headless/CairoCommon.cxx
@@ -22,6 +22,7 @@
#include <headless/BitmapHelper.hxx>
#include <headless/CairoCommon.hxx>
#include <vcl/cairo.hxx>
+#include <vcl/CairoFormats.hxx>
#include <vcl/BitmapTools.hxx>
#include <SalGradient.hxx>
#include <tools/helpers.hxx>
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 23a0d094d009..cd7aa0d34ff5 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -21,11 +21,11 @@
#include <sal/log.hxx>
#include <cstring>
-#include <vcl/cairo.hxx>
#include <headless/svpbmp.hxx>
#include <o3tl/safeint.hxx>
#include <tools/helpers.hxx>
#include <vcl/bitmap.hxx>
+#include <vcl/CairoFormats.hxx>
using namespace basegfx;
