diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-11-10 15:43:51 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-10 15:43:51 -0500 |
| commit | b0e23e79e72b7892b826fabea4f9e02c421d2861 (patch) | |
| tree | 26f20aea660514c213a3ae942eab222e5ccebde3 /gfx/cairo/handle-a1.patch | |
| parent | 03590a6711d601ef3ddb48787e9f3f556705b5db (diff) | |
| parent | b00601953bade944cd6df9cde6fcdd1f10d76feb (diff) | |
| download | UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.tar UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.tar.gz UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.tar.lz UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.tar.xz UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.zip | |
Merge branch 'master' into mailnews-work
Diffstat (limited to 'gfx/cairo/handle-a1.patch')
| -rw-r--r-- | gfx/cairo/handle-a1.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/gfx/cairo/handle-a1.patch b/gfx/cairo/handle-a1.patch deleted file mode 100644 index eaad3d69e..000000000 --- a/gfx/cairo/handle-a1.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 82aab44a9005047743538d52e9fbc27fd6ce408a -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri Mar 19 17:23:20 2010 -0400 - - commit f07195860620959c27d43080a7b987e28222735a - - xlib: Handle a1 image uploads through converter - - Fixes test/large-source [xlib] - -diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c -index 1a053d0..8f773b0 100644 ---- a/src/cairo-xlib-surface.c -+++ b/src/cairo-xlib-surface.c -@@ -1155,7 +1155,9 @@ _draw_image_surface (cairo_xlib_surface_t *surface, - int dither_adjustment = dither_row[x_off]; - int a, r, g, b; - -- if (image_masks.bpp <= 8) -+ if (image_masks.bpp == 1) -+ in_pixel = !! (((uint8_t*)row)[x/8] & (1 << (x & 7))); -+ else if (image_masks.bpp <= 8) - in_pixel = ((uint8_t*)row)[x]; - else if (image_masks.bpp <= 16) - in_pixel = ((uint16_t*)row)[x]; |