diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-07-05 21:26:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-07-05 22:56:31 +0200 |
| commit | 9a20ef20c7c15a9899c7959aa1b6bafa707439b8 (patch) | |
| tree | e3fbdc8ca500f1f9b80e769eb40d82d46a4f82bd /external | |
| parent | ecdeed57693617263a88bdff87f11622b94e6889 (diff) | |
cairo RGBA needs to take account of custom RGB24_888 format
Change-Id: I929d20f134c4fb7dedfd2c581263c303cae87eea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154043
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/cairo/cairo/cairo.GL_RGBA.patch | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/external/cairo/cairo/cairo.GL_RGBA.patch b/external/cairo/cairo/cairo.GL_RGBA.patch index b1a05feb4a15..648448e9de92 100644 --- a/external/cairo/cairo/cairo.GL_RGBA.patch +++ b/external/cairo/cairo/cairo.GL_RGBA.patch @@ -14,15 +14,26 @@ return CAIRO_FORMAT_RGB24; case PIXMAN_a8: return CAIRO_FORMAT_A8; -@@ -117,7 +117,7 @@ +@@ -109,7 +109,7 @@ + return CAIRO_FORMAT_A1; + case PIXMAN_r5g6b5: + return CAIRO_FORMAT_RGB16_565; +- case PIXMAN_r8g8b8: ++ case PIXMAN_b8g8r8: //tweaked + return CAIRO_FORMAT_RGB24_888; + #if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,22,0) + case PIXMAN_r8g8b8a8: case PIXMAN_r8g8b8x8: +@@ -117,8 +117,8 @@ #if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,27,2) case PIXMAN_a8r8g8b8_sRGB: #endif - case PIXMAN_a8b8g8r8: case PIXMAN_x8b8g8r8: +- case PIXMAN_b8g8r8: case PIXMAN_b5g6r5: + case PIXMAN_a8r8g8b8: case PIXMAN_x8r8g8b8: //tweaked - case PIXMAN_b8g8r8: case PIXMAN_b5g6r5: ++ case PIXMAN_r8g8b8: case PIXMAN_b5g6r5: case PIXMAN_a1r5g5b5: case PIXMAN_x1r5g5b5: case PIXMAN_a1b5g5r5: case PIXMAN_x1b5g5r5: case PIXMAN_a4r4g4b4: case PIXMAN_x4r4g4b4: + case PIXMAN_a4b4g4r4: case PIXMAN_x4b4g4r4: case PIXMAN_r3g3b2: @@ -320,7 +320,7 @@ ret = PIXMAN_a8; break; |