Attachment 103393 Details for Bug 81709 – PATCH: fix the cache_frozen assertion

PATCH: fix the cache_frozen assertion

cairo-win32-print.patch (text/plain), 1.52 KB, created by rodrigo on 2014-07-24 08:51:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rodrigo

Created: 2014-07-24 08:51:54 UTC

Size: 1.52 KB

patch

obsolete

>diff -ur cairo-1.12.16.orig/src/win32/cairo-win32-printing-surface.c cairo-1.12.16/src/win32/cairo-win32-printing-surface.c
>--- cairo-1.12.16.orig/src/win32/cairo-win32-printing-surface.c	2013-08-26 17:07:21.000000000 +0200
>+++ cairo-1.12.16/src/win32/cairo-win32-printing-surface.c	2014-07-24 09:50:20.059280074 +0200
>@@ -1578,14 +1578,18 @@
> 	 * CAIRO_INT_STATUS_UNSUPPORTED and a fallback image will be
> 	 * used.
> 	 */
>+        _cairo_scaled_font_freeze_cache (scaled_font);
> 	for (i = 0; i < num_glyphs; i++) {
> 	    status = _cairo_scaled_glyph_lookup (scaled_font,
> 						 glyphs[i].index,
> 						 CAIRO_SCALED_GLYPH_INFO_PATH,
> 						 &scaled_glyph);
> 	    if (status)
>-		return status;
>+                break;
> 	}
>+        _cairo_scaled_font_thaw_cache (scaled_font);
>+        if (status)
>+            return status;
> 
> 	return _cairo_win32_printing_surface_analyze_operation (surface, op, source);
>     }
>@@ -1623,6 +1627,7 @@
>     old_has_ctm = surface->has_ctm;
>     surface->has_ctm = TRUE;
>     surface->path_empty = TRUE;
>+    _cairo_scaled_font_freeze_cache (scaled_font);
>     BeginPath (surface->win32.dc);
>     for (i = 0; i < num_glyphs; i++) {
> 	status = _cairo_scaled_glyph_lookup (scaled_font,
>@@ -1636,6 +1641,7 @@
> 	status = _cairo_win32_printing_surface_emit_path (surface, scaled_glyph->path);
>     }
>     EndPath (surface->win32.dc);
>+    _cairo_scaled_font_thaw_cache (scaled_font);
>     surface->ctm = old_ctm;
>     surface->has_ctm = old_has_ctm;
>     if (status == CAIRO_STATUS_SUCCESS && surface->path_empty == FALSE) {

Actions: View

Attachments on bug 81709: 103393

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.