From d8a06a2f9f9d74ed510557a337da46cb14514eaa Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 5 Aug 2025 19:50:44 +0200 Subject: [PATCH] treewide: replace PICT_TYPE_COLOR by PIXMAN_TYPE_COLOR Try not to use old compat macros anymore, use the real ones instead. Signed-off-by: Enrico Weigelt, metux IT consult --- composite/compinit.c | 2 +- render/picture.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composite/compinit.c b/composite/compinit.c index efe7741718..b5bbe895bf 100644 --- a/composite/compinit.c +++ b/composite/compinit.c @@ -260,7 +260,7 @@ compAddAlternateVisual(ScreenPtr pScreen, CompScreenPtr cs, /* Initialize the visual */ visual->bitsPerRGBValue = 8; - if (PIXMAN_FORMAT_TYPE(alt->format) == PICT_TYPE_COLOR) { + if (PIXMAN_FORMAT_TYPE(alt->format) == PIXMAN_TYPE_COLOR) { visual->class = PseudoColor; visual->nplanes = PIXMAN_FORMAT_BPP(alt->format); visual->ColormapEntries = 1 << visual->nplanes; diff --git a/render/picture.c b/render/picture.c index 00e21030f4..5c1cdb9852 100644 --- a/render/picture.c +++ b/render/picture.c @@ -230,7 +230,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp) break; case StaticColor: case PseudoColor: - format = PICT_VISFORMAT(bpp, PICT_TYPE_COLOR, v); + format = PICT_VISFORMAT(bpp, PIXMAN_TYPE_COLOR, v); addFormat(formats, &nformats, format, depth); break; case StaticGray: @@ -375,7 +375,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp) /* remaining fields already set to zero */ break; - case PICT_TYPE_COLOR: + case PIXMAN_TYPE_COLOR: case PICT_TYPE_GRAY: pFormats[f].type = PictTypeIndexed; pFormats[f].index.vid = @@ -639,7 +639,7 @@ PictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats) VisualPtr pVisual = PictureFindVisual(pScreen, formats[n].index.vid); if ((pVisual->class | DynamicClass) == PseudoColor) - type = PICT_TYPE_COLOR; + type = PIXMAN_TYPE_COLOR; else type = PICT_TYPE_GRAY; a = r = g = b = 0;