diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-12-30 14:11:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-30 14:11:39 +0000 |
| commit | 13763bda39bb267382c4824eb29e9575d6a4b811 (patch) | |
| tree | ea5cdbc8f8b4c4f721b3bc34b07ce04faedf8707 /external/cairo | |
| parent | ffa19a95c44f15049bcc1133c98ef2b4d18f7638 (diff) | |
update android rgba cairo patch to apply again
Change-Id: Iaee918439f8472bab7fab2cf545ac2e420d614ab
Diffstat (limited to 'external/cairo')
| -rw-r--r-- | external/cairo/cairo/cairo.GL_RGBA.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/external/cairo/cairo/cairo.GL_RGBA.patch b/external/cairo/cairo/cairo.GL_RGBA.patch index 15850d244166..be5a96389e67 100644 --- a/external/cairo/cairo/cairo.GL_RGBA.patch +++ b/external/cairo/cairo/cairo.GL_RGBA.patch @@ -1,6 +1,6 @@ --- misc/cairo-1.10.2/src/cairo-image-surface.c +++ misc/cairo-1.10.2/src/cairo-image-surface.c -@@ -99,11 +99,11 @@ +@@ -92,11 +92,11 @@ _cairo_format_from_pixman_format (pixman_format_code_t pixman_format) { switch (pixman_format) { @@ -14,16 +14,16 @@ return CAIRO_FORMAT_RGB24; case PIXMAN_a8: return CAIRO_FORMAT_A8; -@@ -109,7 +109,7 @@ +@@ -112,7 +112,7 @@ #if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,27,2) case PIXMAN_a8r8g8b8_sRGB: #endif -- case PIXMAN_a8b8g8r8: case PIXMAN_x8b8g8r8: case PIXMAN_r8g8b8: -+ case PIXMAN_a8r8g8b8: case PIXMAN_x8r8g8b8: case PIXMAN_r8g8b8: //tweaked +- case PIXMAN_a8b8g8r8: case PIXMAN_x8b8g8r8: ++ case PIXMAN_a8r8g8b8: case PIXMAN_x8r8g8b8: //tweaked case PIXMAN_b8g8r8: case PIXMAN_b5g6r5: case PIXMAN_a1r5g5b5: case PIXMAN_x1r5g5b5: case PIXMAN_a1b5g5r5: case PIXMAN_x1b5g5r5: case PIXMAN_a4r4g4b4: case PIXMAN_x4r4g4b4: -@@ -297,7 +297,7 @@ +@@ -314,7 +314,7 @@ ret = PIXMAN_a8; break; case CAIRO_FORMAT_RGB24: @@ -32,7 +32,7 @@ break; case CAIRO_FORMAT_RGB30: ret = PIXMAN_x2r10g10b10; -@@ -305,7 +305,7 @@ +@@ -328,7 +328,7 @@ case CAIRO_FORMAT_ARGB32: case CAIRO_FORMAT_INVALID: default: |