gfx/cairo/ensure-text-flushed.patch@deefc01c0e14 (annotated)
gfx/cairo/ensure-text-flushed.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 | diff --git a/gfx/cairo/cairo/src/cairo-pdf-operators.c b/gfx/cairo/cairo/src/cairo-pdf-operators.c |
| michael@0 | 2 | --- a/gfx/cairo/cairo/src/cairo-pdf-operators.c |
| michael@0 | 3 | +++ b/gfx/cairo/cairo/src/cairo-pdf-operators.c |
| michael@0 | 4 | @@ -480,6 +480,12 @@ _cairo_pdf_operators_clip (cairo_pdf_ope |
| michael@0 | 5 | const char *pdf_operator; |
| michael@0 | 6 | cairo_status_t status; |
| michael@0 | 7 | |
| michael@0 | 8 | + if (pdf_operators->in_text_object) { |
| michael@0 | 9 | + status = _cairo_pdf_operators_end_text (pdf_operators); |
| michael@0 | 10 | + if (unlikely (status)) |
| michael@0 | 11 | + return status; |
| michael@0 | 12 | + } |
| michael@0 | 13 | + |
| michael@0 | 14 | if (! path->has_current_point) { |
| michael@0 | 15 | /* construct an empty path */ |
| michael@0 | 16 | _cairo_output_stream_printf (pdf_operators->stream, "0 0 m "); |
