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.grandin@collabora.co.uk> Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Jenkins
2025-04-03 11:30:05 +02:00
parent 5c79209694
commit 1aac139d50
6 changed files with 63 additions and 37 deletions
@@ -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>
@@ -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: */
@@ -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;

@@ -19,6 +19,7 @@

 #include <headless/BitmapHelper.hxx>
 #include <vcl/cairo.hxx>
+#include <vcl/CairoFormats.hxx>
 #include <vcl/svapp.hxx>
 #include <utility>

@@ -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>
@@ -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;