gfx/cairo/handle-a1.patch@97036ab72558 (annotated)
gfx/cairo/handle-a1.patch
Tue, 06 Jan 2015 21:39:09 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 06 Jan 2015 21:39:09 +0100
- branch
- TOR_BUG_9701
- changeset 8
- 97036ab72558
- permissions
- -rw-r--r--
Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.
| michael@0 | 1 | commit 82aab44a9005047743538d52e9fbc27fd6ce408a |
| michael@0 | 2 | Author: Chris Wilson <chris@chris-wilson.co.uk> |
| michael@0 | 3 | Date: Fri Mar 19 17:23:20 2010 -0400 |
| michael@0 | 4 | |
| michael@0 | 5 | commit f07195860620959c27d43080a7b987e28222735a |
| michael@0 | 6 | |
| michael@0 | 7 | xlib: Handle a1 image uploads through converter |
| michael@0 | 8 | |
| michael@0 | 9 | Fixes test/large-source [xlib] |
| michael@0 | 10 | |
| michael@0 | 11 | diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c |
| michael@0 | 12 | index 1a053d0..8f773b0 100644 |
| michael@0 | 13 | --- a/src/cairo-xlib-surface.c |
| michael@0 | 14 | +++ b/src/cairo-xlib-surface.c |
| michael@0 | 15 | @@ -1155,7 +1155,9 @@ _draw_image_surface (cairo_xlib_surface_t *surface, |
| michael@0 | 16 | int dither_adjustment = dither_row[x_off]; |
| michael@0 | 17 | int a, r, g, b; |
| michael@0 | 18 | |
| michael@0 | 19 | - if (image_masks.bpp <= 8) |
| michael@0 | 20 | + if (image_masks.bpp == 1) |
| michael@0 | 21 | + in_pixel = !! (((uint8_t*)row)[x/8] & (1 << (x & 7))); |
| michael@0 | 22 | + else if (image_masks.bpp <= 8) |
| michael@0 | 23 | in_pixel = ((uint8_t*)row)[x]; |
| michael@0 | 24 | else if (image_masks.bpp <= 16) |
| michael@0 | 25 | in_pixel = ((uint16_t*)row)[x]; |
