gfx/cairo/cairo-qt-compile.patch@deefc01c0e14 (annotated)
gfx/cairo/cairo-qt-compile.patch
Thu, 15 Jan 2015 21:03:48 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 15 Jan 2015 21:03:48 +0100
- branch
- TOR_BUG_9701
- changeset 11
- deefc01c0e14
- permissions
- -rw-r--r--
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
| michael@0 | 1 | # HG changeset patch |
| michael@0 | 2 | # Parent 2563fa2763b0ea83394e785340afa4c564ceab57 |
| michael@0 | 3 | diff -r 2563fa2763b0 -r 9ab15e95a354 gfx/cairo/cairo/src/cairo-qt-surface.cpp |
| michael@0 | 4 | --- a/gfx/cairo/cairo/src/cairo-qt-surface.cpp Thu Apr 29 06:55:11 2010 +0300 |
| michael@0 | 5 | +++ b/gfx/cairo/cairo/src/cairo-qt-surface.cpp Thu Apr 29 06:55:51 2010 +0300 |
| michael@0 | 6 | @@ -204,6 +204,7 @@ |
| michael@0 | 7 | case CAIRO_OPERATOR_HSL_LUMINOSITY: |
| michael@0 | 8 | ASSERT_NOT_REACHED; |
| michael@0 | 9 | } |
| michael@0 | 10 | + return QPainter::CompositionMode_Source; |
| michael@0 | 11 | } |
| michael@0 | 12 | |
| michael@0 | 13 | static bool |
| michael@0 | 14 | @@ -668,7 +669,6 @@ |
| michael@0 | 15 | static cairo_status_t |
| michael@0 | 16 | _cairo_qt_surface_clone_similar (void *abstract_surface, |
| michael@0 | 17 | cairo_surface_t *src, |
| michael@0 | 18 | - cairo_content_t content, |
| michael@0 | 19 | int src_x, |
| michael@0 | 20 | int src_y, |
| michael@0 | 21 | int width, |
