开源软件构建与测试

_service:tar_scm:cairo.spec Changed

@@ -1,21 +1,11 @@
 Name:           cairo
-Version:        1.17.8
+Version:        1.18.0
 Release:        1
 Summary:        A 2D graphics library
 License:        LGPLv2 or MPLv1.1
 URL:            http://cairographics.org
 Source0:        http://cairographics.org/snapshots/%{name}-%{version}.tar.xz
 
-Patch6000:	CVE-2019-6461.patch
-
-Patch9000:  bugfix-cairo-truetype-reverse-cmap-detected-memory-leaks.patch
-Patch9001:  bugfix-fix-read-memory-access.patch
-Patch9002:  bugfix-fix-heap-buffer-overflow-in-cairo_cff_parse_charstring.patch
-
-Patch6001:  backport-tee-Fix-cairo-wrapper-functions.patch
-Patch6002:  backport-ft-Use-normal-font-size-when-detecting-the-format.patch
-Patch6003:  backport-tee-ft-dont-use-scaled_glyph-dev_private-to-store-data.patch
-
 BuildRequires:  gcc gcc-c++ gtk-doc meson
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(pixman-1) >= 0.36.0
@@ -92,8 +82,7 @@
   -Dtee=enabled \
   -Dtests=disabled \
   -Dxcb=enabled \
-  -Dxlib=enabled \
-  -Dxml=disabled
+  -Dxlib=enabled
 %meson_build
 
 %install
@@ -148,11 +137,16 @@
 %{_libdir}/pkgconfig/cairo-gobject.pc
  
 %files tools
-%{_bindir}/cairo-sphinx
 %{_bindir}/cairo-trace
 %{_libdir}/cairo/
 
 %changelog
+* Wed Dec 27 2023 Paul Thomas <paulthomas100199@gmail.com> - 1.18.0-1
+- Type: requirement
+- ID: NA
+- SUG: NA
+- DESC: update to 1.18.0
+
 * Wed Jul 26 2023 zhangqiumiao<zhangqiumiao1@huawei.com> - 1.17.8-1
 - Type:bugfix
 - ID:NA

_service:tar_scm:CVE-2019-6461.patch Deleted

_service:tar_scm:backport-ft-Use-normal-font-size-when-detecting-the-format.patch Deleted

@@ -1,63 +0,0 @@
-From 2766d9feeccd5d66e346b0abab38726b8e0aa1e9 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Tue, 7 Mar 2023 19:40:21 +1030
-Subject: PATCH ft: Use normal font size when detecting the format
-
-The format may depend on the font size.
-
-Fixes #643
-
-Reference:https://gitlab.freedesktop.org/cairo/cairo/-/commit/2766d9feeccd5d66e346b0abab38726b8e0aa1e9
-Conflict:NA
----
- src/cairo-ft-font.c | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
-index 22a6a622b..89af6193d 100644
---- a/src/cairo-ft-font.c
-+++ b/src/cairo-ft-font.c
-@@ -3314,11 +3314,13 @@ _cairo_ft_scaled_glyph_init_metrics (cairo_ft_scaled_font_t  *scaled_font,
-     if (scaled_font->unscaled->have_color && scaled_font->base.options.color_mode != CAIRO_COLOR_MODE_NO_COLOR)
- 	color_flag = FT_LOAD_COLOR;
- #endif
-+    /* Ensure use_em_size = FALSE as the format (bitmap or outline)
-+     * may change with the size. */
-     status = _cairo_ft_scaled_glyph_load_glyph (scaled_font,
- 						scaled_glyph,
- 						face,
- 						load_flags | color_flag,
--						!hint_metrics,
-+						FALSE,
- 						vertical_layout);
-     if (unlikely (status))
- 	return status;
-@@ -3344,6 +3346,18 @@ _cairo_ft_scaled_glyph_init_metrics (cairo_ft_scaled_font_t  *scaled_font,
- 	 glyph_priv->format =  CAIRO_FT_GLYPH_TYPE_BITMAP;
-     }
- 
-+    /* If hinting is off, load the glyph with font size set the the em size. */
-+    if (!hint_metrics) {
-+	status = _cairo_ft_scaled_glyph_load_glyph (scaled_font,
-+						    scaled_glyph,
-+						    face,
-+						    load_flags | color_flag,
-+						    TRUE,
-+						    vertical_layout);
-+	if (unlikely (status))
-+	    return status;
-+    }
-+
-     _cairo_ft_scaled_glyph_get_metrics (scaled_font,
- 					face,
- 					vertical_layout,
-@@ -3369,6 +3383,7 @@ _cairo_ft_scaled_glyph_init_metrics (cairo_ft_scaled_font_t  *scaled_font,
-     }
- 
-     if (glyph_priv->format == CAIRO_FT_GLYPH_TYPE_COLR_V1) {
-+	/* Restore font size if previously loaded at em_size. */
- 	if (!hint_metrics) {
- 	    status = _cairo_ft_scaled_glyph_load_glyph (scaled_font,
- 							scaled_glyph,
--- 
-GitLab
\ No newline at end of file

_service:tar_scm:backport-tee-Fix-cairo-wrapper-functions.patch Deleted

@@ -1,110 +0,0 @@
-From 5e42a5277eddafd312a73e355d7775a4401dae4e Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Fri, 3 Feb 2023 15:40:12 +0100
-Subject: PATCH tee: Fix cairo wrapper functions
-
-Follow-up to !391 to apply the same changes to the (disabled by default)
-tee surface.
-
-Fixes: #634
-Reference:https://gitlab.freedesktop.org/cairo/cairo/-/commit/5e42a5277eddafd312a73e355d7775a4401dae4e
-Conflict:NA
----
- src/cairo-tee-surface.c | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/src/cairo-tee-surface.c b/src/cairo-tee-surface.c
-index 7a94c9bca..4994a5a60 100644
---- a/src/cairo-tee-surface.c
-+++ b/src/cairo-tee-surface.c
-@@ -220,12 +220,12 @@ _cairo_tee_surface_paint (void			*abstract_surface,
-     num_slaves = _cairo_array_num_elements (&surface->slaves);
-     slaves = _cairo_array_index (&surface->slaves, 0);
-     for (n = 0; n < num_slaves; n++) {
--	status = _cairo_surface_wrapper_paint (&slavesn, op, source, clip);
-+	status = _cairo_surface_wrapper_paint (&slavesn, op, source, 0, clip);
- 	if (unlikely (status))
- 	    return status;
-     }
- 
--    return _cairo_surface_wrapper_paint (&surface->master, op, source, clip);
-+    return _cairo_surface_wrapper_paint (&surface->master, op, source, 0, clip);
- }
- 
- static cairo_int_status_t
-@@ -244,13 +244,17 @@ _cairo_tee_surface_mask (void			*abstract_surface,
-     slaves = _cairo_array_index (&surface->slaves, 0);
-     for (n = 0; n < num_slaves; n++) {
- 	status = _cairo_surface_wrapper_mask (&slavesn,
--					      op, source, mask, clip);
-+					      op, source, 0,
-+                                              mask, 0,
-+                                              clip);
- 	if (unlikely (status))
- 	    return status;
-     }
- 
-     return _cairo_surface_wrapper_mask (&surface->master,
--					op, source, mask, clip);
-+					op, source, 0,
-+                                        mask, 0,
-+                                        clip);
- }
- 
- static cairo_int_status_t
-@@ -274,7 +278,7 @@ _cairo_tee_surface_stroke (void				*abstract_surface,
-     slaves = _cairo_array_index (&surface->slaves, 0);
-     for (n = 0; n < num_slaves; n++) {
- 	status = _cairo_surface_wrapper_stroke (&slavesn,
--						op, source,
-+						op, source, 0,
- 						path, style,
- 						ctm, ctm_inverse,
- 						tolerance, antialias,
-@@ -284,7 +288,7 @@ _cairo_tee_surface_stroke (void				*abstract_surface,
-     }
- 
-     return _cairo_surface_wrapper_stroke (&surface->master,
--					  op, source,
-+					  op, source, 0,
- 					  path, style,
- 					  ctm, ctm_inverse,
- 					  tolerance, antialias,
-@@ -310,7 +314,7 @@ _cairo_tee_surface_fill (void				*abstract_surface,
-     slaves = _cairo_array_index (&surface->slaves, 0);
-     for (n = 0; n < num_slaves; n++) {
- 	status = _cairo_surface_wrapper_fill (&slavesn,
--					      op, source,
-+					      op, source, 0,
- 					      path, fill_rule,
- 					      tolerance, antialias,
- 					      clip);
-@@ -319,7 +323,7 @@ _cairo_tee_surface_fill (void				*abstract_surface,
-     }
- 
-     return _cairo_surface_wrapper_fill (&surface->master,
--					op, source,
-+					op, source, 0,
- 					path, fill_rule,
- 					tolerance, antialias,
- 					clip);
-@@ -361,7 +365,7 @@ _cairo_tee_surface_show_text_glyphs (void		    *abstract_surface,
-     for (n = 0; n < num_slaves; n++) {
- 	memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
- 	status = _cairo_surface_wrapper_show_text_glyphs (&slavesn, op,
--							  source,
-+							  source, 0,
- 							  utf8, utf8_len,
- 							  glyphs_copy, num_glyphs,
- 							  clusters, num_clusters,
-@@ -374,7 +378,7 @@ _cairo_tee_surface_show_text_glyphs (void		    *abstract_surface,
- 
-     memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
-     status = _cairo_surface_wrapper_show_text_glyphs (&surface->master, op,
--						      source,
-+						      source, 0,
- 						      utf8, utf8_len,
- 						      glyphs_copy, num_glyphs,
- 						      clusters, num_clusters,
--- 
-GitLab

_service:tar_scm:backport-tee-ft-dont-use-scaled_glyph-dev_private-to-store-data.patch Deleted

@@ -1,71 +0,0 @@
-From 10cc34f521cf272f881bbad9a6fc4e794cca8687 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat, 13 May 2023 18:51:40 +0930
-Subject: PATCH ft: don't use scaled_glyph->dev_private to store data
-
-It is also used by the xlib surface.
-
-Fixes #778
-Reference:https://gitlab.freedesktop.org/cairo/cairo/-/commit/10cc34f521cf272f881bbad9a6fc4e794cca8687
-Conflict:NA
----
- src/cairo-ft-font.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
-index 834e4ba31..76c9e008f 100644
---- a/src/cairo-ft-font.c
-+++ b/src/cairo-ft-font.c
-@@ -2600,6 +2600,7 @@ _cairo_ft_scaled_glyph_set_foreground_color (cairo_ft_scaled_font_t *scaled_font
- static cairo_int_status_t
- _cairo_ft_scaled_glyph_init_surface (cairo_ft_scaled_font_t     *scaled_font,
- 				     cairo_scaled_glyph_t	*scaled_glyph,
-+				     cairo_ft_glyph_private_t   *glyph_priv,
- 				     cairo_scaled_glyph_info_t	 info,
- 				     FT_Face face,
- 				     const cairo_color_t        *foreground_color,
-@@ -2611,7 +2612,6 @@ _cairo_ft_scaled_glyph_init_surface (cairo_ft_scaled_font_t     *scaled_font,
-     cairo_status_t status;
-     cairo_image_surface_t	*surface;
-     cairo_bool_t uses_foreground_color = FALSE;
--    cairo_ft_glyph_private_t *glyph_priv = scaled_glyph->dev_private;
- 
-     /* Only one info type at a time handled in this function */
-     assert (info == CAIRO_SCALED_GLYPH_INFO_COLOR_SURFACE || info == CAIRO_SCALED_GLYPH_INFO_SURFACE);
-@@ -3302,7 +3302,6 @@ _cairo_ft_scaled_glyph_init_metrics (cairo_ft_scaled_font_t  *scaled_font,
-     _cairo_scaled_glyph_attach_private (scaled_glyph, &glyph_priv->base,
- 					&ft_glyph_private_key,
- 					_cairo_ft_glyph_fini);
--    scaled_glyph->dev_private = glyph_priv;
- 
-     /* We need to load color to determine if this is a color format. */
-     int color_flag = 0;
-@@ -3461,8 +3460,8 @@ _cairo_ft_scaled_glyph_init (void			*abstract_font,
- 	    goto FAIL;
-     }
- 
--    /* scaled_glyph->dev_private is intialized by _cairo_ft_scaled_glyph_init_metrics() */
--    glyph_priv = scaled_glyph->dev_private;
-+    glyph_priv = (cairo_ft_glyph_private_t *) _cairo_scaled_glyph_find_private (scaled_glyph,
-+										&ft_glyph_private_key);
-     assert (glyph_priv != NULL);
- 
-     if (info & CAIRO_SCALED_GLYPH_INFO_RECORDING_SURFACE) {
-@@ -3514,6 +3513,7 @@ _cairo_ft_scaled_glyph_init (void			*abstract_font,
- 	} else {
- 	    status = _cairo_ft_scaled_glyph_init_surface (scaled_font,
- 							  scaled_glyph,
-+							  glyph_priv,
- 							  CAIRO_SCALED_GLYPH_INFO_COLOR_SURFACE,
- 							  face,
- 							  foreground_color,
-@@ -3527,6 +3527,7 @@ _cairo_ft_scaled_glyph_init (void			*abstract_font,
-     if (info & CAIRO_SCALED_GLYPH_INFO_SURFACE) {
- 	status = _cairo_ft_scaled_glyph_init_surface (scaled_font,
- 						      scaled_glyph,
-+						      glyph_priv,
- 						      CAIRO_SCALED_GLYPH_INFO_SURFACE,
- 						      face,
- 						      NULL, /* foreground color */
--- 
-GitLab

_service:tar_scm:bugfix-cairo-truetype-reverse-cmap-detected-memory-leaks.patch Deleted

@@ -1,29 +0,0 @@
-From 1f39cb2e344ddaac89da743a926d06c60e08614b Mon Sep 17 00:00:00 2001
-From: sun_hai_10 <sunhai10@huawei.com>
-Date: Wed, 14 Jun 2023 15:37:22 +0800
-Subject: PATCH cairo truetype reverse cmap detected memory leaks
-
----
- src/cairo-truetype-subset.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/cairo-truetype-subset.c b/src/cairo-truetype-subset.c
-index 6cef4ee..472294f 100644
---- a/src/cairo-truetype-subset.c
-+++ b/src/cairo-truetype-subset.c
-@@ -1311,8 +1311,10 @@ _cairo_truetype_reverse_cmap (cairo_scaled_font_t *scaled_font,
- 
-     /* A Format 4 cmap contains 8 uint16_t numbers and 4 arrays of
-      * uint16_t each num_segments long. */
--    if (size < (8 + 4*num_segments)*sizeof(uint16_t))
--	return CAIRO_INT_STATUS_UNSUPPORTED;
-+    if (size < (8 + 4*num_segments)*sizeof(uint16_t)) {
-+	status = CAIRO_INT_STATUS_UNSUPPORTED;
-+        goto fail;
-+    }
- 
-     end_code = map->endCount;
-     start_code = &(end_codenum_segments + 1);
--- 
-2.23.0
-

_service:tar_scm:bugfix-fix-heap-buffer-overflow-in-cairo_cff_parse_charstring.patch Deleted

@@ -1,31 +0,0 @@
-From 4e515dd14a67b9069610e4a10baee300fb08421a Mon Sep 17 00:00:00 2001
-From: sun_hai_10 <sunhai10@huawei.com>
-Date: Wed, 14 Jun 2023 16:44:30 +0800
-Subject: PATCH fix heap buffer overflow in cairo_cff_parse_charstring
-
----
- src/cairo-cff-subset.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
-index 64fc69e..c94a4d0 100644
---- a/src/cairo-cff-subset.c
-+++ b/src/cairo-cff-subset.c
-@@ -1789,7 +1789,13 @@ cairo_cff_font_subset_charstrings_and_subroutines (cairo_cff_font_t  *font)
- 	} else {
- 	    glyph = font->scaled_font_subset->glyphsi;
- 	}
--        element = _cairo_array_index (&font->charstrings_index, glyph);
-+
-+        cairo_array_t *array = &font->charstrings_index;
-+        element = _cairo_array_index (array, glyph);
-+        if (element == NULL)
-+            return CAIRO_INT_STATUS_NO_MEMORY;
-+        if (array->element_size < element->length)
-+            return CAIRO_INT_STATUS_UNSUPPORTED;
-         status = cff_index_append (&font->charstrings_subset_index,
-                                    element->data,
-                                    element->length);
--- 
-2.23.0
-

_service:tar_scm:bugfix-fix-read-memory-access.patch Deleted

@@ -1,39 +0,0 @@
-From e8fef3b8f84afb1a0ae7a9ae81f43c91ac7b3b79 Mon Sep 17 00:00:00 2001
-From: sun_hai_10 <sunhai10@huawei.com>
-Date: Wed, 14 Jun 2023 15:52:58 +0800
-Subject: PATCH fix read memory access
-
----
- src/cairo-cff-subset.c   | 2 ++
- src/cairo-type1-subset.c | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
-index fce4195..64fc69e 100644
---- a/src/cairo-cff-subset.c
-+++ b/src/cairo-cff-subset.c
-@@ -1412,6 +1412,8 @@ cairo_cff_font_subset_dict_string(cairo_cff_font_t   *font,
-         return CAIRO_STATUS_SUCCESS;
- 
-     element = _cairo_array_index (&font->strings_index, sid - NUM_STD_STRINGS);
-+    if (element == NULL)
-+        return CAIRO_STATUS_NO_MEMORY;
-     sid = NUM_STD_STRINGS + _cairo_array_num_elements (&font->strings_subset_index);
-     status = cff_index_append (&font->strings_subset_index, element->data, element->length);
-     if (unlikely (status))
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index 068b59e..22182af 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -1229,6 +1229,8 @@ cairo_type1_font_subset_for_each_glyph (cairo_type1_font_subset_t *font,
- 
- 	/* Skip binary data and |- or ND token. */
- 	p = skip_token (charstring + charstring_length, dict_end);
-+        if (p == NULL)
-+            return CAIRO_INT_STATUS_NO_MEMORY;
- 	while (p < dict_end && _cairo_isspace(*p))
- 	    p++;
- 
--- 
-2.23.0
-

_service Changed

_service:tar_scm:cairo-1.17.8.tar.xz/perf/make-html.py Deleted

@@ -1,88 +0,0 @@
-#!/usr/bin/python
-
-from string import strip
-from sys import stdin
-
-targets = {}
-smilies = {'slowdown': '&#9785;' , 'speedup': '&#9786;'}
-
-for line in stdin:
-	line = map(strip, filter(None, line.split(' ')))
-
-	if 9 == len(line):
-		target, name = line0:2
-		factor, dir = line-2:
-
-		name = name.split('-')
-		name, size = '-'.join(name:-1), name-1
-
-		target_tests = targets.get(target, {})
-		name_tests = target_tests.get(name, {})
-
-		name_testsint(size) = (factor, dir)
-		target_testsname = name_tests
-		targetstarget = target_tests
-
-print '''\
-<html><head>
-<title>Performance Changes</title>
-<style type="text/css">/*<!CDATA*/
-    body { background: white; color: black; }
-    table { border-collapse: collapse; }
-
-    th, td { border: 1px solid silver; padding: 0.2em; }
-    td { text-align: center; }
-    th:first-child { text-align: left; }
-    th { background: #eee; }
-
- /* those colors also should work for color blinds */
-    td.slowdown { background: #f93; }
-    td.speedup { background: #6f9; }
-/*>*/</style>
-</head><body>
-<h1>Performance Changes</h1>'''
-
-targets = targets.items()
-targets.sort(lambda a, b: cmp(a0, b0))
-
-for target, names in targets:
-	sizes = {}
-
-	for tests in names.values():
-		for size in tests.keys():
-			sizessize = True	
-
-	sizes = sizes.keys()
-	sizes.sort()
-
-	names = names.items()
-	names.sort(lambda a, b: cmp(a0, b0))
-
-	print '<h2><a name="%s">%s</a></h2>' % (target, target)
-	print '<table><thead><tr><th>&nbsp;</th>'
-
-	for size in sizes:
-		print '<th>%s</th>' % size
-
-	print '</tr></thead><tbody>'
-
-	for name, tests in names:
-		print '<tr><th>%s</th>' % name
-		
-		for size in sizes:
-			result = tests.get(size)
-
-			if result:
-				factor, dir = result
-				print '<td class="%s">%s %s</td>' % (
-					dir, factor, smiliesdir)
-
-			else:
-				print '<td>&nbsp;</td>'
-
-		print '</tr>'
-
-
-	print '</tbody></table>'
-
-print '</body></html>'

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-tee-surface-private.h Deleted

@@ -1,47 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2009 Chris Wilson
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is University of Southern
- * California.
- *
- * Contributor(s):
- *	Chris Wilson <chris@chris-wilson.co.uk>
- */
-
-#ifndef CAIRO_TEE_SURFACE_PRIVATE_H
-#define CAIRO_TEE_SURFACE_PRIVATE_H
-
-#include "cairoint.h"
-
-cairo_private cairo_surface_t *
-_cairo_tee_surface_find_match (void *abstract_surface,
-			       const cairo_surface_backend_t *backend,
-			       cairo_content_t content);
-
-#endif /* CAIRO_TEE_SURFACE_PRIVATE_H */

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-xml-surface.c Deleted

@@ -1,1212 +0,0 @@
-/* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2009 Chris Wilson
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is Chris Wilson.
- *
- * Contributor(s):
- *      Chris Wilson <chris@chris-wilson.co.uk>
- */
-
-/* This surface is intended to produce a verbose, hierarchical, DAG XML file
- * representing a single surface. It is intended to be used by debuggers,
- * such as cairo-sphinx, or by application test-suites that want a log of
- * operations.
- */
-
-#include "cairoint.h"
-
-#include "cairo-xml.h"
-
-#include "cairo-clip-private.h"
-#include "cairo-device-private.h"
-#include "cairo-default-context-private.h"
-#include "cairo-image-surface-private.h"
-#include "cairo-error-private.h"
-#include "cairo-output-stream-private.h"
-#include "cairo-recording-surface-inline.h"
-
-#define static cairo_warn static
-
-typedef struct _cairo_xml_surface cairo_xml_surface_t;
-
-typedef struct _cairo_xml {
-    cairo_device_t base;
-
-    cairo_output_stream_t *stream;
-    int indent;
-} cairo_xml_t;
-
-struct _cairo_xml_surface {
-    cairo_surface_t base;
-
-    double width, height;
-};
-
-slim_hidden_proto (cairo_xml_for_recording_surface);
-
-static const cairo_surface_backend_t _cairo_xml_surface_backend;
-
-static const char *
-_operator_to_string (cairo_operator_t op)
-{
-    static const char *names = {
-	"CLEAR",	/* CAIRO_OPERATOR_CLEAR */
-
-	"SOURCE",	/* CAIRO_OPERATOR_SOURCE */
-	"OVER",		/* CAIRO_OPERATOR_OVER */
-	"IN",		/* CAIRO_OPERATOR_IN */
-	"OUT",		/* CAIRO_OPERATOR_OUT */
-	"ATOP",		/* CAIRO_OPERATOR_ATOP */
-
-	"DEST",		/* CAIRO_OPERATOR_DEST */
-	"DEST_OVER",	/* CAIRO_OPERATOR_DEST_OVER */
-	"DEST_IN",	/* CAIRO_OPERATOR_DEST_IN */
-	"DEST_OUT",	/* CAIRO_OPERATOR_DEST_OUT */
-	"DEST_ATOP",	/* CAIRO_OPERATOR_DEST_ATOP */
-
-	"XOR",		/* CAIRO_OPERATOR_XOR */
-	"ADD",		/* CAIRO_OPERATOR_ADD */
-	"SATURATE",	/* CAIRO_OPERATOR_SATURATE */
-
-	"MULTIPLY",	/* CAIRO_OPERATOR_MULTIPLY */
-	"SCREEN",	/* CAIRO_OPERATOR_SCREEN */
-	"OVERLAY",	/* CAIRO_OPERATOR_OVERLAY */
-	"DARKEN",	/* CAIRO_OPERATOR_DARKEN */
-	"LIGHTEN",	/* CAIRO_OPERATOR_LIGHTEN */
-	"DODGE",	/* CAIRO_OPERATOR_COLOR_DODGE */
-	"BURN",		/* CAIRO_OPERATOR_COLOR_BURN */
-	"HARD_LIGHT",	/* CAIRO_OPERATOR_HARD_LIGHT */
-	"SOFT_LIGHT",	/* CAIRO_OPERATOR_SOFT_LIGHT */
-	"DIFFERENCE",	/* CAIRO_OPERATOR_DIFFERENCE */
-	"EXCLUSION",	/* CAIRO_OPERATOR_EXCLUSION */
-	"HSL_HUE",	/* CAIRO_OPERATOR_HSL_HUE */
-	"HSL_SATURATION", /* CAIRO_OPERATOR_HSL_SATURATION */
-	"HSL_COLOR",	/* CAIRO_OPERATOR_HSL_COLOR */
-	"HSL_LUMINOSITY" /* CAIRO_OPERATOR_HSL_LUMINOSITY */
-    };
-    assert (op < ARRAY_LENGTH (names));
-    return namesop;
-}
-
-static const char *
-_extend_to_string (cairo_extend_t extend)
-{
-    static const char *names = {
-	"EXTEND_NONE",		/* CAIRO_EXTEND_NONE */
-	"EXTEND_REPEAT",	/* CAIRO_EXTEND_REPEAT */
-	"EXTEND_REFLECT",	/* CAIRO_EXTEND_REFLECT */
-	"EXTEND_PAD"		/* CAIRO_EXTEND_PAD */
-    };
-    assert (extend < ARRAY_LENGTH (names));
-    return namesextend;
-}
-
-static const char *
-_filter_to_string (cairo_filter_t filter)
-{
-    static const char *names = {
-	"FILTER_FAST",		/* CAIRO_FILTER_FAST */
-	"FILTER_GOOD",		/* CAIRO_FILTER_GOOD */
-	"FILTER_BEST",		/* CAIRO_FILTER_BEST */
-	"FILTER_NEAREST",	/* CAIRO_FILTER_NEAREST */
-	"FILTER_BILINEAR",	/* CAIRO_FILTER_BILINEAR */
-	"FILTER_GAUSSIAN",	/* CAIRO_FILTER_GAUSSIAN */
-    };
-    assert (filter < ARRAY_LENGTH (names));
-    return namesfilter;
-}
-
-static const char *
-_fill_rule_to_string (cairo_fill_rule_t rule)
-{
-    static const char *names = {
-	"WINDING",	/* CAIRO_FILL_RULE_WINDING */
-	"EVEN_ODD"	/* CAIRO_FILL_RILE_EVEN_ODD */
-    };
-    assert (rule < ARRAY_LENGTH (names));
-    return namesrule;
-}
-
-static const char *
-_antialias_to_string (cairo_antialias_t antialias)
-{
-    static const char *names = {
-	"DEFAULT",	/* CAIRO_ANTIALIAS_DEFAULT */
-	"NONE",         /* CAIRO_ANTIALIAS_NONE */
-	"GRAY",         /* CAIRO_ANTIALIAS_GRAY */
-	"SUBPIXEL",	/* CAIRO_ANTIALIAS_SUBPIXEL */
-	"FAST",         /* CAIRO_ANTIALIAS_FAST */
-	"GOOD",         /* CAIRO_ANTIALIAS_GOOD */
-	"BEST",         /* CAIRO_ANTIALIAS_BEST */
-    };
-    assert (antialias < ARRAY_LENGTH (names));
-    return namesantialias;
-}
-
-static const char *
-_line_cap_to_string (cairo_line_cap_t line_cap)
-{
-    static const char *names = {
-	"LINE_CAP_BUTT",	/* CAIRO_LINE_CAP_BUTT */
-	"LINE_CAP_ROUND",	/* CAIRO_LINE_CAP_ROUND */
-	"LINE_CAP_SQUARE"	/* CAIRO_LINE_CAP_SQUARE */
-    };
-    assert (line_cap < ARRAY_LENGTH (names));
-    return namesline_cap;
-}
-
-static const char *
-_line_join_to_string (cairo_line_join_t line_join)
-{
-    static const char *names = {
-	"LINE_JOIN_MITER",	/* CAIRO_LINE_JOIN_MITER */
-	"LINE_JOIN_ROUND",	/* CAIRO_LINE_JOIN_ROUND */
-	"LINE_JOIN_BEVEL",	/* CAIRO_LINE_JOIN_BEVEL */
-    };
-    assert (line_join < ARRAY_LENGTH (names));
-    return namesline_join;
-}
-
-static const char *
-_content_to_string (cairo_content_t content)
-{

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-xml.h Deleted

@@ -1,67 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2009 Chris Wilson
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is Chris Wilson
- *
- * Contributor(s):
- *	Chris Wilson <chris@chris-wilson.co.uk>
- */
-
-#ifndef CAIRO_XML_H
-#define CAIRO_XML_H
-
-#include "cairo.h"
-
-#if CAIRO_HAS_XML_SURFACE
-
-CAIRO_BEGIN_DECLS
-
-cairo_public cairo_device_t *
-cairo_xml_create (const char *filename);
-
-cairo_public cairo_device_t *
-cairo_xml_create_for_stream (cairo_write_func_t	 write_func,
-			     void		*closure);
-
-cairo_public cairo_surface_t *
-cairo_xml_surface_create (cairo_device_t *xml,
-			  cairo_content_t content,
-			  double width, double height);
-
-cairo_public cairo_status_t
-cairo_xml_for_recording_surface (cairo_device_t *xml,
-				 cairo_surface_t *surface);
-
-CAIRO_END_DECLS
-
-#else  /*CAIRO_HAS_XML_SURFACE*/
-# error Cairo was not compiled with support for the XML backend
-#endif /*CAIRO_HAS_XML_SURFACE*/
-
-#endif /*CAIRO_XML_H*/

_service:tar_scm:cairo-1.17.8.tar.xz/src/check-has-hidden-symbols.c Deleted

_service:tar_scm:cairo-1.17.8.tar.xz/src/check-plt.sh Deleted

_service:tar_scm:cairo-1.17.8.tar.xz/src/make-cairo-def.sh Deleted

_service:tar_scm:cairo-1.17.8.tar.xz/src/meson-check-def.sh Deleted

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/pdf-surface-source.ps.argb32.ref.png Deleted

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/pdf-surface-source.ps.rgb24.ref.png Deleted

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/ps-surface-source.ps.argb32.ref.png Deleted

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/ps-surface-source.ps.rgb24.ref.png Deleted

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/user-font-color.ps.ref.png Deleted

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/user-font-color.svg.xfail.png Deleted

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-sphinx Deleted

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-sphinx/.gitignore Deleted

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-sphinx/fdr.c Deleted

@@ -1,257 +0,0 @@
-/* cairo-fdr - a 'flight data recorder', a black box, for cairo
- *
- * Copyright © 2009 Chris Wilson
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <cairo.h>
-#include <cairo-script.h>
-#include <cairo-tee.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <assert.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <dlfcn.h>
-
-static void *_dlhandle = RTLD_NEXT;
-#define DLCALL(name, args...) ({ \
-    static typeof (&name) name##_real; \
-    if (name##_real == NULL) { \
-	name##_real = dlsym (_dlhandle, #name); \
-	if (name##_real == NULL && _dlhandle == RTLD_NEXT) { \
-	    _dlhandle = dlopen ("libcairo.so", RTLD_LAZY); \
-	    name##_real = dlsym (_dlhandle, #name); \
-	    assert (name##_real != NULL); \
-	} \
-    } \
-    (*name##_real) (args);  \
-})
-
-static cairo_device_t *fdr_context;
-static const cairo_user_data_key_t fdr_key;
-
-static void
-fdr_get_extents (cairo_surface_t *surface,
-		 cairo_rectangle_t *extents)
-{
-    cairo_t *cr;
-
-    cr = DLCALL (cairo_create, surface);
-    DLCALL (cairo_clip_extents, cr,
-	    &extents->x, &extents->y, &extents->width, &extents->height);
-    DLCALL (cairo_destroy, cr);
-
-    extents->width -= extents->x;
-    extents->height -= extents->y;
-}
-
-static void
-fdr_surface_destroy (void *surface)
-{
-    DLCALL (cairo_surface_destroy, surface);
-}
-
-static void
-fdr_surface_reference (void *surface)
-{
-    DLCALL (cairo_surface_reference, surface);
-}
-
-static cairo_surface_t *
-fdr_surface_get_tee (cairo_surface_t *surface)
-{
-    return DLCALL (cairo_surface_get_user_data, surface, &fdr_key);
-}
-
-static cairo_surface_t *
-fdr_tee_surface_index (cairo_surface_t *surface, int index)
-{
-    return DLCALL (cairo_tee_surface_index, surface, index);
-}
-
-static cairo_status_t
-fdr_write (void *closure, const unsigned char *data, unsigned int len)
-{
-    int fd = (int) (intptr_t) closure;
-    while (len) {
-	int ret = write (fd, data, len);
-	if (ret < 0) {
-	    switch (errno) {
-	    case EAGAIN:
-	    case EINTR:
-		continue;
-	    default:
-		return CAIRO_STATUS_WRITE_ERROR;
-	    }
-	} else if (ret == 0) {
-	    return CAIRO_STATUS_WRITE_ERROR;
-	} else {
-	    data += ret;
-	    len -= ret;
-	}
-    }
-    return CAIRO_STATUS_SUCCESS;
-}
-
-cairo_t *
-cairo_create (cairo_surface_t *surface)
-{
-    cairo_surface_t *tee;
-
-    tee = fdr_surface_get_tee (surface);
-    if (tee == NULL) {
-	cairo_surface_t *script;
-	cairo_rectangle_t extents;
-	cairo_content_t content;
-
-	if (fdr_context == NULL) {
-	    const char *env = getenv ("CAIRO_SPHINX_FD");
-	    int fd = env ? atoi (env) : 1;
-	    fdr_context = DLCALL (cairo_script_create_for_stream,
-				  fdr_write, (void *) (intptr_t) fd);
-	}
-
-	fdr_get_extents (surface, &extents);
-	content = DLCALL (cairo_surface_get_content, surface);
-
-	tee = DLCALL (cairo_tee_surface_create, surface);
-	script = DLCALL (cairo_script_surface_create,
-			 fdr_context, content, extents.width, extents.height);
-	DLCALL (cairo_tee_surface_add, tee, script);
-
-	DLCALL (cairo_surface_set_user_data, surface,
-		&fdr_key, tee, fdr_surface_destroy);
-    }
-
-    return DLCALL (cairo_create, tee);
-}
-
-static void
-fdr_remove_tee (cairo_surface_t *surface)
-{
-    fdr_surface_reference (surface);
-    DLCALL (cairo_surface_set_user_data, surface, &fdr_key, NULL, NULL);
-    fdr_surface_destroy (surface);
-}
-
-void
-cairo_destroy (cairo_t *cr)
-{
-    cairo_surface_t *tee;
-
-    tee = DLCALL (cairo_get_target, cr);
-    DLCALL (cairo_destroy, cr);
-
-    if (DLCALL (cairo_surface_get_reference_count, tee) == 1)
-	fdr_remove_tee (fdr_tee_surface_index (tee, 0));
-}
-
-void
-cairo_pattern_destroy (cairo_pattern_t *pattern)
-{
-    if (DLCALL (cairo_pattern_get_type, pattern) == CAIRO_PATTERN_TYPE_SURFACE) {
-	cairo_surface_t *surface;
-
-	if (DLCALL (cairo_pattern_get_surface, pattern, &surface) == CAIRO_STATUS_SUCCESS &&
-	    DLCALL (cairo_surface_get_type, surface) == CAIRO_SURFACE_TYPE_TEE &&
-	    DLCALL (cairo_surface_get_reference_count, surface) == 2)
-	{
-	    fdr_remove_tee (fdr_tee_surface_index (surface, 0));
-	}
-    }
-
-    DLCALL (cairo_pattern_destroy, pattern);
-}
-
-cairo_surface_t *
-cairo_get_target (cairo_t *cr)
-{
-    cairo_surface_t *tee;
-
-    tee = DLCALL (cairo_get_target, cr);
-    return fdr_tee_surface_index (tee, 0);
-}
-
-cairo_surface_t *
-cairo_get_group_target (cairo_t *cr)
-{
-    cairo_surface_t *tee;
-
-    tee = DLCALL (cairo_get_group_target, cr);
-    return fdr_tee_surface_index (tee, 0);
-}
-

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-sphinx/meson.build Deleted

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-sphinx/sphinx.c Deleted

@@ -1,1550 +0,0 @@
-/*
- * The intention for sphinx is for detection of rendering errors inside
- * applications by simultaneously rendering on to the target device and on
- * an image surface and comparing the two. If it found a discrepancy, it
- * would then dump the trace that reproduces the error. (Then apply
- * delta-debugging to reduce that down to a minimal trace.)
- */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <errno.h>
-#include <assert.h>
-#include <pthread.h>
-
-#if defined(HAVE_POLL_H)
-#include <poll.h>
-#elif defined(HAVE_SYS_POLL_H)
-#include <sys/poll.h>
-#else
-#error No poll.h equivalent found
-#endif
-
-#include <cairo.h>
-#include <cairo-script.h>
-#include <cairo-script-interpreter.h>
-#include <cairo-boilerplate.h>
-
-#include <glib.h> /* for checksumming */
-
-#ifndef CAIRO_HAS_REAL_PTHREAD
-# error "cairo-sphinx needs real pthreads"
-#endif
-
-#ifndef MAP_NORESERVE
-#define MAP_NORESERVE 0
-#endif
-
-#define DATA_SIZE (256 << 20)
-#define SHM_PATH_XXX "/shmem-cairo-sphinx"
-
-struct client {
-    int sk;
-    const cairo_boilerplate_target_t *target;
-    cairo_surface_t *surface;
-    void *base;
-
-    cairo_script_interpreter_t *csi;
-    struct context_closure {
-	struct context_closure *next;
-	unsigned long id;
-	cairo_t *context;
-	cairo_surface_t *surface;
-	cairo_surface_t *original;
-    } *contexts;
-
-    unsigned long context_id;
-};
-
-struct surface_tag {
-    long width, height;
-};
-static const cairo_user_data_key_t surface_tag;
-
-static int
-client_socket (const char *socket_path);
-
-static int
-writen (int fd, const void *ptr, int len)
-{
-#if 1
-    const uint8_t *data = ptr;
-    while (len) {
-	int ret = write (fd, data, len);
-	if (ret < 0) {
-	    switch (errno) {
-	    case EAGAIN:
-	    case EINTR:
-		continue;
-	    default:
-		return FALSE;
-	    }
-	} else if (ret == 0) {
-	    return FALSE;
-	} else {
-	    data += ret;
-	    len -= ret;
-	}
-    }
-    return TRUE;
-#else
-    int ret = send (fd, ptr, len, 0);
-    return ret == len;
-#endif
-}
-
-static int
-readn (int fd, void *ptr, int len)
-{
-#if 0
-    uint8_t *data = ptr;
-    while (len) {
-	int ret = read (fd, data, len);
-	if (ret < 0) {
-	    switch (errno) {
-	    case EAGAIN:
-	    case EINTR:
-		continue;
-	    default:
-		return FALSE;
-	    }
-	} else if (ret == 0) {
-	    return FALSE;
-	} else {
-	    data += ret;
-	    len -= ret;
-	}
-    }
-    return TRUE;
-#else
-    int ret = recv (fd, ptr, len, MSG_WAITALL);
-    return ret == len;
-#endif
-}
-static int
-open_devnull_to_fd (int want_fd, int flags)
-{
-    int error;
-    int got_fd;
-
-    close (want_fd);
-
-    got_fd = open("/dev/null", flags | O_CREAT, 0700);
-    if (got_fd == -1)
-        return -1;
-
-    error = dup2 (got_fd, want_fd);
-    close (got_fd);
-
-    return error;
-}
-
-static int
-daemonize (void)
-{
-    void (*oldhup) (int);
-
-    /* Let the parent go. */
-    switch (fork ()) {
-    case -1: return -1;
-    case  0: break;
-    default: _exit (0);
-    }
-
-    /* Become session leader. */
-    if (setsid () == -1)
-	return -1;
-
-    /* Refork to yield session leadership. */
-    oldhup = signal (SIGHUP, SIG_IGN);
-    switch (fork ()) {
-    case -1: return -1;
-    case  0: break;
-    default: _exit (0);
-    }
-    signal (SIGHUP, oldhup);
-
-    /* Establish stdio. */
-    if (open_devnull_to_fd (0, O_RDONLY) == -1)
-	return -1;
-    if (open_devnull_to_fd (1, O_WRONLY | O_APPEND) == -1)
-	return -1;
-    if (dup2 (1, 2) == -1)
-	return -1;
-
-    return 0;
-}
-
-static int
-server_socket (const char *socket_path)
-{
-    long flags;
-    struct sockaddr_un addr;
-    int sk;
-
-    unlink (socket_path);
-
-    sk = socket (PF_UNIX, SOCK_STREAM, 0);
-    if (sk == -1)
-	return -1;
-

_service:tar_scm:cairo-1.17.8.tar.xz/util/trace-to-xml.c Deleted

@@ -1,76 +0,0 @@
-#include "config.h"
-
-#include <cairo-xml.h>
-#include <cairo-script-interpreter.h>
-
-#include <stdio.h>
-#include <string.h>
-
-static cairo_surface_t *
-_surface_create (void *_closure,
-		 cairo_content_t content,
-		 double width, double height,
-		 long uid)
-{
-    cairo_surface_t **closure = _closure;
-    cairo_surface_t *surface;
-    cairo_rectangle_t extents;
-
-    extents.x = extents.y = 0;
-    extents.width  = width;
-    extents.height = height;
-    surface = cairo_recording_surface_create (content, &extents);
-    if (*closure == NULL)
-	*closure = cairo_surface_reference (surface);
-
-    return surface;
-}
-
-static cairo_status_t
-stdio_write (void *closure, const unsigned char *data, unsigned len)
-{
-    if (fwrite (data, len, 1, closure) == 1)
-	return CAIRO_STATUS_SUCCESS;
-    else
-	return CAIRO_STATUS_WRITE_ERROR;
-}
-
-int
-main (int argc, char **argv)
-{
-    cairo_surface_t *surface = NULL;
-    const cairo_script_interpreter_hooks_t hooks = {
-	.closure = &surface,
-	.surface_create = _surface_create,
-    };
-    cairo_script_interpreter_t *csi;
-    FILE *in = stdin, *out = stdout;
-
-    if (argc >= 2 && strcmp (argv1, "-"))
-	in = fopen (argv1, "r");
-    if (argc >= 3 && strcmp (argv2, "-"))
-	out = fopen (argv2, "w");
-
-    csi = cairo_script_interpreter_create ();
-    cairo_script_interpreter_install_hooks (csi, &hooks);
-    cairo_script_interpreter_feed_stream (csi, in);
-    cairo_script_interpreter_finish (csi);
-    cairo_script_interpreter_destroy (csi);
-
-    if (surface != NULL) {
-	cairo_device_t *xml;
-
-	xml = cairo_xml_create_for_stream (stdio_write, out);
-	cairo_xml_for_recording_surface (xml, surface);
-	cairo_device_destroy (xml);
-
-	cairo_surface_destroy (surface);
-    }
-
-    if (in != stdin)
-	fclose (in);
-    if (out != stdout)
-	fclose (out);
-
-    return 0;
-}

_service:tar_scm:cairo-1.17.8.tar.xz/util/xml-to-trace.c Deleted

@@ -1,263 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <expat.h>
-#include <assert.h>
-
-struct trace {
-    FILE *stream;
-    char tail_buf80;
-    const char *tail;
-    int surface_depth;
-};
-
-static void
-start_element (void *closure,
-	       const char *element,
-	       const char **attr)
-{
-    struct trace *trace = closure;
-
-    if (strcmp (element, "surface") == 0) {
-	const char *content = "COLOR_ALPHA";
-	const char *width = NULL;
-	const char *height = NULL;
-
-	while (*attr) {
-	    if (strcmp (*attr, "content") == 0) {
-		content = *++attr;
-	    } else if (strcmp (*attr, "width") == 0) {
-		width = *++attr;
-	    } else if (strcmp (*attr, "height") == 0) {
-		height = *++attr;
-	    } else {
-		fprintf (stderr, "unknown surface attribute '%s'\n", *attr);
-		attr++;
-	    }
-	    attr++;
-	}
-
-	fprintf (trace->stream, "<< /content //%s", content);
-	if (width != NULL && height != NULL) {
-	    fprintf (trace->stream,
-		     " /width %s /height %s",
-		     width, height);
-	}
-	if (trace->surface_depth++ == 0)
-	    fprintf (trace->stream, " >> surface context\n");
-	else
-	    fprintf (trace->stream, " >> surface dup context\n");
-    } else if (strcmp (element, "image") == 0) {
-	const char *format = "ARGB24";
-	const char *width = NULL;
-	const char *height = NULL;
-
-	while (*attr) {
-	    if (strcmp (*attr, "format") == 0) {
-		format = *++attr;
-	    } else if (strcmp (*attr, "width") == 0) {
-		width = *++attr;
-	    } else if (strcmp (*attr, "height") == 0) {
-		height = *++attr;
-	    } else {
-		fprintf (stderr, "unknown image attribute '%s'\n", *attr);
-		attr++;
-	    }
-	    attr++;
-	}
-
-	fprintf (trace->stream,
-		 "<< /format //%s /width %s /height %s /mime-type (image/png) /source <{",
-		 format, width, height);
-	assert (trace->tail == NULL);
-	trace->tail = "}> >> image pattern\n";
-    } else if (strcmp (element, "solid") == 0) {
-	trace->tail = " rgba\n";
-    } else if (strcmp (element, "linear") == 0) {
-	const char *x1 = NULL;
-	const char *x2 = NULL;
-	const char *y1 = NULL;
-	const char *y2 = NULL;
-
-	while (*attr) {
-	    if (strcmp (*attr, "x1") == 0) {
-		x1 = *++attr;
-	    } else if (strcmp (*attr, "x2") == 0) {
-		x2 = *++attr;
-	    } else if (strcmp (*attr, "y1") == 0) {
-		y1 = *++attr;
-	    } else if (strcmp (*attr, "y2") == 0) {
-		y2 = *++attr;
-	    } else {
-		fprintf (stderr, "unknown linear attribute '%s'\n", *attr);
-		attr++;
-	    }
-	    attr++;
-	}
-
-	fprintf (trace->stream, "%s %s %s %s linear\n", x1, y1, x2, y2);
-    } else if (strcmp (element, "radial") == 0) {
-	const char *x1 = NULL;
-	const char *y1 = NULL;
-	const char *r1 = NULL;
-	const char *y2 = NULL;
-	const char *x2 = NULL;
-	const char *r2 = NULL;
-
-	while (*attr) {
-	    if (strcmp (*attr, "x1") == 0) {
-		x1 = *++attr;
-	    } else if (strcmp (*attr, "y1") == 0) {
-		y1 = *++attr;
-	    } else if (strcmp (*attr, "r1") == 0) {
-		r1 = *++attr;
-	    } else if (strcmp (*attr, "x2") == 0) {
-		x2 = *++attr;
-	    } else if (strcmp (*attr, "y2") == 0) {
-		y2 = *++attr;
-	    } else if (strcmp (*attr, "r2") == 0) {
-		r2 = *++attr;
-	    } else {
-		fprintf (stderr, "unknown radial attribute '%s'\n", *attr);
-		attr++;
-	    }
-	    attr++;
-	}
-
-	fprintf (trace->stream,
-		 "%s %s %s %s %s %s radial\n",
-		 x1, y1, r1, x2, y2, r2);
-    } else if (strcmp (element, "matrix") == 0) {
-	fprintf (trace->stream, " ");
-	trace->tail = "  set-matrix\n";
-    } else if (strcmp (element, "extend") == 0) {
-	trace->tail = " set-extend\n";
-    } else if (strcmp (element, "filter") == 0) {
-	trace->tail = " set-filter\n";
-    } else if (strcmp (element, "operator") == 0) {
-	trace->tail = " set-operator\n";
-    } else if (strcmp (element, "tolerance") == 0) {
-	trace->tail = " set-tolerance\n";
-    } else if (strcmp (element, "fill-rule") == 0) {
-	trace->tail = " set-fill-rule\n";
-    } else if (strcmp (element, "line-cap") == 0) {
-	trace->tail = " set-line-cap\n";
-    } else if (strcmp (element, "line-join") == 0) {
-	trace->tail = " set-line-join\n";
-    } else if (strcmp (element, "line-width") == 0) {
-	trace->tail = " set-line-width\n";
-    } else if (strcmp (element, "miter-limit") == 0) {
-	trace->tail = " set-miter-limit\n";
-    } else if (strcmp (element, "antialias") == 0) {
-	trace->tail = " set-antialias\n";
-    } else if (strcmp (element, "color-stop") == 0) {
-	trace->tail = " add-color-stop\n";
-    } else if (strcmp (element, "path") == 0) {
-	/* need to reset the matrix to identity before the path */
-	fprintf (trace->stream, "identity set-matrix ");
-	trace->tail = "\n";
-    } else if (strcmp (element, "dash") == 0) {
-	const char *offset = "0";
-
-	while (*attr) {
-	    if (strcmp (*attr, "offset") == 0) {
-		offset = *++attr;
-	    }
-	    attr++;
-	}
-
-	fprintf (trace->stream, "");
-	sprintf (trace->tail_buf, " %s set-dash\n", offset);
-	trace->tail = trace->tail_buf;
-    } else {
-    }
-}
-
-static void
-cdata (void *closure,
-       const XML_Char *s,
-       int len)
-{
-    struct trace *trace = closure;
-
-    if (trace->tail)
-	fwrite (s, len, 1, trace->stream);
-}
-
-static void
-end_element (void *closure,
-	     const char *element)
-{
-    struct trace *trace = closure;
-
-    if (trace->tail) {
-	fprintf (trace->stream, "%s", trace->tail);
-	trace->tail = NULL;
-    }
-
-    if (strcmp (element, "paint") == 0) {
-	fprintf (trace->stream, "paint\n");
-    } else if (strcmp (element, "mask") == 0) {

_service:tar_scm:cairo-1.17.8.tar.xz/.gitlab-ci.yml -> _service:tar_scm:cairo-1.18.0.tar.xz/.gitlab-ci.yml Changed

@@ -2,17 +2,25 @@
 include:
   - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
   - project: 'freedesktop/ci-templates'
-    ref: '88ed1082df2af02090916566742543f1dbaee988'
+    ref: '7811ba9814a3bad379377241c6c6b62d78b20eac'
     file: '/templates/fedora.yml'
 
+# From https://gitlab.freedesktop.org/freedesktop/ci-templates/-/blob/master/src/gitlab-ci.tmpl
+workflow:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
+      when: never
+    - if: $CI_COMMIT_BRANCH
+
 variables:
   FDO_UPSTREAM_REPO: 'cairo/cairo'
-  FDO_DISTRIBUTION_VERSION: '34'
-  FDO_DISTRIBUTION_TAG: '2021-09-20.0'
+  FDO_DISTRIBUTION_VERSION: '38'
+  FDO_DISTRIBUTION_TAG: '2023-08-28.1'
 
   # TODO: should probably get its own image at some point instead of reusing the GStreamer one
   # See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-image-tags.yml for latest
-  WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2022-12-10.0-main"
+  WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2023-04-21.0-main"
 
   DEFAULT_MESON_ARGS: >
     --default-library=both
@@ -76,11 +84,7 @@
       systemd-devel
       systemd-udev
       expat-devel
-      autoconf
-      automake
-      make
       which
-      libtool
       diffutils
       xorg-x11-server-Xvfb
       dejavu-sans-fonts
@@ -88,12 +92,53 @@
       dejavu-serif-fonts
       google-noto-emoji-color-fonts
       fonttools
+      util-linux
+
+.build fedora:
+  extends:
+    - '.fdo.distribution-image@fedora'
+    - '.ccache_setup'
+  stage: 'build'
+  variables:
+    MESON_ARGS: >
+      ${DEFAULT_MESON_ARGS}
+      ${EXTRA_MESON_ARGS}
+  script:
+    - export CFLAGS="-Werror -Wno-error=deprecated-declarations"
+    - meson setup ${MESON_ARGS} builddir
+    - meson compile -C builddir
+
+    # Run test scripts
+    - mkdir builddir/src/.libs
+    - touch builddir/src/.libs/libfoo.so
+    # Run all the tests, except for the big test executable which
+    # gets run separately
+    - meson test -C builddir --no-suite=slow --print-errorlogs
+
+    - meson install -C builddir
+  artifacts:
+    expire_in: "7 days"
+    when: "always"
+    paths:
+      - "*"
+
+fedora build shared:
+  extends:
+    - '.build fedora'
+  variables:
+    EXTRA_MESON_ARGS: '--default-library=shared'
 
-.test fedora meson:
+fedora build static:
+  extends:
+    - '.build fedora'
+  variables:
+    EXTRA_MESON_ARGS: '--default-library=static'
+
+.test fedora:
   dependencies:
-    - 'fedora meson build'
+    - 'fedora build shared'
   needs:
-    - 'fedora meson build'
+    - 'fedora build shared'
   extends:
     - '.fdo.distribution-image@fedora'
     - '.ccache_setup'
@@ -110,14 +155,14 @@
       - "builddir/test/**/*.cs"
       - "builddir/test/**/*.trace"
 
-fedora meson build check-refs.sh:
-  extends: '.test fedora meson'
+fedora build check-refs.sh:
+  extends: '.test fedora'
   script:
     # Check for duplicate reference images
     - ./test/check-refs.sh "$(pwd)/builddir/test/pdiff/perceptualdiff"
 
-test fedora meson pdf:
-  extends: '.test fedora meson'
+test fedora pdf:
+  extends: '.test fedora'
   script:
     - export CAIRO_TEST_IGNORE_pdf_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-pdf-argb32.txt)
     - export CAIRO_TEST_IGNORE_pdf_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-pdf-rgb24.txt)
@@ -125,8 +170,8 @@
     - export srcdir=../../test
     - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora meson ps2:
-  extends: '.test fedora meson'
+test fedora ps2:
+  extends: '.test fedora'
   script:
     - export CAIRO_TEST_IGNORE_ps2_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-ps2-argb32.txt)
     - export CAIRO_TEST_IGNORE_ps2_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-ps2-rgb24.txt)
@@ -135,8 +180,8 @@
     - export srcdir=../../test
     - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora meson ps3:
-  extends: '.test fedora meson'
+test fedora ps3:
+  extends: '.test fedora'
   script:
     - export CAIRO_TEST_IGNORE_ps3_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-ps3-argb32.txt)
     - export CAIRO_TEST_IGNORE_ps3_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-ps3-rgb24.txt)
@@ -145,8 +190,8 @@
     - export srcdir=../../test
     - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora meson script:
-  extends: '.test fedora meson'
+test fedora script:
+  extends: '.test fedora'
   script:
     - export CAIRO_TEST_UGLY_HACK_TO_SOMETIMES_IGNORE_SCRIPT_XCB_HUGE_IMAGE_SHM=1
     - export CAIRO_TEST_IGNORE_script_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-script-argb32.txt)
@@ -154,8 +199,8 @@
     - export srcdir=../../test
     - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora meson image:
-  extends: '.test fedora meson'
+test fedora image:
+  extends: '.test fedora'
   script:
     - export CAIRO_TEST_IGNORE_image_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-image-argb32.txt)
     - export CAIRO_TEST_IGNORE_image_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-image-rgb24.txt)
@@ -164,8 +209,8 @@
     - export srcdir=../../test
     - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora meson recording:
-  extends: '.test fedora meson'
+test fedora recording:
+  extends: '.test fedora'
   script:
     - export CAIRO_TEST_IGNORE_recording_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-recording-argb32.txt)
     - export CAIRO_TEST_IGNORE_recording_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-recording-rgb24.txt)
@@ -173,8 +218,8 @@
     - export srcdir=../../test
     - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora meson svg:
-  extends: '.test fedora meson'
+test fedora svg:
+  extends: '.test fedora'
   script:
     - export CAIRO_TEST_IGNORE_svg11_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-svg11-argb32.txt)
     - export CAIRO_TEST_IGNORE_svg11_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-svg11-rgb24.txt)
@@ -186,8 +231,8 @@
     - export srcdir=../../test
     - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora meson xcb:
-  extends: '.test fedora meson'
+test fedora xcb:
+  extends: '.test fedora'
   script:
     - export CAIRO_TEST_IGNORE_xcb_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-argb32.txt)
     - export CAIRO_TEST_IGNORE_xcb_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-rgb24.txt)
@@ -200,8 +245,8 @@
     - export srcdir=../../test
     - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-test fedora meson xlib:

_service:tar_scm:cairo-1.17.8.tar.xz/.gitlab-ci/ignore-ps3-argb32.txt -> _service:tar_scm:cairo-1.18.0.tar.xz/.gitlab-ci/ignore-ps3-argb32.txt Changed

_service:tar_scm:cairo-1.17.8.tar.xz/.gitlab-ci/ignore-ps3-rgb24.txt -> _service:tar_scm:cairo-1.18.0.tar.xz/.gitlab-ci/ignore-ps3-rgb24.txt Changed

_service:tar_scm:cairo-1.17.8.tar.xz/.gitlab-ci/ignore-quartz-argb32.txt -> _service:tar_scm:cairo-1.18.0.tar.xz/.gitlab-ci/ignore-quartz-argb32.txt Changed

_service:tar_scm:cairo-1.17.8.tar.xz/.gitlab-ci/ignore-quartz-rgb24.txt -> _service:tar_scm:cairo-1.18.0.tar.xz/.gitlab-ci/ignore-quartz-rgb24.txt Changed

_service:tar_scm:cairo-1.17.8.tar.xz/.gitlab-ci/ignore-svg11-argb32.txt -> _service:tar_scm:cairo-1.18.0.tar.xz/.gitlab-ci/ignore-svg11-argb32.txt Changed

_service:tar_scm:cairo-1.17.8.tar.xz/.gitlab-ci/ignore-svg11-rgb24.txt -> _service:tar_scm:cairo-1.18.0.tar.xz/.gitlab-ci/ignore-svg11-rgb24.txt Changed

_service:tar_scm:cairo-1.17.8.tar.xz/NEWS -> _service:tar_scm:cairo-1.18.0.tar.xz/NEWS Changed

@@ -1,3 +1,47 @@
+Release 1.18.0 (2023-09-20 Emmanuele Bassi <ebassi@gnome.org>)
+==============================================================
+
+The first stable cairo release in five years should be cause for celebration.
+
+All the API added in the 1.17 development cycle is now considered stable, and
+will not change.
+
+Many thanks to all the contributors for this release.
+
+The cairo-sphinx tool has been removed; we could not find any instruction on
+how to use it, and no user answered our call for help. If you were using
+cairo-sphinx, please reach out to the cairo maintainers.
+
+Cairo now implements Type 3 color fonts for PDF. Thanks to Adrian Johnson for
+his work on this feature.
+
+Khaled Hosny contributed multiple documentation fixes, to ensure that the
+cairo API reference is up to date. Khaled also fixed multiple compiler
+warnings generated when building cairo.
+
+The XML surface has been removed; it was disabled by default when building
+cairo, and we could not find any downstream distributor that would enable
+it.
+
+The Tee surface is now automatically enabled. Downstream distributors of
+cairo have been enabling for years it in order to build Firefox.
+
+Fujii Hironori and Adrian Johnson fixed multiple issues with the DWrite
+font backend.
+
+John Ralls improved the Quartz surface; mainly, Quartz surfaces now use
+the main display ColorSpace, speeding up rendering operations.
+
+Cairo now hides all private symbols by default on every platform; the old
+"slim" symbols hack to alias internally used symbols has been dropped, in
+favor of using `-Bsymbolic-functions` with toolchains that support it.
+
+Uli Schlachter fixed multiple memory leaks in the code base and test suite,
+and helped with many reviews and general maintenance.
+
+Marc Jeanmougin added new API to expose the Pixman dithering filter to cairo
+patterns; this is currently implemented only for image surfaces.
+
 Release 1.17.8 (2023-01-30 Emmanuele Bassi <ebassi@gnome.org>)
 ==============================================================
 
@@ -108,7 +152,7 @@
 optimizations, and stabilization.
 
 Subpixel positioning support allows improved glyph outlines with the
-Freetype font backend.
+FreeType font backend.
 
 For a complete log of changes, please see
 
@@ -8223,7 +8267,7 @@
 2003-10
 =======
 Graydon Hoare <graydon@redhat.com> implemented the first real text
-support using Freetype/fontconfig, (previous versions of cairo used
+support using FreeType/fontconfig, (previous versions of cairo used
 Xft and could only draw text when using an X backend).
 
 2003-09

_service:tar_scm:cairo-1.17.8.tar.xz/README.md -> _service:tar_scm:cairo-1.18.0.tar.xz/README.md Changed

_service:tar_scm:cairo-1.17.8.tar.xz/boilerplate/cairo-boilerplate-quartz.c -> _service:tar_scm:cairo-1.18.0.tar.xz/boilerplate/cairo-boilerplate-quartz.c Changed

@@ -26,7 +26,41 @@
 
 #include "cairo-boilerplate-private.h"
 
-#include <cairo-quartz.h>
+#include <cairo-quartz-private.h>
+
+#include <dlfcn.h>
+
+#ifndef RTLD_DEFAULT
+#define RTLD_DEFAULT ((void *) 0)
+#endif
+
+/*
+ * macOS Private functions
+ */
+typedef enum {
+    kCGContextTypeUnknown,
+    kCGContextTypePDF,
+    kCGContextTypePostScript,
+    kCGContextTypeWindow,
+    kCGContextTypeBitmap,
+    kCGContextTypeGL,
+    kCGContextTypeDisplayList,
+    kCGContextTypeKSeparation,
+    kCGContextTypeIOSurface,
+    kCGContextTypeCount
+} CGContextType;
+
+
+static unsigned int (*CGContextGetTypePtr) (CGContextRef) = NULL;
+static void
+quartz_ensure_symbols (void)
+{
+    static cairo_bool_t symbol_lookup_done = FALSE;
+    if (!symbol_lookup_done) {
+	CGContextGetTypePtr = dlsym (RTLD_DEFAULT, "CGContextGetType");
+	symbol_lookup_done = TRUE;
+    }
+}
 
 static cairo_surface_t *
 _cairo_boilerplate_quartz_create_surface (const char		    *name,
@@ -47,6 +81,48 @@
     return cairo_quartz_surface_create (format, width, height);
 }
 
+static bool
+cg_context_is_bitmap (CGContextRef context)
+{
+    quartz_ensure_symbols ();
+
+    if (likely (CGContextGetTypePtr)) {
+	return CGContextGetTypePtr (context) == kCGContextTypeBitmap;
+    }
+
+    return CGBitmapContextGetBitsPerPixel (context) != 0;
+}
+
+static cairo_status_t
+_cairo_boilerplate_quartz_surface_to_png (cairo_surface_t *surface,
+                                          const char      *dest)
+{
+    CGContextRef context = cairo_quartz_surface_get_cg_context (surface);
+    if (!context || !cg_context_is_bitmap (context)) {
+        return CAIRO_STATUS_SURFACE_TYPE_MISMATCH;
+    }
+
+    CGImageRef image = CGBitmapContextCreateImage (context);
+    CFStringRef png_utti = CFSTR("public.png");
+    CFStringRef path;
+    CFURLRef url;
+
+    CGImageDestinationRef image_dest;
+
+    path = CFStringCreateWithCString (NULL, dest, kCFStringEncodingUTF8);
+    url = CFURLCreateWithFileSystemPath (NULL, path, kCFURLPOSIXPathStyle, FALSE);
+    image_dest = CGImageDestinationCreateWithURL (url, png_utti, 1, NULL);
+
+    CGImageDestinationAddImage (image_dest, image, NULL);
+    CGImageDestinationFinalize (image_dest);
+
+    CFRelease (url);
+    CFRelease (path);
+
+    CGImageRelease (image);
+    return CAIRO_STATUS_SUCCESS;
+}
+
 static const cairo_boilerplate_target_t targets = {
     {
 	"quartz", "quartz", NULL, NULL,
@@ -56,7 +132,7 @@
 	cairo_surface_create_similar,
 	NULL, NULL,
 	_cairo_boilerplate_get_image_surface,
-	cairo_surface_write_to_png,
+	_cairo_boilerplate_quartz_surface_to_png,
 	NULL, NULL, NULL,
 	TRUE, FALSE, FALSE
     },
@@ -68,7 +144,7 @@
 	cairo_surface_create_similar,
 	NULL, NULL,
 	_cairo_boilerplate_get_image_surface,
-	cairo_surface_write_to_png,
+	_cairo_boilerplate_quartz_surface_to_png,
 	NULL, NULL, NULL,
         FALSE, FALSE, FALSE
     },

_service:tar_scm:cairo-1.17.8.tar.xz/boilerplate/meson.build -> _service:tar_scm:cairo-1.18.0.tar.xz/boilerplate/meson.build Changed

_service:tar_scm:cairo-1.17.8.tar.xz/doc/public/cairo-docs.xml -> _service:tar_scm:cairo-1.18.0.tar.xz/doc/public/cairo-docs.xml Changed

@@ -43,11 +43,12 @@
     <xi:include href="xml/cairo-win32.xml"/>
     <xi:include href="xml/cairo-svg.xml"/>
     <xi:include href="xml/cairo-quartz.xml" />
-    
     <xi:include href="xml/cairo-xcb.xml"/>
     <xi:include href="xml/cairo-xlib.xml"/>
     <xi:include href="xml/cairo-xlib-xrender.xml"/>
     <xi:include href="xml/cairo-script.xml"/>
+    <xi:include href="xml/cairo-surface-observer.xml"/>
+    <xi:include href="xml/cairo-tee.xml"/>
   </chapter>
   <chapter id="cairo-support">
     <title>Utilities</title>
@@ -56,53 +57,53 @@
     <xi:include href="xml/cairo-version.xml"/>
     <xi:include href="xml/cairo-types.xml"/>
   </chapter>
-  <index id="api-index-all">
+  <chapter id="api-index-all">
     <title>Index</title>
     <xi:include href="xml/api-index-full.xml"/>
-  </index>
+  </chapter>
   
-  <index id="api-index-1-0">
+  <chapter id="api-index-1-0">
     <title>Index of new symbols in 1.0</title>
     <xi:include href="xml/api-index-1.0.xml"/>
-  </index>
-  <index id="api-index-1-2">
+  </chapter>
+  <chapter id="api-index-1-2">
     <title>Index of new symbols in 1.2</title>
     <xi:include href="xml/api-index-1.2.xml"/>
-  </index>
-  <index id="api-index-1-4">
+  </chapter>
+  <chapter id="api-index-1-4">
     <title>Index of new symbols in 1.4</title>
     <xi:include href="xml/api-index-1.4.xml"/>
-  </index>
-  <index id="api-index-1-6">
+  </chapter>
+  <chapter id="api-index-1-6">
     <title>Index of new symbols in 1.6</title>
     <xi:include href="xml/api-index-1.6.xml"/>
-  </index>
-  <index id="api-index-1-8">
+  </chapter>
+  <chapter id="api-index-1-8">
     <title>Index of new symbols in 1.8</title>
     <xi:include href="xml/api-index-1.8.xml"/>
-  </index>
-  <index id="api-index-1-10">
+  </chapter>
+  <chapter id="api-index-1-10">
     <title>Index of new symbols in 1.10</title>
     <xi:include href="xml/api-index-1.10.xml"/>
-  </index>
-  <index id="api-index-1-12">
+  </chapter>
+  <chapter id="api-index-1-12">
     <title>Index of new symbols in 1.12</title>
     <xi:include href="xml/api-index-1.12.xml"/>
-  </index>
-  <index id="api-index-1-14">
+  </chapter>
+  <chapter id="api-index-1-14">
     <title>Index of new symbols in 1.14</title>
     <xi:include href="xml/api-index-1.14.xml"/>
-  </index>
-  <index id="api-index-1-16">
+  </chapter>
+  <chapter id="api-index-1-16">
     <title>Index of new symbols in 1.16</title>
     <xi:include href="xml/api-index-1.16.xml"/>
-  </index>
-  <index id="api-index-1-18">
+  </chapter>
+  <chapter id="api-index-1-18">
     <title>Index of new symbols in 1.18</title>
     <xi:include href="xml/api-index-1.18.xml"/>
-  </index>
-  <xi:include href="language-bindings.xml"/>
+  </chapter>
+  <xi:include href="xml/language-bindings.xml"/>
 </book>

_service:tar_scm:cairo-1.17.8.tar.xz/doc/public/cairo-overrides.txt -> _service:tar_scm:cairo-1.18.0.tar.xz/doc/public/cairo-overrides.txt Changed

@@ -0,0 +1,124 @@
+<MACRO>
+<NAME>CAIRO_HAS_FT_FONT</NAME>
+#define CAIRO_HAS_FT_FONT
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_FC_FONT</NAME>
+#define CAIRO_HAS_FC_FONT
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_PNG_FUNCTIONS</NAME>
+#define CAIRO_HAS_PNG_FUNCTIONS
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_SVG_SURFACE</NAME>
+#define CAIRO_HAS_SVG_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_PDF_SURFACE</NAME>
+#define CAIRO_HAS_PDF_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_PS_SURFACE</NAME>
+#define CAIRO_HAS_PS_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_SCRIPT_SURFACE</NAME>
+#define CAIRO_HAS_SCRIPT_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_XLIB_SURFACE</NAME>
+#define CAIRO_HAS_XLIB_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_XLIB_XRENDER_SURFACE</NAME>
+#define CAIRO_HAS_XLIB_XRENDER_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_XCB_SURFACE</NAME>
+#define CAIRO_HAS_XCB_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_XLIB_XCB_FUNCTIONS</NAME>
+#define CAIRO_HAS_XLIB_XCB_FUNCTIONS
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_XCB_SHM_FUNCTIONS</NAME>
+#define CAIRO_HAS_XCB_SHM_FUNCTIONS
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_QUARTZ_SURFACE</NAME>
+#define CAIRO_HAS_QUARTZ_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_QUARTZ_IMAGE_SURFACE</NAME>
+#define CAIRO_HAS_QUARTZ_IMAGE_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_QUARTZ_FONT</NAME>
+#define CAIRO_HAS_QUARTZ_FONT
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_WIN32_SURFACE</NAME>
+#define CAIRO_HAS_WIN32_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_WIN32_FONT</NAME>
+#define CAIRO_HAS_WIN32_FONT
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_DWRITE_FONT</NAME>
+#define CAIRO_HAS_DWRITE_FONT
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_GOBJECT_FUNCTIONS</NAME>
+#define CAIRO_HAS_GOBJECT_FUNCTIONS
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_IMAGE_SURFACE</NAME>
+#define CAIRO_HAS_IMAGE_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_USER_FONT</NAME>
+#define CAIRO_HAS_USER_FONT
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_MIME_SURFACE</NAME>
+#define CAIRO_HAS_MIME_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_RECORDING_SURFACE</NAME>
+#define CAIRO_HAS_RECORDING_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_OBSERVER_SURFACE</NAME>
+#define CAIRO_HAS_OBSERVER_SURFACE
+</MACRO>
+
+<MACRO>
+<NAME>CAIRO_HAS_TEE_SURFACE</NAME>
+#define CAIRO_HAS_TEE_SURFACE
+</MACRO>

_service:tar_scm:cairo-1.17.8.tar.xz/doc/public/cairo-sections.txt -> _service:tar_scm:cairo-1.18.0.tar.xz/doc/public/cairo-sections.txt Changed

@@ -163,14 +163,18 @@
 <SECTION>
 <FILE>cairo-quartz</FILE>
 CAIRO_HAS_QUARTZ_SURFACE
+CAIRO_HAS_QUARTZ_IMAGE_SURFACE
 cairo_quartz_surface_create
 cairo_quartz_surface_create_for_cg_context
 cairo_quartz_surface_get_cg_context
+cairo_quartz_image_surface_create
+cairo_quartz_image_surface_get_image
 </SECTION>
 
 <SECTION>
 <FILE>cairo-xlib</FILE>
 CAIRO_HAS_XLIB_SURFACE
+CAIRO_HAS_XLIB_XCB_FUNCTIONS
 cairo_xlib_surface_create
 cairo_xlib_surface_create_for_bitmap
 cairo_xlib_surface_set_size
@@ -405,6 +409,9 @@
 cairo_pattern_get_reference_count
 cairo_pattern_set_user_data
 cairo_pattern_get_user_data
+cairo_dither_t
+cairo_pattern_set_dither
+cairo_pattern_get_dither
 </SECTION>
 
 <SECTION>
@@ -431,6 +438,8 @@
 <FILE>cairo-tag</FILE>
 CAIRO_TAG_DEST
 CAIRO_TAG_LINK
+CAIRO_TAG_CONTENT
+CAIRO_TAG_CONTENT_REF
 cairo_tag_begin
 cairo_tag_end
 </SECTION>
@@ -755,6 +764,7 @@
 cairo_status_string
 CAIRO_FONT_TYPE_ATSUI
 cairo_atsui_font_face_create_for_atsu_font_id
+CAIRO_HAS_GOBJECT_FUNCTIONS
 </SECTION>
 
 <SECTION>
@@ -770,3 +780,12 @@
 cairo_script_surface_create_for_target
 cairo_script_write_comment
 </SECTION>
+
+<SECTION>
+<FILE>cairo-tee</FILE>
+CAIRO_HAS_TEE_SURFACE
+cairo_tee_surface_create
+cairo_tee_surface_add
+cairo_tee_surface_index
+cairo_tee_surface_remove
+</SECTION>

_service:tar_scm:cairo-1.17.8.tar.xz/doc/public/language-bindings.xml -> _service:tar_scm:cairo-1.18.0.tar.xz/doc/public/language-bindings.xml Changed

_service:tar_scm:cairo-1.17.8.tar.xz/doc/public/meson.build -> _service:tar_scm:cairo-1.18.0.tar.xz/doc/public/meson.build Changed

_service:tar_scm:cairo-1.17.8.tar.xz/meson.build -> _service:tar_scm:cairo-1.18.0.tar.xz/meson.build Changed

@@ -1,11 +1,11 @@
 project('cairo', 'c', 'cpp',
-  meson_version: '>= 0.56.0',
+  meson_version: '>= 0.59.0',
   version: run_command(find_program('version.py'), check: true).stdout().strip(),
   default_options: 'warning_level=2',
 )
 
-# Keep in sync with configure.ac!
 freetype_required_version = '>= 9.7.3'
+freetype_colrv1_required_version = '>= 25.0.19'
 fontconfig_required_version = '>= 2.2.95'
 xrender_required_version = '>= 0.6'
 xcb_required_version = '>= 1.6'
@@ -97,16 +97,6 @@
 
 add_project_arguments('-D_GNU_SOURCE', language: 'c')
 
-# Make sure source directory hasn't been configured with autotools
-fs = import('fs')
-if fs.exists('config.h') or fs.exists('src/cairo-features.h') or fs.exists('src/cairo-supported-features.h')
-  error('''
-        The source directory '@0@' appears to contain
-        autotools configuration artifacts. This can cause difficult to
-        debug build problems. Please clean it up and then re-run meson.
-        '''.format(meson.source_root()))
-endif
-
 pkgmod = import('pkgconfig')
 python3 = import('python').find_installation()
 
@@ -185,6 +175,10 @@
 internal_deps = 
 extra_link_args = 
 
+extra_link_args += cc.get_supported_link_arguments(
+  '-Wl,-Bsymbolic-functions',
+)
+
 if host_machine.endian() == 'big'
   conf.set('WORDS_BIGENDIAN', 1)
 endif
@@ -263,12 +257,10 @@
   endif
 endif
 
-# Don't build fontconfig as a subproject on Windows unless
-# explicitly requested
+# Disable fontconfig by default on platforms where it is optional
 fontconfig_option = get_option('fontconfig')
-if host_machine.system() == 'windows' and not fontconfig_option.enabled()
-  fontconfig_option = false
-endif
+fontconfig_required = host_machine.system() not in 'windows', 'darwin'
+fontconfig_option = fontconfig_option.disable_auto_if(not fontconfig_required)
 
 fontconfig_dep = dependency('fontconfig',
   required: fontconfig_option,
@@ -301,8 +293,13 @@
 
 ttx = find_program('ttx', required: false)
 
+# Disable FreeType by default on platforms where it is optional
+freetype_option = get_option('freetype')
+freetype_required = host_machine.system() not in 'windows', 'darwin'
+freetype_option = freetype_option.disable_auto_if(not freetype_required)
+
 freetype_dep = dependency('freetype2',
-  required: get_option('freetype'),
+  required: freetype_option,
   version: freetype_required_version,
   fallback: 'freetype2', 'freetype_dep',
 )
@@ -310,7 +307,7 @@
   feature_conf.set('CAIRO_HAS_FT_FONT', 1)
   built_features += {
     'name': 'cairo-ft',
-    'description': 'Freetype font backend',
+    'description': 'FreeType font backend',
     'deps': freetype_dep,
     # cairo-ft.h includes fontconfig.h so it needs its cflags
     'compile-deps': fontconfig_dep.partial_dependency(compile_args: true, includes: true),
@@ -336,15 +333,15 @@
     if not cc.links(files('meson-cc-tests/ft_has_color.c'), dependencies: freetype_dep, name: 'FT has color')
       conf.set('FT_HAS_COLOR', '(0)')
     endif
-    if cc.has_type('FT_SVG_Document', dependencies: freetype_dep, prefix: '#include <freetype/otsvg.h>')
+    if png_dep.found() and \
+        cc.has_type('FT_SVG_Document', dependencies: freetype_dep, prefix: '#include <freetype/otsvg.h>')
       conf.set('HAVE_FT_SVG_DOCUMENT', 1)
       if ttx.found()
         conf.set('CAIRO_CAN_TEST_TTX_FONT', 1)
       endif
     endif
-    # When FT COLRv1 API is no longer experimental we can change this to a
-    # version check for the stable COLRv1 API.
-    if cc.get_define('DEBUG_ENABLE_COLR_V1') != ''
+    if freetype_dep.version().version_compare(freetype_colrv1_required_version) and \
+       cc.has_function('FT_Get_Color_Glyph_Paint', dependencies: freetype_dep)
       conf.set('HAVE_FT_COLR_V1', 1)
     endif
     check_funcs += ft_check_funcs
@@ -523,7 +520,6 @@
   d2d_header = cpp_compiler.has_header('d2d1.h')
   d2d_3_header = cpp_compiler.has_header('d2d1_3.h')
   dwrite_header = cpp_compiler.has_header('dwrite.h')
-  dwrite_3_header = cpp_compiler.has_header('dwrite_3.h')
   wincodec_dep = cpp_compiler.find_library('windowscodecs', required: get_option('dwrite'))
   wincodec_header = cpp_compiler.has_header('wincodec.h')
 
@@ -540,11 +536,6 @@
       conf.set('HAVE_D2D1_3_H', 1)
     endif
 
-    # Exclude MinGW dwrite_3.h because it has a broken definition of DWRITE_COLOR_GLYPH_RUN1.
-    if cpp_compiler.has_header('dwrite_3.h') and cpp_compiler.get_define('__MINGW32__') == ''
-      conf.set('HAVE_DWRITE_3_H', 1)
-    endif
-
     add_project_arguments('-DWINVER=_WIN32_WINNT_WIN10', '-D_WIN32_WINNT=_WIN32_WINNT_WIN10', '-DNTDDI_VERSION=NTDDI_WIN10_RS3', language: 'c', 'cpp')
   else
     add_project_arguments('-DWINVER=_WIN32_WINNT_WIN2K', '-D_WIN32_WINNT=_WIN32_WINNT_WIN2K', language: 'c', 'cpp')
@@ -595,15 +586,6 @@
   conf.set('CAIRO_HAS_INTERPRETER', 1)
 endif
 
-if zlib_dep.found() and png_dep.found() and get_option('xml').enabled()
-  feature_conf.set('CAIRO_HAS_XML_SURFACE', 1)
-  built_features += {
-    'name': 'cairo-xml',
-    'description': 'XML surface backend',
-    'deps': zlib_dep,
-  }
-endif
-
 bfd_dep = cc.find_library('bfd', has_headers: 'bfd.h', required: get_option('symbol-lookup'))
 if bfd_dep.found() and \
    cc.has_function('bfd_openr', dependencies: bfd_dep) and \
@@ -839,7 +821,6 @@
         'Observer': true,
         'Mime': true,
         'Tee': feature_conf.get('CAIRO_HAS_TEE_SURFACE', 0) == 1,
-        'XML': feature_conf.get('CAIRO_HAS_XML_SURFACE', 0) == 1,
         'Xlib': feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1,
         'Xlib Xrender': feature_conf.get('CAIRO_HAS_XLIB_XRENDER_SURFACE', 0) == 1,
         'Quartz': feature_conf.get('CAIRO_HAS_QUARTZ_SURFACE', 0) == 1,

_service:tar_scm:cairo-1.17.8.tar.xz/meson_options.txt -> _service:tar_scm:cairo-1.18.0.tar.xz/meson_options.txt Changed

_service:tar_scm:cairo-1.17.8.tar.xz/perf/cairo-analyse-trace.c -> _service:tar_scm:cairo-1.18.0.tar.xz/perf/cairo-analyse-trace.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/perf/cairo-perf-chart.c -> _service:tar_scm:cairo-1.18.0.tar.xz/perf/cairo-perf-chart.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/perf/cairo-perf-trace.c -> _service:tar_scm:cairo-1.18.0.tar.xz/perf/cairo-perf-trace.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-analysis-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-analysis-surface.c Changed

@@ -263,7 +263,8 @@
 _analyze_recording_surface_pattern (cairo_analysis_surface_t *surface,
 				    const cairo_pattern_t    *pattern,
 				    cairo_rectangle_int_t    *extents,
-				    unsigned int             *regions_id)
+				    unsigned int             *regions_id,
+				    cairo_analysis_source_t   source_type)
 {
     const cairo_surface_pattern_t *surface_pattern;
     cairo_analysis_surface_t *tmp;
@@ -273,6 +274,7 @@
     cairo_int_status_t analysis_status = CAIRO_INT_STATUS_SUCCESS;
     cairo_bool_t surface_is_unbounded;
     cairo_bool_t unused;
+    cairo_bool_t replay_all;
 
     assert (pattern->type == CAIRO_PATTERN_TYPE_SURFACE);
     surface_pattern = (const cairo_surface_pattern_t *) pattern;
@@ -288,7 +290,7 @@
     tmp = (cairo_analysis_surface_t *)
 	_cairo_analysis_surface_create (surface->target, surface->create_region_ids);
     if (unlikely (tmp->base.status)) {
-	status =tmp->base.status;
+	status = tmp->base.status;
 	goto cleanup1;
     }
     proxy = attach_proxy (source, &tmp->base);
@@ -298,7 +300,6 @@
     assert (status == CAIRO_INT_STATUS_SUCCESS);
     _cairo_analysis_surface_set_ctm (&tmp->base, &p2d);
 
-
     source = _cairo_surface_get_source (source, NULL);
     surface_is_unbounded = (pattern->extend == CAIRO_EXTEND_REPEAT
 			    || pattern->extend == CAIRO_EXTEND_REFLECT);
@@ -307,22 +308,54 @@
 	status = _cairo_recording_surface_region_array_attach (source, regions_id);
 	if (unlikely (status))
 	    goto cleanup2;
+    }
+
+    replay_all = FALSE;
+    if (surface->target->backend->analyze_recording_surface) {
+	status = surface->target->backend->analyze_recording_surface (
+	    surface->target,
+	    surface_pattern,
+	    surface->create_region_ids ? *regions_id : 0,
+	    source_type,
+	    TRUE);
+        if (status == CAIRO_INT_STATUS_ANALYZE_RECORDING_SURFACE_PATTERN) {
+	    /* Ensure all commands are replayed even if previously
+	     * replayed and assigned to a region.*/
+            replay_all = TRUE;
+            status = CAIRO_INT_STATUS_SUCCESS;
+        }
+        if (unlikely (status))
+            goto cleanup3;
+    }
 
+    if (surface->create_region_ids) {
 	status = _cairo_recording_surface_replay_and_create_regions (source,
 								     *regions_id,
 								     &pattern->matrix,
 								     &tmp->base,
-								     surface_is_unbounded);
+								     surface_is_unbounded,
+								     replay_all);
 	if (unlikely (status))
-	    goto cleanup2;
+	    goto cleanup3;
     } else {
-	status = _cairo_recording_surface_replay_with_clip (source,
-							    &pattern->matrix,
-							    &tmp->base,
-							    NULL, /* target clip */
-							    surface_is_unbounded);
+	status = _cairo_recording_surface_replay_with_transform (source,
+								 &pattern->matrix,
+								 &tmp->base,
+								 surface_is_unbounded,
+								 replay_all);
 	if (unlikely (status))
-	    goto cleanup2;
+	    goto cleanup3;
+    }
+
+    if (surface->target->backend->analyze_recording_surface) {
+	status = surface->target->backend->analyze_recording_surface (
+	    surface->target,
+	    surface_pattern,
+	    surface->create_region_ids ? *regions_id : 0,
+	    source_type,
+	    FALSE);
+        if (unlikely (status))
+            goto cleanup3;
     }
 
     /* black background or mime data fills entire extents */
@@ -339,7 +372,7 @@
 	    if (status == CAIRO_INT_STATUS_IMAGE_FALLBACK)
 		status = CAIRO_INT_STATUS_SUCCESS;
 	    if (unlikely (status))
-		goto cleanup2;
+		goto cleanup3;
 	}
     }
 
@@ -363,6 +396,10 @@
 	_cairo_box_round_to_rectangle (&tmp->page_bbox, extents);
     }
 
+  cleanup3:
+    if (surface->create_region_ids && unlikely (status)) {
+	_cairo_recording_surface_region_array_remove (source, *regions_id);
+    }
   cleanup2:
     detach_proxy (proxy);
   cleanup1:
@@ -454,7 +491,8 @@
 	backend_status = _analyze_recording_surface_pattern (surface,
 							     source,
 							     &rec_extents,
-							     &surface->source_region_id);
+							     &surface->source_region_id,
+							     CAIRO_ANALYSIS_SOURCE_PAINT);
 	_cairo_rectangle_intersect (&extents, &rec_extents);
     }
 
@@ -500,7 +538,8 @@
 		    _analyze_recording_surface_pattern (surface,
 							source,
 							&rec_extents,
-							&surface->source_region_id);
+							&surface->source_region_id,
+							CAIRO_ANALYSIS_SOURCE_MASK);
 		if (_cairo_int_status_is_error (backend_source_status))
 		    return backend_source_status;
 
@@ -516,7 +555,8 @@
 		    _analyze_recording_surface_pattern (surface,
 							mask,
 							&rec_extents,
-							&surface->mask_region_id);
+							&surface->mask_region_id,
+							CAIRO_ANALYSIS_MASK_MASK);
 		if (_cairo_int_status_is_error (backend_mask_status))
 		    return backend_mask_status;
 
@@ -578,7 +618,8 @@
 	backend_status = _analyze_recording_surface_pattern (surface,
 							     source,
 							     &rec_extents,
-							     &surface->source_region_id);
+							     &surface->source_region_id,
+							     CAIRO_ANALYSIS_SOURCE_STROKE);
 	_cairo_rectangle_intersect (&extents, &rec_extents);
     }
 
@@ -633,7 +674,8 @@
 	backend_status = _analyze_recording_surface_pattern (surface,
 							     source,
 							     &rec_extents,
-							     &surface->source_region_id);
+							     &surface->source_region_id,
+							     CAIRO_ANALYSIS_SOURCE_FILL);
 	_cairo_rectangle_intersect (&extents, &rec_extents);
     }
 
@@ -703,7 +745,8 @@
 	backend_status = _analyze_recording_surface_pattern (surface,
 							     source,
 							     &rec_extents,
-							     &surface->source_region_id);
+							     &surface->source_region_id,
+							     CAIRO_ANALYSIS_SOURCE_SHOW_GLYPHS);
 	_cairo_rectangle_intersect (&extents, &rec_extents);
     }
 
@@ -787,7 +830,8 @@
 	_analyze_recording_surface_pattern (surface,
 					    source,
 					    &rec_extents,
-					    &surface->source_region_id);
+					    &surface->source_region_id,
+					    CAIRO_ANALYSIS_SOURCE_SHOW_GLYPHS);
 	_cairo_rectangle_intersect (&extents, &rec_extents);
     }
 
@@ -831,6 +875,33 @@
     return backend_status;
 }
 
+static cairo_bool_t
+_cairo_analysis_surface_supports_color_glyph (void                 *abstract_surface,
+                                              cairo_scaled_font_t  *scaled_font,
+                                              unsigned long         glyph_index)
+{
+    return TRUE;
+}
+

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-arc.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-arc.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-array-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-array-private.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-array.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-array.c Changed

@@ -40,7 +40,7 @@
 #include "cairo-array-private.h"
 #include "cairo-error-private.h"
 
-/**
+/*< private >
  * _cairo_array_init:
  *
  * Initialize a new #cairo_array_t object to store objects each of size
@@ -63,7 +63,7 @@
     array->elements = NULL;
 }
 
-/**
+/*< private >
  * _cairo_array_fini:
  * @array: A #cairo_array_t
  *
@@ -77,7 +77,7 @@
     free (array->elements);
 }
 
-/**
+/*< private >
  * _cairo_array_grow_by:
  * @array: a #cairo_array_t
  *
@@ -125,7 +125,7 @@
     return CAIRO_STATUS_SUCCESS;
 }
 
-/**
+/*< private >
  * _cairo_array_truncate:
  * @array: a #cairo_array_t
  *
@@ -140,17 +140,16 @@
 	array->num_elements = num_elements;
 }
 
-/**
+/*< private >
  * _cairo_array_index:
  * @array: a #cairo_array_t
- * Returns: A pointer to the object stored at @index.
  *
  * If the resulting value is assigned to a pointer to an object of the same
  * element_size as initially passed to _cairo_array_init() then that
  * pointer may be used for further direct indexing with . For
  * example:
  *
- * <informalexample><programlisting>
+ * |
  *	cairo_array_t array;
  *	double *values;
  *
@@ -160,7 +159,9 @@
  *	values = _cairo_array_index (&array, 0);
  *      for (i = 0; i < _cairo_array_num_elements (&array); i++)
  *	    ... use valuesi here ...
- * </programlisting></informalexample>
+ * |
+ *
+ * Returns: A pointer to the object stored at @index.
  **/
 void *
 _cairo_array_index (cairo_array_t *array, unsigned int index)
@@ -184,17 +185,16 @@
     return array->elements + (size_t)index * array->element_size;
 }
 
-/**
+/*< private >
  * _cairo_array_index_const:
  * @array: a #cairo_array_t
- * Returns: A pointer to the object stored at @index.
  *
  * If the resulting value is assigned to a pointer to an object of the same
  * element_size as initially passed to _cairo_array_init() then that
  * pointer may be used for further direct indexing with . For
  * example:
  *
- * <informalexample><programlisting>
+ * |<!-- language="C" --.
  *	cairo_array_t array;
  *	const double *values;
  *
@@ -204,7 +204,9 @@
  *	values = _cairo_array_index_const (&array, 0);
  *      for (i = 0; i < _cairo_array_num_elements (&array); i++)
  *	    ... read valuesi here ...
- * </programlisting></informalexample>
+ * |
+ *
+ * Returns: A pointer to the object stored at @index.
  **/
 const void *
 _cairo_array_index_const (const cairo_array_t *array, unsigned int index)
@@ -228,7 +230,7 @@
     return array->elements + (size_t)index * array->element_size;
 }
 
-/**
+/*< private >
  * _cairo_array_copy_element:
  * @array: a #cairo_array_t
  *
@@ -243,7 +245,7 @@
     memcpy (dst, _cairo_array_index_const (array, index), array->element_size);
 }
 
-/**
+/*< private >
  * _cairo_array_append:
  * @array: a #cairo_array_t
  *
@@ -265,7 +267,7 @@
     return _cairo_array_append_multiple (array, element, 1);
 }
 
-/**
+/*< private >
  * _cairo_array_append_multiple:
  * @array: a #cairo_array_t
  *
@@ -294,7 +296,7 @@
     return CAIRO_STATUS_SUCCESS;
 }
 
-/**
+/*< private >
  * _cairo_array_allocate:
  * @array: a #cairo_array_t
  *
@@ -327,12 +329,13 @@
     return CAIRO_STATUS_SUCCESS;
 }
 
-/**
+/*< private >
  * _cairo_array_num_elements:
  * @array: a #cairo_array_t
- * Returns: The number of elements stored in @array.
  *
  * This space was left intentionally blank, but gtk-doc filled it.
+ *
+ * Returns: The number of elements stored in @array.
  **/
 unsigned int
 _cairo_array_num_elements (const cairo_array_t *array)
@@ -340,13 +343,14 @@
     return array->num_elements;
 }
 
-/**
+/*< private >
  * _cairo_array_size:
  * @array: a #cairo_array_t
- * Returns: The number of elements for which there is currently space
- * allocated in @array.
  *
  * This space was left intentionally blank, but gtk-doc filled it.
+ *
+ * Returns: The number of elements for which there is currently space
+ * allocated in @array.
  **/
 unsigned int
 _cairo_array_size (const cairo_array_t *array)
@@ -354,7 +358,7 @@
     return array->size;
 }
 
-/**
+/*< private >
  * _cairo_user_data_array_init:
  * @array: a #cairo_user_data_array_t
  *
@@ -369,7 +373,7 @@
     _cairo_array_init (array, sizeof (cairo_user_data_slot_t));
 }
 
-/**
+/*< private >
  * _cairo_user_data_array_fini:
  * @array: a #cairo_user_data_array_t
  *
@@ -396,7 +400,7 @@
     _cairo_array_fini (array);
 }
 
-/**
+/*< private >
  * _cairo_user_data_array_get_data:
  * @array: a #cairo_user_data_array_t
  * @key: the address of the #cairo_user_data_key_t the user data was
@@ -429,7 +433,7 @@
     return NULL;
 }
 
-/**

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-atomic-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-atomic-private.h Changed

@@ -304,16 +304,16 @@
 # define _cairo_atomic_int_get_relaxed(x) *(x)
 # define _cairo_atomic_int_set_relaxed(x, val) *(x) = (val)
 
-# define _cairo_atomic_int_inc(x) ((void) InterlockedIncrement (x))
-# define _cairo_atomic_int_dec(x) ((void) InterlockedDecrement (x))
-# define _cairo_atomic_int_dec_and_test(x) (InterlockedDecrement (x) == 0)
+# define _cairo_atomic_int_inc(x) ((void) InterlockedIncrement ((LONG*)x))
+# define _cairo_atomic_int_dec(x) ((void) InterlockedDecrement ((LONG*)x))
+# define _cairo_atomic_int_dec_and_test(x) (InterlockedDecrement ((LONG*)x) == 0)
 
 static cairo_always_inline cairo_bool_t
 _cairo_atomic_int_cmpxchg (cairo_atomic_int_t *x,
                            cairo_atomic_int_t oldv,
                            cairo_atomic_int_t newv)
 {
-    return InterlockedCompareExchange ((unsigned int*)x, (unsigned int)newv, (unsigned int)oldv) == oldv;
+    return InterlockedCompareExchange ((LONG*)x, (LONG)newv, (LONG)oldv) == oldv;
 }
 
 static cairo_always_inline void *

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-cache.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-cache.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-cff-subset.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-cff-subset.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-clip-boxes.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-clip-boxes.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-compiler-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-compiler-private.h Changed

@@ -54,58 +54,6 @@
 
 #define CAIRO_STACK_ARRAY_LENGTH(T) (CAIRO_STACK_BUFFER_SIZE / sizeof(T))
 
-/*
- * The goal of this block is to define the following macros for
- * providing faster linkage to functions in the public API for calls
- * from within cairo.
- *
- * slim_hidden_proto(f)
- * slim_hidden_proto_no_warn(f)
- *
- *   Declares `f' as a library internal function and hides the
- *   function from the global symbol table.  This macro must be
- *   expanded after `f' has been declared with a prototype but before
- *   any calls to the function are seen by the compiler.  The no_warn
- *   variant inhibits warnings about the return value being unused at
- *   call sites.  The macro works by renaming `f' to an internal name
- *   in the symbol table and hiding that.  As far as cairo internal
- *   calls are concerned they're calling a library internal function
- *   and thus don't need to bounce via the procedure linkage table (PLT).
- *
- * slim_hidden_def(f)
- *
- *   Exports `f' back to the global symbol table.  This macro must be
- *   expanded right after the function definition and only for symbols
- *   hidden previously with slim_hidden_proto().  The macro works by
- *   adding a global entry to the symbol table which points at the
- *   internal name of `f' created by slim_hidden_proto().
- *
- * Functions in the public API which aren't called by the library
- * don't need to be hidden and re-exported using the slim hidden
- * macros.
- */
-#if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun)
-# define slim_hidden_proto(name)		slim_hidden_proto1(name, slim_hidden_int_name(name)) cairo_private
-# define slim_hidden_proto_no_warn(name)	slim_hidden_proto1(name, slim_hidden_int_name(name)) cairo_private_no_warn
-# define slim_hidden_def(name)			slim_hidden_def1(name, slim_hidden_int_name(name))
-# define slim_hidden_int_name(name) INT_##name
-# define slim_hidden_proto1(name, internal)				\
-  extern __typeof (name) name						\
-	__asm__ (slim_hidden_asmname (internal))
-# define slim_hidden_def1(name, internal)				\
-  extern __typeof (name) EXT_##name __asm__(slim_hidden_asmname(name))	\
-	__attribute__((__alias__(slim_hidden_asmname(internal))))
-# define slim_hidden_ulp		slim_hidden_ulp1(__USER_LABEL_PREFIX__)
-# define slim_hidden_ulp1(x)		slim_hidden_ulp2(x)
-# define slim_hidden_ulp2(x)		#x
-# define slim_hidden_asmname(name)	slim_hidden_asmname1(name)
-# define slim_hidden_asmname1(name)	slim_hidden_ulp #name
-#else
-# define slim_hidden_proto(name)		int _cairo_dummy_prototype(void)
-# define slim_hidden_proto_no_warn(name)	int _cairo_dummy_prototype(void)
-# define slim_hidden_def(name)			int _cairo_dummy_prototype(void)
-#endif
-
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
 #ifdef __MINGW32__
 #define CAIRO_PRINTF_FORMAT(fmt_index, va_index)                        \
@@ -118,7 +66,6 @@
 #define CAIRO_PRINTF_FORMAT(fmt_index, va_index)
 #endif
 
-/* slim_internal.h */
 #define CAIRO_HAS_HIDDEN_SYMBOLS 1
 #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && \
     (defined(__ELF__) || defined(__APPLE__)) &&			\
@@ -134,6 +81,7 @@
 #ifndef WARN_UNUSED_RESULT
 #define WARN_UNUSED_RESULT
 #endif
+
 /* Add attribute(warn_unused_result) if supported */
 #define cairo_warn	    WARN_UNUSED_RESULT
 #define cairo_private	    cairo_private_no_warn cairo_warn

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-device-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-device-private.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-device.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-device.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-dwrite.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-dwrite.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-error.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-error.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-fixed-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-fixed-private.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-font-face.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-font-face.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-font-options.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-font-options.c Changed

@@ -105,6 +105,41 @@
     }
 }
 
+cairo_bool_t
+_cairo_font_options_compare (const cairo_font_options_t	*a,
+                             const cairo_font_options_t	*b)
+{
+    if (a->antialias != b->antialias ||
+        a->subpixel_order != b->subpixel_order ||
+        a->lcd_filter != b->lcd_filter ||
+        a->hint_style != b->hint_style ||
+        a->hint_metrics != b->hint_metrics ||
+        a->round_glyph_positions != b->round_glyph_positions ||
+        a->color_mode != b->color_mode ||
+        a->palette_index != b->palette_index ||
+        a->custom_palette_size != b->custom_palette_size)
+    {
+        return FALSE;
+    }
+
+    if (a->variations && b->variations && strcmp (a->variations, b->variations) != 0)
+        return FALSE;
+    else if (a->variations != b->variations)
+        return FALSE;
+
+    if (a->custom_palette && b->custom_palette &&
+        memcmp (a->custom_palette, b->custom_palette, sizeof (cairo_palette_color_t) * a->custom_palette_size) != 0)
+    {
+        return FALSE;
+    }
+    else if (a->custom_palette != b->custom_palette)
+    {
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
 /**
  * cairo_font_options_create:
  *
@@ -217,7 +252,6 @@
     else
 	return CAIRO_STATUS_SUCCESS;
 }
-slim_hidden_def (cairo_font_options_status);
 
 /**
  * cairo_font_options_merge:
@@ -283,7 +317,6 @@
         memcpy (options->custom_palette, other->custom_palette, sizeof (cairo_palette_color_t) * options->custom_palette_size);
     }
 }
-slim_hidden_def (cairo_font_options_merge);
 
 /**
  * cairo_font_options_equal:
@@ -327,7 +360,6 @@
               memcmp (options->custom_palette, other->custom_palette,
                       sizeof (cairo_palette_color_t) * options->custom_palette_size) == 0)));
 }
-slim_hidden_def (cairo_font_options_equal);
 
 /**
  * cairo_font_options_hash:
@@ -363,7 +395,6 @@
 	    (options->hint_metrics << 16) |
             (options->color_mode << 20)) ^ hash;
 }
-slim_hidden_def (cairo_font_options_hash);
 
 /**
  * cairo_font_options_set_antialias:
@@ -384,7 +415,6 @@
 
     options->antialias = antialias;
 }
-slim_hidden_def (cairo_font_options_set_antialias);
 
 /**
  * cairo_font_options_get_antialias:
@@ -427,7 +457,6 @@
 
     options->subpixel_order = subpixel_order;
 }
-slim_hidden_def (cairo_font_options_set_subpixel_order);
 
 /**
  * cairo_font_options_get_subpixel_order:
@@ -543,7 +572,6 @@
 
     options->hint_style = hint_style;
 }
-slim_hidden_def (cairo_font_options_set_hint_style);
 
 /**
  * cairo_font_options_get_hint_style:
@@ -586,7 +614,6 @@
 
     options->hint_metrics = hint_metrics;
 }
-slim_hidden_def (cairo_font_options_set_hint_metrics);
 
 /**
  * cairo_font_options_get_hint_metrics:
@@ -662,7 +689,7 @@
 /**
  * cairo_font_options_set_color_mode:
  * @options: a #cairo_font_options_t
- * @font_color: the new color mode
+ * @color_mode: the new color mode
  *
  * Sets the color mode for the font options object. This controls
  * whether color fonts are to be rendered in color or as outlines.
@@ -842,4 +869,3 @@
 
     return CAIRO_STATUS_INVALID_INDEX;
 }
-slim_hidden_def (cairo_font_options_get_custom_palette_color);

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-ft-font.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-ft-font.c Changed

@@ -1334,7 +1334,7 @@
 	    unsigned int i, count = height * width;
 	    uint32_t *p = (uint32_t *) data;
 	    for (i = 0; i < count; i++)
-		pi = be32_to_cpu (pi);
+		pi = bswap_32 (pi);
 	}
 	format = CAIRO_FORMAT_ARGB32;
 	break;
@@ -2173,6 +2173,7 @@
     if (scaled_font == NULL)
         return;
 
+    _cairo_font_options_fini (&scaled_font->ft_options.base);
     _cairo_unscaled_font_destroy (&scaled_font->unscaled->base);
 }
 
@@ -2518,19 +2519,17 @@
 }
 
 
-#ifdef HAVE_FT_PALETTE_SELECT
 static void
 _cairo_ft_scaled_glyph_set_palette (cairo_ft_scaled_font_t  *scaled_font,
 				    FT_Face                  face,
 				    unsigned int            *num_entries_ret,
 				    FT_Color               **entries_ret)
 {
-    FT_Palette_Data palette_data;
-    unsigned int num_entries;
-    FT_Color *entries;
+    unsigned int num_entries = 0;
+    FT_Color *entries = NULL;
 
-    num_entries = 0;
-    entries = NULL;
+#ifdef HAVE_FT_PALETTE_SELECT
+    FT_Palette_Data palette_data;
 
     if (FT_Palette_Data_Get (face, &palette_data) == 0 && palette_data.num_palettes > 0) {
 	FT_UShort palette_index = CAIRO_COLOR_PALETTE_DEFAULT;
@@ -2552,13 +2551,14 @@
             }
         }
     }
+#endif
+
     if (num_entries_ret)
 	*num_entries_ret = num_entries;
 
     if (entries_ret)
 	*entries_ret = entries;
 }
-#endif
 
 /* returns TRUE if foreground color used */
 static cairo_bool_t
@@ -2601,6 +2601,7 @@
 static cairo_int_status_t
 _cairo_ft_scaled_glyph_init_surface (cairo_ft_scaled_font_t     *scaled_font,
 				     cairo_scaled_glyph_t	*scaled_glyph,
+				     cairo_ft_glyph_private_t   *glyph_priv,
 				     cairo_scaled_glyph_info_t	 info,
 				     FT_Face face,
 				     const cairo_color_t        *foreground_color,
@@ -2612,7 +2613,6 @@
     cairo_status_t status;
     cairo_image_surface_t	*surface;
     cairo_bool_t uses_foreground_color = FALSE;
-    cairo_ft_glyph_private_t *glyph_priv = scaled_glyph->dev_private;
 
     /* Only one info type at a time handled in this function */
     assert (info == CAIRO_SCALED_GLYPH_INFO_COLOR_SURFACE || info == CAIRO_SCALED_GLYPH_INFO_SURFACE);
@@ -2628,9 +2628,7 @@
 									     scaled_glyph,
 									     face,
 									     foreground_color);
-#ifdef HAVE_FT_PALETTE_SELECT
 	_cairo_ft_scaled_glyph_set_palette (scaled_font, face, NULL, NULL);
-#endif
 
         load_flags &= ~FT_LOAD_MONOCHROME;
 	/* clear load target mode */
@@ -2656,8 +2654,7 @@
 
     glyph = face->glyph;
 
-    if (glyph_priv->format == CAIRO_FT_GLYPH_TYPE_COLR_V0 ||
-	glyph_priv->format == CAIRO_FT_GLYPH_TYPE_OUTLINE) {
+    if (glyph_priv->format == CAIRO_FT_GLYPH_TYPE_OUTLINE) {
 
 	status = _render_glyph_outline (face, &scaled_font->ft_options.base,
 					    &surface);
@@ -3305,7 +3302,6 @@
     _cairo_scaled_glyph_attach_private (scaled_glyph, &glyph_priv->base,
 					&ft_glyph_private_key,
 					_cairo_ft_glyph_fini);
-    scaled_glyph->dev_private = glyph_priv;
 
     /* We need to load color to determine if this is a color format. */
     int color_flag = 0;
@@ -3314,11 +3310,13 @@
     if (scaled_font->unscaled->have_color && scaled_font->base.options.color_mode != CAIRO_COLOR_MODE_NO_COLOR)
 	color_flag = FT_LOAD_COLOR;
 #endif
+    /* Ensure use_em_size = FALSE as the format (bitmap or outline)
+     * may change with the size. */
     status = _cairo_ft_scaled_glyph_load_glyph (scaled_font,
 						scaled_glyph,
 						face,
 						load_flags | color_flag,
-						!hint_metrics,
+						FALSE,
 						vertical_layout);
     if (unlikely (status))
 	return status;
@@ -3344,6 +3342,18 @@
 	 glyph_priv->format =  CAIRO_FT_GLYPH_TYPE_BITMAP;
     }
 
+    /* If hinting is off, load the glyph with font size set the the em size. */
+    if (!hint_metrics) {
+	status = _cairo_ft_scaled_glyph_load_glyph (scaled_font,
+						    scaled_glyph,
+						    face,
+						    load_flags | color_flag,
+						    TRUE,
+						    vertical_layout);
+	if (unlikely (status))
+	    return status;
+    }
+
     _cairo_ft_scaled_glyph_get_metrics (scaled_font,
 					face,
 					vertical_layout,
@@ -3369,6 +3379,7 @@
     }
 
     if (glyph_priv->format == CAIRO_FT_GLYPH_TYPE_COLR_V1) {
+	/* Restore font size if previously loaded at em_size. */
 	if (!hint_metrics) {
 	    status = _cairo_ft_scaled_glyph_load_glyph (scaled_font,
 							scaled_glyph,
@@ -3408,7 +3419,6 @@
     int load_flags = scaled_font->ft_options.load_flags;
     cairo_bool_t vertical_layout = FALSE;
     cairo_status_t status = CAIRO_STATUS_SUCCESS;
-    cairo_bool_t scaled_glyph_loaded = FALSE;
     cairo_ft_glyph_private_t *glyph_priv;
     int color_flag = 0;
 
@@ -3450,8 +3460,8 @@
 	    goto FAIL;
     }
 
-    /* scaled_glyph->dev_private is intialized by _cairo_ft_scaled_glyph_init_metrics() */
-    glyph_priv = scaled_glyph->dev_private;
+    glyph_priv = (cairo_ft_glyph_private_t *) _cairo_scaled_glyph_find_private (scaled_glyph,
+										&ft_glyph_private_key);
     assert (glyph_priv != NULL);
 
     if (info & CAIRO_SCALED_GLYPH_INFO_RECORDING_SURFACE) {
@@ -3493,7 +3503,7 @@
 	    goto FAIL;
     }
 
-    if (info & CAIRO_SCALED_GLYPH_INFO_COLOR_SURFACE) {
+    if ((info & CAIRO_SCALED_GLYPH_INFO_COLOR_SURFACE) && scaled_font->base.options.color_mode != CAIRO_COLOR_MODE_NO_COLOR) {
 	if (glyph_priv->format == CAIRO_FT_GLYPH_TYPE_SVG ||
 	    glyph_priv->format == CAIRO_FT_GLYPH_TYPE_COLR_V1)
 	{
@@ -3503,6 +3513,7 @@
 	} else {
 	    status = _cairo_ft_scaled_glyph_init_surface (scaled_font,
 							  scaled_glyph,
+							  glyph_priv,
 							  CAIRO_SCALED_GLYPH_INFO_COLOR_SURFACE,
 							  face,
 							  foreground_color,
@@ -3516,6 +3527,7 @@
     if (info & CAIRO_SCALED_GLYPH_INFO_SURFACE) {
 	status = _cairo_ft_scaled_glyph_init_surface (scaled_font,
 						      scaled_glyph,
+						      glyph_priv,
 						      CAIRO_SCALED_GLYPH_INFO_SURFACE,
 						      face,
 						      NULL, /* foreground color */
@@ -3528,46 +3540,20 @@
     if (info & CAIRO_SCALED_GLYPH_INFO_PATH) {
 	cairo_path_fixed_t *path = NULL; /* hide compiler warning */
 
-	if (scaled_glyph->has_info & CAIRO_SCALED_GLYPH_INFO_RECORDING_SURFACE) {
-	    path = _cairo_path_fixed_create ();
-	    if (!path) {
-		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-		goto FAIL;
-	    }
-
-	    status = _cairo_recording_surface_get_path (scaled_glyph->recording_surface, path);
-	    if (unlikely (status)) {

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-ft.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-ft.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-gstate.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-gstate.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-image-source.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-image-source.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-image-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-image-surface.c Changed

@@ -248,6 +248,27 @@
     return TRUE;
 }
 
+#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,39,0)
+/* Convenience function to convert #cairo_dither_t into #pixman_dither_t */
+static pixman_dither_t
+_cairo_dither_to_pixman_dither (cairo_dither_t dither)
+{
+    switch (dither) {
+    case CAIRO_DITHER_FAST:
+        return PIXMAN_DITHER_FAST;
+    case CAIRO_DITHER_GOOD:
+        return PIXMAN_DITHER_GOOD;
+    case CAIRO_DITHER_BEST:
+        return PIXMAN_DITHER_BEST;
+    case CAIRO_DITHER_NONE:
+    case CAIRO_DITHER_DEFAULT:
+    default:
+        return PIXMAN_DITHER_NONE;
+    }
+}
+#endif
+
+
 /* A mask consisting of N bits set to 1. */
 #define MASK(N) ((1UL << (N))-1)
 
@@ -411,9 +432,8 @@
     return _cairo_image_surface_create_with_pixman_format (NULL, pixman_format,
 							   width, height, -1);
 }
-slim_hidden_def (cairo_image_surface_create);
 
-    cairo_surface_t *
+cairo_surface_t *
 _cairo_image_surface_create_with_content (cairo_content_t	content,
 					  int			width,
 					  int			height)
@@ -449,7 +469,7 @@
  *
  * Since: 1.6
  **/
-    int
+int
 cairo_format_stride_for_width (cairo_format_t	format,
 			       int		width)
 {
@@ -466,7 +486,6 @@
 
     return CAIRO_STRIDE_FOR_WIDTH_BPP (width, bpp);
 }
-slim_hidden_def (cairo_format_stride_for_width);
 
 /**
  * cairo_image_surface_create_for_data:
@@ -513,7 +532,7 @@
  *
  * Since: 1.0
  **/
-    cairo_surface_t *
+cairo_surface_t *
 cairo_image_surface_create_for_data (unsigned char     *data,
 				     cairo_format_t	format,
 				     int		width,
@@ -549,7 +568,6 @@
 							   width, height,
 							   stride);
 }
-slim_hidden_def (cairo_image_surface_create_for_data);
 
 /**
  * cairo_image_surface_get_data:
@@ -581,7 +599,6 @@
 
     return image_surface->data;
 }
-slim_hidden_def (cairo_image_surface_get_data);
 
 /**
  * cairo_image_surface_get_format:
@@ -605,7 +622,6 @@
 
     return image_surface->format;
 }
-slim_hidden_def (cairo_image_surface_get_format);
 
 /**
  * cairo_image_surface_get_width:
@@ -629,7 +645,6 @@
 
     return image_surface->width;
 }
-slim_hidden_def (cairo_image_surface_get_width);
 
 /**
  * cairo_image_surface_get_height:
@@ -653,7 +668,6 @@
 
     return image_surface->height;
 }
-slim_hidden_def (cairo_image_surface_get_height);
 
 /**
  * cairo_image_surface_get_stride:
@@ -681,9 +695,8 @@
 
     return image_surface->stride;
 }
-slim_hidden_def (cairo_image_surface_get_stride);
 
-    cairo_format_t
+cairo_format_t
 _cairo_format_from_content (cairo_content_t content)
 {
     switch (content) {
@@ -699,7 +712,7 @@
     return CAIRO_FORMAT_INVALID;
 }
 
-    cairo_content_t
+cairo_content_t
 _cairo_content_from_format (cairo_format_t format)
 {
     switch (format) {
@@ -724,7 +737,7 @@
     return CAIRO_CONTENT_COLOR_ALPHA;
 }
 
-    int
+int
 _cairo_format_bits_per_pixel (cairo_format_t format)
 {
     switch (format) {
@@ -938,6 +951,8 @@
 			    const cairo_clip_t		*clip)
 {
     cairo_image_surface_t *surface = abstract_surface;
+    pixman_dither_t pixman_dither = _cairo_dither_to_pixman_dither (source->dither);
+    pixman_image_set_dither (surface->pixman_image, pixman_dither);
 
     TRACE ((stderr, "%s (surface=%d)\n",
 	    __FUNCTION__, surface->base.unique_id));

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-list-inline.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-list-inline.h Changed

@@ -39,6 +39,14 @@
 
 #include "cairo-list-private.h"
 
+/*< private >
+ * cairo_list_entry:
+ * @ptr: the pointer to the #cairo_list_t member.
+ * @type: the type of the struct.
+ * @member: the name of the list_head within the struct.
+ *
+ * Return value: the pointer the struct containing the @member that @ptr points to.
+ **/
 #define cairo_list_entry(ptr, type, member) \
 	cairo_container_of(ptr, type, member)
 
@@ -48,25 +56,91 @@
 #define cairo_list_last_entry(ptr, type, member) \
 	cairo_list_entry((ptr)->prev, type, member)
 
-#define cairo_list_foreach(pos, head)			\
+/*< private >
+ * cairo_list_foreach:
+ * @pos: a #cairo_list_t* to use as a loop variable.
+ * @head: the list.
+ *
+ * Iterate the list. @pos points to the #cairo_list_t member of the entry struct.
+ **/
+#define cairo_list_foreach(pos, head)                                   \
 	for (pos = (head)->next; pos != (head);	pos = pos->next)
 
+/*< private >
+ * cairo_list_foreach_entry:
+ * @pos: a variable of type T * to use as a loop variable.
+ * @type: the type of the entry struct
+ * @head: the list
+ * @member: the name of the #cairo_list_t member of the entry
+ *
+ * Iterate the list of type T.
+ **/
 #define cairo_list_foreach_entry(pos, type, head, member)		\
 	for (pos = cairo_list_entry((head)->next, type, member);\
 	     &pos->member != (head);					\
 	     pos = cairo_list_entry(pos->member.next, type, member))
 
+/*< private >
+ * cairo_list_foreach_entry_safe:
+ * @pos: a variable of type T * to use as a loop variable.
+ * @n: a variable of type T * that point to the next item after @pos.
+ * @type: the type of the entry struct
+ * @head: the list
+ * @member: the name of the #cairo_list_t member of the entry
+ *
+ * Iterate the list of type T. It is safe to remove items while
+ * iterating. @n is a temporary variable required to support safe
+ * iterating.
+ *
+ * |
+ *      struct foo {
+ *          int a;
+ *          cairo_list_t list;
+ *      }
+ *
+ *      struct foo linked_list;
+ *      cairo_list_init (&linked_list);
+ *      ... calls to cairo_list_add (entry, &linked_list);
+ *
+ *      struct foo *pos, *next;
+ *      cairo_list_foreach_entry_safe(pos, next, struct foo, &linked_list, list) {
+ *          printf("%d\n", pos->a);
+ *          cairo_list_del (pos);
+ *      }
+ * |
+ **/
 #define cairo_list_foreach_entry_safe(pos, n, type, head, member)	\
 	for (pos = cairo_list_entry ((head)->next, type, member),\
 	     n = cairo_list_entry (pos->member.next, type, member);\
 	     &pos->member != (head);					\
 	     pos = n, n = cairo_list_entry (n->member.next, type, member))
 
+/*< private >
+ * cairo_list_foreach_entry:
+ * @pos: a variable of type T * to use as a loop variable.
+ * @type: the type of the entry struct
+ * @head: the list
+ * @member: the name of the #cairo_list_t member of the entry
+ *
+ * Iterate the list of type T in reverse direction.
+ **/
 #define cairo_list_foreach_entry_reverse(pos, type, head, member)	\
 	for (pos = cairo_list_entry((head)->prev, type, member);\
 	     &pos->member != (head);					\
 	     pos = cairo_list_entry(pos->member.prev, type, member))
 
+/*< private >
+ * cairo_list_foreach_entry_safe:
+ * @pos: a variable of type T * to use as a loop variable.
+ * @n: a variable of type T * that point to the next item after @pos.
+ * @type: the type of the entry struct
+ * @head: the list
+ * @member: the name of the #cairo_list_t member of the entry
+ *
+ * Iterate the list of type T in reverse direction. It is safe to
+ * remove items while iterating. @n is a temporary variable required
+ * to support safe iterating.
+ **/
 #define cairo_list_foreach_entry_reverse_safe(pos, n, type, head, member)	\
 	for (pos = cairo_list_entry((head)->prev, type, member),\
 	     n = cairo_list_entry (pos->member.prev, type, member);\
@@ -101,6 +175,13 @@
 #define cairo_list_validate_is_empty(head)
 #endif
 
+/*< private >
+ * cairo_list_init:
+ * @entry: list entry to initialize
+ *
+ * Initializes the list entry to point to itself. The result is an
+ * empty list.
+ **/
 static inline void
 cairo_list_init (cairo_list_t *entry)
 {
@@ -119,6 +200,13 @@
     prev->next = entry;
 }
 
+/*< private >
+ * cairo_list_add:
+ * @entry: new entry
+ * @head: linked list head
+ *
+ * Insert a @entry at the start of the list.
+ **/
 static inline void
 cairo_list_add (cairo_list_t *entry, cairo_list_t *head)
 {
@@ -128,6 +216,13 @@
     cairo_list_validate (head);
 }
 
+/*< private >
+ * cairo_list_add_tail:
+ * @entry: new entry
+ * @head: linked list head
+ *
+ * Append a @entry to the end of the list.
+ **/
 static inline void
 cairo_list_add_tail (cairo_list_t *entry, cairo_list_t *head)
 {
@@ -150,6 +245,12 @@
     __cairo_list_del (entry->prev, entry->next);
 }
 
+/*< private >
+ * cairo_list_del:
+ * @entry: entry to remove
+ *
+ * Remove @entry from the list it is in.
+ **/
 static inline void
 cairo_list_del (cairo_list_t *entry)
 {
@@ -157,6 +258,13 @@
     cairo_list_init (entry);
 }
 
+/*< private >
+ * cairo_list_move:
+ * @entry: entry to move
+ * @head: linked list to move @entry to
+ *
+ * Remove @entry from the list it is in and insert it at the start of @head list.
+ **/
 static inline void
 cairo_list_move (cairo_list_t *entry, cairo_list_t *head)
 {
@@ -166,6 +274,13 @@
     cairo_list_validate (head);
 }
 
+/*< private >
+ * cairo_list_move_tail:
+ * @entry: entry tp move
+ * @head: linked list to move @entry to
+ *
+ * Remove @entry from the list it is in and append it to the end of @head list.
+ **/
 static inline void
 cairo_list_move_tail (cairo_list_t *entry, cairo_list_t *head)
 {
@@ -175,13 +290,27 @@
     cairo_list_validate (head);
 }
 
+/*< private >
+ * cairo_list_move_list:
+ * @old: List to move
+ * @new: List to move to. Should be empty,
+ *

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-matrix.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-matrix.c Changed

@@ -85,7 +85,6 @@
 		       0, 1,
 		       0, 0);
 }
-slim_hidden_def(cairo_matrix_init_identity);
 
 /**
  * cairo_matrix_init:
@@ -118,7 +117,6 @@
     matrix->xy = xy; matrix->yy = yy;
     matrix->x0 = x0; matrix->y0 = y0;
 }
-slim_hidden_def(cairo_matrix_init);
 
 /**
  * _cairo_matrix_get_affine:
@@ -178,7 +176,6 @@
 		       0, 1,
 		       tx, ty);
 }
-slim_hidden_def(cairo_matrix_init_translate);
 
 /**
  * cairo_matrix_translate:
@@ -202,7 +199,6 @@
 
     cairo_matrix_multiply (matrix, &tmp, matrix);
 }
-slim_hidden_def (cairo_matrix_translate);
 
 /**
  * cairo_matrix_init_scale:
@@ -224,7 +220,6 @@
 		       0, sy,
 		       0, 0);
 }
-slim_hidden_def(cairo_matrix_init_scale);
 
 /**
  * cairo_matrix_scale:
@@ -247,7 +242,6 @@
 
     cairo_matrix_multiply (matrix, &tmp, matrix);
 }
-slim_hidden_def(cairo_matrix_scale);
 
 /**
  * cairo_matrix_init_rotate:
@@ -277,7 +271,6 @@
 		       -s, c,
 		       0, 0);
 }
-slim_hidden_def(cairo_matrix_init_rotate);
 
 /**
  * cairo_matrix_rotate:
@@ -304,7 +297,6 @@
 
     cairo_matrix_multiply (matrix, &tmp, matrix);
 }
-slim_hidden_def (cairo_matrix_rotate);
 
 /**
  * cairo_matrix_multiply:
@@ -344,7 +336,6 @@
 
     *result = r;
 }
-slim_hidden_def(cairo_matrix_multiply);
 
 void
 _cairo_matrix_multiply (cairo_matrix_t *r,
@@ -373,15 +364,10 @@
  * the returned vector is as follows:
  *
  * <programlisting>
- * dx2 = dx1 * a + dy1 * c;
- * dy2 = dx1 * b + dy1 * d;
+ * dx_new = xx * dx + xy * dy;
+ * dy_new = yx * dx + yy * dy;
  * </programlisting>
  *
- * Affine transformations are position invariant, so the same vector
- * always transforms to the same vector. If (@x1,@y1) transforms
- * to (@x2,@y2) then (@x1+@dx1,@y1+@dy1) will transform to
- * (@x1+@dx2,@y1+@dy2) for all values of @x1 and @x2.
- *
  * Since: 1.0
  **/
 void
@@ -395,7 +381,6 @@
     *dx = new_x;
     *dy = new_y;
 }
-slim_hidden_def(cairo_matrix_transform_distance);
 
 /**
  * cairo_matrix_transform_point:
@@ -415,7 +400,6 @@
     *x += matrix->x0;
     *y += matrix->y0;
 }
-slim_hidden_def(cairo_matrix_transform_point);
 
 void
 _cairo_matrix_transform_bounding_box (const cairo_matrix_t *matrix,
@@ -626,7 +610,6 @@
 
     return CAIRO_STATUS_SUCCESS;
 }
-slim_hidden_def(cairo_matrix_invert);
 
 cairo_bool_t
 _cairo_matrix_is_invertible (const cairo_matrix_t *matrix)

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-misc.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-misc.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-mono-scan-converter.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-mono-scan-converter.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-mutex-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-mutex-private.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-mutex.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-mutex.c Changed

@@ -41,13 +41,17 @@
 
 #if _CAIRO_MUTEX_IMPL_USE_STATIC_INITIALIZER || _CAIRO_MUTEX_IMPL_USE_STATIC_FINALIZER
 
+#define _CAIRO_MUTEX_UNINITIALIZED 0
+#define _CAIRO_MUTEX_INITIALIZING  1
+#define _CAIRO_MUTEX_INITIALIZED   2
+
 # if _CAIRO_MUTEX_IMPL_USE_STATIC_INITIALIZER
-#  define _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE FALSE
+#  define _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE _CAIRO_MUTEX_UNINITIALIZED
 # else
-#  define _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE TRUE
+#  define _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE _CAIRO_MUTEX_INITIALIZED
 # endif
 
-cairo_bool_t _cairo_mutex_initialized = _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE;
+int _cairo_mutex_initialized = _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE;
 
 # undef _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE
 
@@ -56,24 +60,47 @@
 #if _CAIRO_MUTEX_IMPL_USE_STATIC_INITIALIZER
 void _cairo_mutex_initialize (void)
 {
-    if (_cairo_mutex_initialized)
+#if HAS_ATOMIC_OPS
+    int old_value;
+    do {
+        old_value = _cairo_atomic_int_cmpxchg_return_old (&_cairo_mutex_initialized,
+                                                          _CAIRO_MUTEX_UNINITIALIZED,
+                                                          _CAIRO_MUTEX_INITIALIZING);
+        if (old_value == _CAIRO_MUTEX_INITIALIZED)
+            return;
+
+    } while (old_value == _CAIRO_MUTEX_INITIALIZING);
+#else
+    if (_cairo_mutex_initialized == _CAIRO_MUTEX_INITIALIZED)
         return;
 
-    _cairo_mutex_initialized = TRUE;
+    _cairo_mutex_initialized = _CAIRO_MUTEX_INITIALIZED;
+#endif
 
 #define  CAIRO_MUTEX_DECLARE(mutex) CAIRO_MUTEX_INIT (mutex);
 #include "cairo-mutex-list-private.h"
 #undef   CAIRO_MUTEX_DECLARE
+
+#if HAS_ATOMIC_OPS
+    _cairo_atomic_int_set_relaxed (&_cairo_mutex_initialized, _CAIRO_MUTEX_INITIALIZED);
+#endif
 }
 #endif
 
 #if _CAIRO_MUTEX_IMPL_USE_STATIC_FINALIZER
 void _cairo_mutex_finalize (void)
 {
-    if (!_cairo_mutex_initialized)
+#if HAS_ATOMIC_OPS
+    if (!_cairo_atomic_int_cmpxchg (&_cairo_mutex_initialized,
+                                    _CAIRO_MUTEX_INITIALIZED,
+                                    _CAIRO_MUTEX_UNINITIALIZED))
+        return;
+#else
+    if (_cairo_mutex_initialized != _CAIRO_MUTEX_INITIALIZED)
         return;
 
-    _cairo_mutex_initialized = FALSE;
+    _cairo_mutex_initialized = _CAIRO_MUTEX_UNINITIALIZED;
+#endif
 
 #define  CAIRO_MUTEX_DECLARE(mutex) CAIRO_MUTEX_FINI (mutex);
 #include "cairo-mutex-list-private.h"

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-paginated-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-paginated-surface.c Changed

@@ -403,6 +403,7 @@
     cairo_int_status_t status;
     cairo_bool_t has_supported, has_page_fallback, has_finegrained_fallback;
     unsigned int regions_id = 0;
+    cairo_bool_t replay_all;
 
     if (unlikely (surface->target->status))
 	return surface->target->status;
@@ -416,13 +417,20 @@
     if (unlikely (status))
 	goto FAIL;
 
+    replay_all = FALSE;
+    if (surface->target->backend->analyze_recording_surface &&
+        _cairo_recording_surface_has_tags (surface->recording_surface))
+    {
+        replay_all = TRUE;
+    }
+
     status = _cairo_recording_surface_region_array_attach (surface->recording_surface, &regions_id);
     if (status)
 	goto FAIL;
 
     status = _cairo_recording_surface_replay_and_create_regions (surface->recording_surface,
                                                                  regions_id,
-								 NULL, analysis, FALSE);
+								 NULL, analysis, FALSE, replay_all);
     if (status)
 	goto FAIL;
 
@@ -467,12 +475,12 @@
 	has_finegrained_fallback = FALSE;
     }
 
-    if (has_supported) {
-	status = surface->backend->set_paginated_mode (surface->target,
-						       CAIRO_PAGINATED_MODE_RENDER);
-	if (unlikely (status))
-	    goto FAIL;
+    status = surface->backend->set_paginated_mode (surface->target,
+						   CAIRO_PAGINATED_MODE_RENDER);
+    if (unlikely (status))
+	goto FAIL;
 
+    if (has_supported) {
 	status = _cairo_recording_surface_replay_region (surface->recording_surface,
                                                          regions_id,
 							 NULL,
@@ -756,6 +764,14 @@
 			       begin, tag_name, attributes);
 }
 
+static cairo_bool_t
+_cairo_paginated_surface_supports_color_glyph (void                 *abstract_surface,
+                                               cairo_scaled_font_t  *scaled_font,
+                                               unsigned long         glyph_index)
+{
+    return TRUE;
+}
+
 static cairo_surface_t *
 _cairo_paginated_surface_snapshot (void *abstract_other)
 {
@@ -811,4 +827,5 @@
     _cairo_paginated_surface_show_text_glyphs,
     _cairo_paginated_surface_get_supported_mime_types,
     _cairo_paginated_surface_tag,
+    _cairo_paginated_surface_supports_color_glyph,
 };

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-path-stroke-polygon.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-path-stroke-polygon.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-path-stroke.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-path-stroke.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-path.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-path.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-pattern-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-pattern-private.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-pattern.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-pattern.c Changed

@@ -63,6 +63,14 @@
  * functions.
  **/
 
+/**
+ * CAIRO_HAS_MIME_SURFACE:
+ *
+ * Unused symbol, always defined.
+ *
+ * Since: 1.12
+ **/
+
 static freed_pool_t freed_pattern_pool5;
 
 static const cairo_solid_pattern_t _cairo_pattern_nil = {
@@ -77,6 +85,7 @@
       CAIRO_EXTEND_GRADIENT_DEFAULT,	/* extend */
       FALSE,				/* has component alpha */
       FALSE,				/* is_foreground_marker */
+      CAIRO_DITHER_DEFAULT,		/* dither */
       { 1., 0., 0., 1., 0., 0., },	/* matrix */
       1.0                               /* opacity */
     }
@@ -94,6 +103,7 @@
       CAIRO_EXTEND_GRADIENT_DEFAULT,	/* extend */
       FALSE,				/* has component alpha */
       FALSE,				/* is_foreground_marker */
+      CAIRO_DITHER_DEFAULT,		/* dither */
       { 1., 0., 0., 1., 0., 0., },	/* matrix */
       1.0                               /* opacity */
     }
@@ -111,6 +121,7 @@
       CAIRO_EXTEND_REPEAT,		/* extend */
       FALSE,				/* has component alpha */
       FALSE,				/* is_foreground_marker */
+      CAIRO_DITHER_DEFAULT,		/* dither */
       { 1., 0., 0., 1., 0., 0., },	/* matrix */
       1.0                               /* opacity */
     },
@@ -129,6 +140,7 @@
       CAIRO_EXTEND_REPEAT,		/* extend */
       FALSE,				/* has component alpha */
       FALSE,				/* is_foreground_marker */
+      CAIRO_DITHER_DEFAULT,		/* dither */
       { 1., 0., 0., 1., 0., 0., },	/* matrix */
       1.0                               /* opacity */
     },
@@ -147,6 +159,7 @@
       CAIRO_EXTEND_REPEAT,		/* extend */
       FALSE,				/* has component alpha */
       FALSE,				/* is_foreground_marker */
+      CAIRO_DITHER_DEFAULT,		/* dither */
       { 1., 0., 0., 1., 0., 0., },	/* matrix */
       1.0                               /* opacity */
     },
@@ -240,6 +253,8 @@
     pattern->has_component_alpha = FALSE;
     pattern->is_foreground_marker = FALSE;
 
+    pattern->dither    = CAIRO_DITHER_DEFAULT;
+
     cairo_matrix_init_identity (&pattern->matrix);
 
     cairo_list_init (&pattern->observers);
@@ -676,7 +691,6 @@
 {
     return cairo_pattern_create_rgba (red, green, blue, 1.0);
 }
-slim_hidden_def (cairo_pattern_create_rgb);
 
 /**
  * cairo_pattern_create_rgba:
@@ -720,7 +734,6 @@
 
     return _cairo_pattern_create_solid (&color);
 }
-slim_hidden_def (cairo_pattern_create_rgba);
 
 /**
  * cairo_pattern_create_for_surface:
@@ -769,7 +782,6 @@
 
     return &pattern->base;
 }
-slim_hidden_def (cairo_pattern_create_for_surface);
 
 /**
  * cairo_pattern_create_linear:
@@ -821,7 +833,6 @@
 
     return &pattern->base.base;
 }
-slim_hidden_def (cairo_pattern_create_linear);
 
 /**
  * cairo_pattern_create_radial:
@@ -876,7 +887,6 @@
 
     return &pattern->base.base;
 }
-slim_hidden_def (cairo_pattern_create_radial);
 
 /* This order is specified in the diagram in the documentation for
  * cairo_pattern_create_mesh() */
@@ -1057,7 +1067,6 @@
 
     return &pattern->base;
 }
-slim_hidden_def (cairo_pattern_create_mesh);
 
 /**
  * cairo_pattern_reference:
@@ -1087,7 +1096,6 @@
 
     return pattern;
 }
-slim_hidden_def (cairo_pattern_reference);
 
 /**
  * cairo_pattern_get_type:
@@ -1105,7 +1113,6 @@
 {
     return pattern->type;
 }
-slim_hidden_def (cairo_pattern_get_type);
 
 /**
  * cairo_pattern_status:
@@ -1159,7 +1166,6 @@
     else
 	free (pattern);
 }
-slim_hidden_def (cairo_pattern_destroy);
 
 /**
  * cairo_pattern_get_reference_count:
@@ -1293,7 +1299,6 @@
     for (i = 0; i < 4; i++)
 	mesh->has_colori = FALSE;
 }
-slim_hidden_def (cairo_mesh_pattern_begin_patch);
 
 static void
 _calc_control_point (cairo_mesh_patch_t *patch, int control_point)
@@ -1410,7 +1415,6 @@
 
     mesh->current_patch = NULL;
 }
-slim_hidden_def (cairo_mesh_pattern_end_patch);
 
 /**
  * cairo_mesh_pattern_curve_to:
@@ -1500,7 +1504,6 @@
 	mesh->current_patch->pointsij.y = y3;
     }
 }
-slim_hidden_def (cairo_mesh_pattern_curve_to);
 
 /**
  * cairo_mesh_pattern_line_to:
@@ -1571,7 +1574,6 @@
 				 (last_point.y + 2 * y) * (1. / 3),
 				 x, y);
 }
-slim_hidden_def (cairo_mesh_pattern_line_to);
 
 /**
  * cairo_mesh_pattern_move_to:
@@ -1621,7 +1623,6 @@
     mesh->current_patch->points00.x = x;
     mesh->current_patch->points00.y = y;
 }
-slim_hidden_def (cairo_mesh_pattern_move_to);
 
 /**
  * cairo_mesh_pattern_set_control_point:
@@ -1840,7 +1841,6 @@
 
     _cairo_mesh_pattern_set_corner_color (mesh, corner_num, red, green, blue, alpha);
 }
-slim_hidden_def (cairo_mesh_pattern_set_corner_color_rgba);
 
 static void
 _cairo_pattern_add_color_stop (cairo_gradient_pattern_t	*pattern,
@@ -1984,7 +1984,6 @@
     _cairo_pattern_add_color_stop ((cairo_gradient_pattern_t *) pattern,
 				   offset, red, green, blue, alpha);
 }
-slim_hidden_def (cairo_pattern_add_color_stop_rgba);
 
 /**
  * cairo_pattern_set_matrix:
@@ -2041,7 +2040,6 @@
     if (unlikely (status))
 	status = _cairo_pattern_set_error (pattern, status);
 }
-slim_hidden_def (cairo_pattern_set_matrix);
 
 /**
  * cairo_pattern_get_matrix:

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-pdf-interchange.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-pdf-interchange.c Changed

@@ -52,6 +52,8 @@
 #include "cairo-array-private.h"
 #include "cairo-error-private.h"
 #include "cairo-output-stream-private.h"
+#include "cairo-recording-surface-private.h"
+#include "cairo-surface-snapshot-inline.h"
 
 #include <time.h>
 
@@ -62,6 +64,275 @@
 #define gmtime_r(T, BUF) (*(BUF) = *gmtime (T))
 #endif
 
+/* #define DEBUG_PDF_INTERCHANGE 1 */
+
+#if DEBUG_PDF_INTERCHANGE
+static void
+print_tree (cairo_pdf_surface_t *surface, cairo_pdf_struct_tree_node_t *node);
+
+static void
+print_command (cairo_pdf_command_t *command, int indent);
+
+static void
+print_command_list(cairo_pdf_command_list_t *command_list);
+#endif
+
+static void
+_cairo_pdf_command_init_key (cairo_pdf_command_entry_t *key)
+{
+    key->base.hash = _cairo_hash_uintptr (_CAIRO_HASH_INIT_VALUE, (uintptr_t)key->recording_id);
+    key->base.hash = _cairo_hash_uintptr (key->base.hash, (uintptr_t)key->command_id);
+}
+
+static cairo_bool_t
+_cairo_pdf_command_equal (const void *key_a, const void *key_b)
+{
+    const cairo_pdf_command_entry_t *a = key_a;
+    const cairo_pdf_command_entry_t *b = key_b;
+
+    return a->recording_id == b->recording_id && a->command_id == b->command_id;
+}
+
+static void
+_cairo_pdf_command_pluck (void *entry, void *closure)
+{
+    cairo_pdf_command_entry_t *dest = entry;
+    cairo_hash_table_t *table = closure;
+
+    _cairo_hash_table_remove (table, &dest->base);
+    free (dest);
+}
+
+static cairo_pdf_struct_tree_node_t *
+lookup_node_for_command (cairo_pdf_surface_t    *surface,
+			 unsigned int            recording_id,
+			 unsigned int            command_id)
+{
+    cairo_pdf_command_entry_t entry_key;
+    cairo_pdf_command_entry_t *entry;
+    cairo_pdf_interchange_t *ic = &surface->interchange;
+
+    entry_key.recording_id = recording_id;
+    entry_key.command_id = command_id;
+    _cairo_pdf_command_init_key (&entry_key);
+    entry = _cairo_hash_table_lookup (ic->command_to_node_map, &entry_key.base);
+    assert (entry != NULL);
+    return entry->node;
+}
+
+static cairo_int_status_t
+command_list_add (cairo_pdf_surface_t    *surface,
+		  unsigned int            command_id,
+		  cairo_pdf_operation_t   flags)
+{
+    cairo_pdf_interchange_t *ic = &surface->interchange;
+    cairo_pdf_command_t command;
+    cairo_int_status_t status;
+
+    unsigned num_elements = _cairo_array_num_elements (&ic->current_commands->commands);
+    if (command_id > num_elements) {
+	void *elements;
+	unsigned additional_elements = command_id - num_elements;
+	status = _cairo_array_allocate (&ic->current_commands->commands, additional_elements, &elements);
+	if (unlikely (status))
+	    return status;
+	memset (elements, 0, additional_elements * sizeof(cairo_pdf_command_t));
+    }
+
+    command.group = NULL;
+    command.node = NULL;
+    command.command_id = command_id;
+    command.mcid_index = 0;
+    command.flags = flags;
+    return _cairo_array_append (&ic->current_commands->commands, &command);
+}
+
+static cairo_int_status_t
+command_list_push_group (cairo_pdf_surface_t    *surface,
+			 unsigned int            command_id,
+			 cairo_surface_t        *recording_surface,
+			 unsigned int            region_id)
+{
+    cairo_pdf_interchange_t *ic = &surface->interchange;
+    cairo_pdf_command_t *command;
+    cairo_pdf_command_list_t *group;
+    cairo_pdf_recording_surface_commands_t recording_commands;
+    cairo_int_status_t status = CAIRO_STATUS_SUCCESS;
+
+    group = _cairo_malloc (sizeof(cairo_pdf_command_list_t));
+    _cairo_array_init (&group->commands, sizeof(cairo_pdf_command_t));
+    group->parent = ic->current_commands;
+
+    command_list_add (surface, command_id, PDF_GROUP);
+    command = _cairo_array_index (&ic->current_commands->commands, command_id);
+    command->group = group;
+    ic->current_commands = group;
+
+    recording_commands.recording_surface = recording_surface;
+    recording_commands.command_list = group;
+    recording_commands.region_id = region_id;
+    status = _cairo_array_append (&ic->recording_surface_commands, &recording_commands);
+
+    return status;
+}
+
+static void
+command_list_pop_group (cairo_pdf_surface_t    *surface)
+{
+    cairo_pdf_interchange_t *ic = &surface->interchange;
+
+    ic->current_commands = ic->current_commands->parent;
+}
+
+static cairo_bool_t
+command_list_is_group (cairo_pdf_surface_t    *surface,
+		       unsigned int            command_id)
+{
+    cairo_pdf_interchange_t *ic = &surface->interchange;
+    cairo_pdf_command_t *command;
+    unsigned num_elements = _cairo_array_num_elements (&ic->current_commands->commands);
+
+    if (command_id >= num_elements)
+	return FALSE;
+
+    command = _cairo_array_index (&ic->current_commands->commands, command_id);
+    return command->flags == PDF_GROUP;
+}
+
+
+/* Is there any content between current command and next
+ * begin/end/group? */
+static cairo_bool_t
+command_list_has_content (cairo_pdf_surface_t    *surface,
+			  unsigned int            command_id,
+			  unsigned int           *content_command_id)
+{
+    cairo_pdf_interchange_t *ic = &surface->interchange;
+    cairo_pdf_command_t *command;
+    unsigned i;
+    unsigned num_elements = _cairo_array_num_elements (&ic->current_commands->commands);
+
+    for (i = command_id + 1; i < num_elements; i++) {
+	command = _cairo_array_index (&ic->current_commands->commands, i);
+	switch (command->flags) {
+	    case PDF_CONTENT:
+		if (content_command_id)
+		    *content_command_id = i;
+		return TRUE;
+		break;
+	    case PDF_BEGIN:
+	    case PDF_END:
+	    case PDF_GROUP:
+		return FALSE;
+	    case PDF_NONE:
+		break;
+	}
+    }
+    return FALSE;
+}
+
+static void
+command_list_set_mcid (cairo_pdf_surface_t          *surface,
+		       unsigned int                  command_id,
+		       cairo_pdf_struct_tree_node_t *node,
+		       int                           mcid_index)
+{
+    cairo_pdf_interchange_t *ic = &surface->interchange;
+    cairo_pdf_command_t *command;
+
+    command = _cairo_array_index (&ic->current_commands->commands, command_id);
+    command->node = node;
+    command->mcid_index = mcid_index;
+}
+
+static void
+command_list_set_current_recording_commands (cairo_pdf_surface_t    *surface,
+					     cairo_surface_t        *recording_surface,
+					     unsigned int            region_id)
+{
+    cairo_pdf_interchange_t *ic = &surface->interchange;

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-pdf-operators.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-pdf-operators.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-pdf-surface-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-pdf-surface-private.h Changed

@@ -74,6 +74,10 @@
     unsigned char *unique_id;
     unsigned long unique_id_length;
     cairo_operator_t operator;
+
+    /* If not 0, this is the recording surface region id of the source surface. */
+    int          region_id;
+
     cairo_bool_t interpolate;
     cairo_bool_t stencil_mask;
     cairo_bool_t smask;
@@ -110,6 +114,9 @@
     cairo_operator_t operator;
     cairo_bool_t is_shading;
 
+    /* Index into nodes array in cairo_pdf_surface_node_entry_t or -1 if not used */
+    int          region_id;
+
     /* PDF pattern space is the pattern matrix concatenated with the
      * initial space of the parent object. If the parent object is the
      * page, the initial space does not include the Y-axis flipping
@@ -161,38 +168,87 @@
     cairo_bool_t emitted;
 } cairo_pdf_jbig2_global_t;
 
-/* cairo-pdf-interchange.c types */
+typedef struct _cairo_pdf_page_info {
+    double width;
+    double height;
+    cairo_pdf_resource_t page_res;
+    cairo_pdf_resource_t content;
+    cairo_pdf_resource_t resources;
+    cairo_pdf_resource_t thumbnail;
+    cairo_array_t annots; /* <cairo_pdf_resource_t> */
+    int struct_parents;
+} cairo_pdf_page_info_t;
 
-struct page_mcid {
-    int page;
-    int mcid;
-};
 
-struct tag_extents {
+/* cairo-pdf-interchange.c types */
+
+typedef struct _pdf_tag_extents {
     cairo_rectangle_int_t extents;
     cairo_bool_t valid;
-    cairo_list_t link;
-};
+} cairo_pdf_tag_extents_t;
+
+typedef struct _pdf_page_mcid {
+    int order;
+    int page;
+    cairo_pdf_resource_t xobject_res; /* 0 if not in an XObject */
+    int mcid;
+    struct _cairo_pdf_struct_tree_node *child_node;
+} cairo_pdf_page_mcid_t;
+
+/* The non PDF_NODE_STRUCT types are excluded from the struct tree embedded in
+ * the PDF. */
+typedef enum _cairo_pdf_tree_node_type {
+    PDF_NODE_STRUCT,
+    PDF_NODE_CONTENT,
+    PDF_NODE_CONTENT_REF,
+    PDF_NODE_ARTIFACT,
+} cairo_pdf_tree_node_type_t;
 
 typedef struct _cairo_pdf_struct_tree_node {
+    cairo_hash_entry_t hash;
+    cairo_pdf_tree_node_type_t type;
     char *name;
     cairo_pdf_resource_t res;
     struct _cairo_pdf_struct_tree_node *parent;
     cairo_list_t children;
-    cairo_array_t mcid; /* array of struct page_mcid */
-    cairo_pdf_resource_t annot_res; /* 0 if no annot */
-    struct tag_extents extents;
-    cairo_list_t link;
+    cairo_array_t mcid; /* array of cairo_pdf_page_mcid_t */
+    struct _cairo_pdf_annotation *annot;
+    cairo_pdf_tag_extents_t extents;
+
+    union {
+	cairo_content_attrs_t content; /* type == PDF_NODE_CONTENT */
+	cairo_content_ref_attrs_t content_ref; /* type == PDF_NODE_CONTENT_REF */
+    } attributes;
+
+    cairo_list_t link; /* linked list of parent's children */
 } cairo_pdf_struct_tree_node_t;
 
+typedef struct _cairo_pdf_command_entry {
+    cairo_hash_entry_t base;
+    unsigned int recording_id;
+    unsigned int command_id;
+    cairo_pdf_struct_tree_node_t *node;
+} cairo_pdf_command_entry_t;
+
+typedef struct _cairo_recording_surface_stack_entry {
+    cairo_bool_t ignore_surface;
+    cairo_pdf_struct_tree_node_t *current_node;
+} cairo_recording_surface_stack_entry_t;
+
+typedef struct _cairo_pdf_content_tag {
+    cairo_hash_entry_t base;
+    cairo_pdf_struct_tree_node_t *node;
+} cairo_pdf_content_tag_t;
+
 typedef struct _cairo_pdf_annotation {
     cairo_pdf_struct_tree_node_t *node; /* node containing the annotation */
     cairo_link_attrs_t link_attrs;
+    cairo_pdf_resource_t res;
 } cairo_pdf_annotation_t;
 
 typedef struct _cairo_pdf_named_dest {
     cairo_hash_entry_t base;
-    struct tag_extents extents;
+    cairo_pdf_tag_extents_t extents;
     cairo_dest_attrs_t attrs;
     int page;
 } cairo_pdf_named_dest_t;
@@ -233,19 +289,65 @@
     char *value;
 };
 
+typedef enum _cairo_pdf_operation_flags_t {
+    PDF_NONE = 0,
+    PDF_CONTENT,
+    PDF_BEGIN,
+    PDF_END,
+    PDF_GROUP,
+} cairo_pdf_operation_flags_t;
+
+typedef struct _pdf_command_list {
+    cairo_array_t commands;
+    struct _pdf_command_list *parent;
+} cairo_pdf_command_list_t;
+
+typedef struct _pdf_operation {
+    cairo_pdf_command_list_t *group;
+    cairo_pdf_struct_tree_node_t *node;
+    unsigned int command_id;
+    int mcid_index;
+    cairo_pdf_operation_flags_t flags;
+} cairo_pdf_command_t;
+
+typedef struct _pdf_recording_surface_commands {
+    cairo_surface_t *recording_surface;
+    cairo_pdf_command_list_t *command_list;
+    unsigned int region_id;
+} cairo_pdf_recording_surface_commands_t;
+
 typedef struct _cairo_pdf_interchange {
     cairo_tag_stack_t analysis_tag_stack;
     cairo_tag_stack_t render_tag_stack;
-    cairo_array_t push_data; /* records analysis_tag_stack data field for each push */
-    int push_data_index;
     cairo_pdf_struct_tree_node_t *struct_root;
-    cairo_pdf_struct_tree_node_t *current_node;
-    cairo_pdf_struct_tree_node_t *begin_page_node;
-    cairo_pdf_struct_tree_node_t *end_page_node;
-    cairo_array_t parent_tree; /* parent tree resources */
-    cairo_array_t mcid_to_tree; /* mcid to tree node mapping for current page */
+
+    /* Current position in the tree during the analysis stage and across
+     * pages as each page adds to the tree */
+    cairo_pdf_struct_tree_node_t *current_analyze_node;
+
+    /* Currently open tag content containing content. NULL if no content tag open.
+     * A content containg tag may be open across pages */
+    cairo_pdf_struct_tree_node_t *current_render_node;
+    cairo_pdf_struct_tree_node_t *next_page_render_node;
+
+    cairo_array_t recording_surface_stack; /* cairo_recording_surface_stack_entry_t */
+    cairo_pdf_resource_t current_recording_surface_res;
+    cairo_hash_table_t *command_to_node_map; /* <cairo_pdf_surface_node_entry_t> */
+    cairo_bool_t ignore_current_surface;
+    cairo_hash_table_t *content_tag_map; /* <char*,cairo_pdf_content_tag_t> */
+
+    cairo_array_t parent_tree; /* <cairo_pdf_resource_t> */
     cairo_array_t annots; /* array of pointers to cairo_pdf_annotation_t */
+    cairo_pdf_resource_t content_parent_res;
     cairo_pdf_resource_t parent_tree_res;
+
+    /* mcid to tree node for current page or group */
+    cairo_array_t mcid_to_tree; /* <cairo_pdf_struct_tree_node_t *> */
+
+    cairo_array_t page_commands; /* <cairo_pdf_command_list_t> */
+    cairo_pdf_command_list_t *current_commands; /* <cairo_pdf_command_list_t> */
+    cairo_array_t recording_surface_commands;  /* <cairo_pdf_recording_surface_commands_t> */
+
     cairo_list_t extents_list;
     cairo_hash_table_t *named_dests;
     int num_dests;
@@ -255,9 +357,22 @@
     cairo_array_t outline; /* array of pointers to cairo_pdf_outline_entry_t; */
     struct docinfo docinfo;
     cairo_array_t custom_metadata; /* array of struct metadata */
+    cairo_bool_t content_emitted;

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-pdf-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-pdf-surface.c Changed

@@ -280,7 +280,8 @@
 } cairo_pdf_alpha_linear_function_t;
 
 static void
-_cairo_pdf_surface_clear (cairo_pdf_surface_t *surface);
+_cairo_pdf_surface_clear (cairo_pdf_surface_t *surface,
+			  cairo_bool_t         clear_doc_surfaces);
 
 static void
 _cairo_pdf_smask_group_destroy (cairo_pdf_smask_group_t *group);
@@ -338,6 +339,9 @@
 static cairo_bool_t
 _cairo_pdf_source_surface_equal (const void *key_a, const void *key_b);
 
+static cairo_bool_t
+_cairo_pdf_color_glyph_equal (const void *key_a, const void *key_b);
+
 static const cairo_surface_backend_t cairo_pdf_surface_backend;
 static const cairo_paginated_surface_backend_t cairo_pdf_surface_paginated_backend;
 
@@ -467,7 +471,7 @@
     surface->surface_bounded = TRUE;
 
     _cairo_array_init (&surface->objects, sizeof (cairo_pdf_object_t));
-    _cairo_array_init (&surface->pages, sizeof (cairo_pdf_resource_t));
+    _cairo_array_init (&surface->pages, sizeof (cairo_pdf_page_info_t));
     _cairo_array_init (&surface->rgb_linear_functions, sizeof (cairo_pdf_rgb_linear_function_t));
     _cairo_array_init (&surface->alpha_linear_functions, sizeof (cairo_pdf_alpha_linear_function_t));
     _cairo_array_init (&surface->fonts, sizeof (cairo_pdf_font_t));
@@ -478,19 +482,26 @@
     _cairo_array_init (&surface->page_surfaces, sizeof (cairo_pdf_source_surface_t));
     _cairo_array_init (&surface->doc_surfaces, sizeof (cairo_pdf_source_surface_t));
     _cairo_array_init (&surface->jbig2_global, sizeof (cairo_pdf_jbig2_global_t));
-    _cairo_array_init (&surface->page_heights, sizeof (double));
     surface->all_surfaces = _cairo_hash_table_create (_cairo_pdf_source_surface_equal);
     if (unlikely (surface->all_surfaces == NULL)) {
 	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
 	goto BAIL0;
     }
 
+    surface->color_glyphs = _cairo_hash_table_create (_cairo_pdf_color_glyph_equal);
+    if (unlikely (surface->color_glyphs == NULL)) {
+	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	goto BAIL1;
+    }
+
+    surface->duplicate_surface_number = 0;
+
     _cairo_pdf_group_resources_init (&surface->resources);
 
     surface->font_subsets = _cairo_scaled_font_subsets_create_composite ();
     if (! surface->font_subsets) {
 	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-	goto BAIL1;
+	goto BAIL2;
     }
 
     _cairo_scaled_font_subsets_enable_latin_subset (surface->font_subsets, TRUE);
@@ -499,7 +510,7 @@
     surface->pages_resource = _cairo_pdf_surface_new_object (surface);
     if (surface->pages_resource.id == 0) {
 	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        goto BAIL2;
+        goto BAIL3;
     }
 
     surface->struct_tree_root.id = 0;
@@ -515,11 +526,13 @@
     _cairo_array_init (&surface->object_stream.objects, sizeof (cairo_xref_stream_object_t));
 
     surface->paginated_mode = CAIRO_PAGINATED_MODE_ANALYZE;
+    surface->type3_replay = FALSE;
 
     surface->force_fallbacks = FALSE;
     surface->select_pattern_gstate_saved = FALSE;
     surface->current_pattern_is_solid_color = FALSE;
     surface->current_operator = CAIRO_OPERATOR_OVER;
+    surface->reset_gs_required = FALSE;
     surface->header_emitted = FALSE;
 
     _cairo_surface_clipper_init (&surface->clipper,
@@ -537,7 +550,7 @@
 
     status = _cairo_pdf_interchange_init (surface);
     if (unlikely (status))
-	goto BAIL2;
+	goto BAIL3;
 
     surface->page_parent_tree = -1;
     _cairo_array_init (&surface->page_annots, sizeof (cairo_pdf_resource_t));
@@ -553,8 +566,11 @@
     surface->thumbnail_height = 0;
     surface->thumbnail_image = NULL;
 
-    if (getenv ("CAIRO_DEBUG_PDF") != NULL)
+    surface->debug = FALSE;
+    if (getenv ("CAIRO_DEBUG_PDF") != NULL) {
+	surface->debug = TRUE;
 	surface->compress_streams = FALSE;
+    }
 
     surface->paginated_surface =  _cairo_paginated_surface_create (
 	                                  &surface->base,
@@ -568,8 +584,10 @@
 	return surface->paginated_surface;
     }
 
-BAIL2:
+BAIL3:
     _cairo_scaled_font_subsets_destroy (surface->font_subsets);
+BAIL2:
+    _cairo_hash_table_destroy (surface->color_glyphs);
 BAIL1:
     _cairo_hash_table_destroy (surface->all_surfaces);
 BAIL0:
@@ -998,12 +1016,14 @@
 }
 
 static void
-_cairo_pdf_surface_clear (cairo_pdf_surface_t *surface)
+_cairo_pdf_surface_clear (cairo_pdf_surface_t *surface,
+			  cairo_bool_t         clear_doc_surfaces)
 {
     int i, size;
     cairo_pdf_pattern_t *pattern;
     cairo_pdf_source_surface_t *src_surface;
     cairo_pdf_smask_group_t *group;
+    cairo_pdf_source_surface_t doc_surface;
 
     size = _cairo_array_num_elements (&surface->page_patterns);
     for (i = 0; i < size; i++) {
@@ -1037,6 +1057,21 @@
     if (surface->thumbnail_image)
 	cairo_surface_destroy (&surface->thumbnail_image->base);
     surface->thumbnail_image = NULL;
+
+    if (clear_doc_surfaces) {
+	size = _cairo_array_num_elements (&surface->doc_surfaces);
+	for (i = 0; i < size; i++) {
+	    _cairo_array_copy_element (&surface->doc_surfaces, i, &doc_surface);
+	    if (doc_surface.type == CAIRO_PATTERN_TYPE_RASTER_SOURCE) {
+		cairo_pattern_destroy (doc_surface.raster_pattern);
+	    } else {
+		if (_cairo_surface_is_recording (doc_surface.surface) && doc_surface.region_id != 0)
+		    _cairo_recording_surface_region_array_remove (doc_surface.surface, doc_surface.region_id);
+		cairo_surface_destroy (doc_surface.surface);
+	    }
+	}
+	_cairo_array_truncate (&surface->doc_surfaces, 0);
+    }
 }
 
 static void
@@ -1426,6 +1461,9 @@
     if (a->interpolate != b->interpolate)
 	return FALSE;
 
+    if (a->region_id != b->region_id)
+	return FALSE;
+
     if (a->unique_id && b->unique_id && a->unique_id_length == b->unique_id_length)
 	return (memcmp (a->unique_id, b->unique_id, a->unique_id_length) == 0);
 
@@ -1441,6 +1479,28 @@
     } else {
 	key->base.hash = key->id;
     }
+    key->base.hash = _cairo_hash_bytes (key->base.hash,
+					&key->region_id,
+					sizeof(key->region_id));
+}
+
+static cairo_bool_t
+_cairo_pdf_color_glyph_equal (const void *key_a, const void *key_b)
+{
+    const cairo_pdf_color_glyph_t *a = key_a;
+    const cairo_pdf_color_glyph_t *b = key_b;
+
+    if (a->scaled_font != b->scaled_font)
+	return FALSE;
+
+    return (a->glyph_index == b->glyph_index);
+}
+
+static void
+_cairo_pdf_color_glyph_init_key (cairo_pdf_color_glyph_t *key)
+{
+    key->base.hash = _cairo_hash_uintptr (_CAIRO_HASH_INIT_VALUE, (uintptr_t)key->scaled_font);
+    key->base.hash = _cairo_hash_uintptr (key->base.hash, key->glyph_index);
 }
 
 static cairo_int_status_t
@@ -1551,6 +1611,11 @@
  * @surface: in the pdf surface
  * @source_surface: in A #cairo_surface_t to use as the source surface
  * @source_pattern: in A #cairo_pattern_t of type SURFACE or RASTER_SOURCE to use as the source
+ * @region_id: in Surfaces containing tags set this to the recording
+ * surface region id. When tags are used in a XObject, PDF requires a
+ * separate object for each use (section 14.7.4.2) @region_id is used
+ * as a key to ensure a separate object is emitted for each use. Set

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-pen.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-pen.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-png.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-png.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-ps-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-ps-surface.c Changed

@@ -148,7 +148,7 @@
  * ury" that specifies the bounding box (in PS coordinates) of the
  * EPS graphics. The parameters are: lower left x, lower left y, upper
  * right x, upper right y. Normally the bbox data is identical to the
- * %%%BoundingBox data in the EPS file.
+ * \%\%\%BoundingBox data in the EPS file.
  *
  **/
 
@@ -912,18 +912,11 @@
     if (unlikely (status))
 	return status;
 
-    status = _cairo_scaled_font_subsets_foreach_scaled (surface->font_subsets,
-                                                        _cairo_ps_surface_emit_scaled_font_subset,
-                                                        surface);
-    if (unlikely (status))
-	return status;
-
-    return _cairo_scaled_font_subsets_foreach_user (surface->font_subsets,
-						    _cairo_ps_surface_emit_scaled_font_subset,
-						    surface);
+    return _cairo_scaled_font_subsets_foreach_scaled (surface->font_subsets,
+						      _cairo_ps_surface_emit_scaled_font_subset,
+						      surface);
 }
 
-
 static cairo_int_status_t
 _cairo_ps_surface_emit_forms (cairo_ps_surface_t *surface)
 {

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-quartz-font.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-quartz-font.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-quartz-image-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-quartz-image-surface.c Changed

@@ -49,11 +49,14 @@
 #define SURFACE_ERROR_INVALID_SIZE (_cairo_surface_create_in_error(_cairo_error(CAIRO_STATUS_INVALID_SIZE)))
 #define SURFACE_ERROR_INVALID_FORMAT (_cairo_surface_create_in_error(_cairo_error(CAIRO_STATUS_INVALID_FORMAT)))
 
-static void
-DataProviderReleaseCallback (void *image_info, const void *data, size_t size)
-{
-    free (image_info);
-}
+/**
+ * CAIRO_HAS_QUARTZ_IMAGE_SURFACE:
+ *
+ * Defined if the Quartz image surface backend is available.
+ * This macro can be used to conditionally compile backend-specific code.
+ *
+ * Since: 1.10
+ **/
 
 static cairo_surface_t *
 _cairo_quartz_image_surface_create_similar (void *asurface,
@@ -87,8 +90,9 @@
 {
     cairo_quartz_image_surface_t *surface = (cairo_quartz_image_surface_t *) asurface;
 
-    CGImageRelease (surface->image);
-    cairo_surface_destroy ( (cairo_surface_t*) surface->imageSurface);
+    CGContextRelease (surface->cgContext);
+    if (surface->imageSurface)
+	cairo_surface_destroy ( (cairo_surface_t*) surface->imageSurface);
     return CAIRO_STATUS_SUCCESS;
 }
 
@@ -134,47 +138,6 @@
     return TRUE;
 }
 
-/* we assume some drawing happened to the image buffer; make sure it's
- * represented in the CGImage on flush()
- */
-
-static cairo_status_t
-_cairo_quartz_image_surface_flush (void *asurface,
-				   unsigned flags)
-{
-    cairo_quartz_image_surface_t *surface = (cairo_quartz_image_surface_t *) asurface;
-    CGImageRef oldImage = surface->image;
-    CGImageRef newImage = NULL;
-    void *image_data;
-    const unsigned int size = surface->imageSurface->height * surface->imageSurface->stride;
-    if (flags)
-	return CAIRO_STATUS_SUCCESS;
-
-    /* XXX only flush if the image has been modified. */
-
-    image_data = _cairo_malloc_ab ( surface->imageSurface->height,
-				    surface->imageSurface->stride);
-    if (unlikely (!image_data))
-	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-
-    memcpy (image_data, surface->imageSurface->data,
-	    surface->imageSurface->height * surface->imageSurface->stride);
-    newImage = CairoQuartzCreateCGImage (surface->imageSurface->format,
-					 surface->imageSurface->width,
-					 surface->imageSurface->height,
-					 surface->imageSurface->stride,
-					 image_data,
-					 TRUE,
-					 NULL,
-					 DataProviderReleaseCallback,
-					 image_data);
-
-    surface->image = newImage;
-    CGImageRelease (oldImage);
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
 static cairo_int_status_t
 _cairo_quartz_image_surface_paint (void			*abstract_surface,
 				   cairo_operator_t		 op,
@@ -275,7 +238,7 @@
     _cairo_quartz_image_surface_get_extents,
     NULL, /* get_font_options */
 
-    _cairo_quartz_image_surface_flush,
+    NULL, /*surface_flush */
     NULL, /* mark_dirty_rectangle */
 
     _cairo_quartz_image_surface_paint,
@@ -290,12 +253,9 @@
  * cairo_quartz_image_surface_create:
  * @image_surface: a cairo image surface to wrap with a quartz image surface
  *
- * Creates a Quartz surface backed by a CGImageRef that references the
+ * Creates a Quartz surface backed by a CGBitmapContext that references the
  * given image surface. The resulting surface can be rendered quickly
- * when used as a source when rendering to a #cairo_quartz_surface.  If
- * the data in the image surface is ever updated, cairo_surface_flush()
- * must be called on the #cairo_quartz_image_surface to ensure that the
- * CGImageRef refers to the updated data.
+ * when used as a source when rendering to a #cairo_quartz_surface.
  *
  * Return value: the newly created surface.
  *
@@ -305,13 +265,11 @@
 cairo_quartz_image_surface_create (cairo_surface_t *surface)
 {
     cairo_quartz_image_surface_t *qisurf;
-
-    CGImageRef image;
-
     cairo_image_surface_t *image_surface;
     int width, height, stride;
     cairo_format_t format;
-    void *image_data;
+    CGBitmapInfo bitinfo = kCGBitmapByteOrder32Host;
+    CGColorSpaceRef colorspace;
 
     if (surface->status)
 	return surface;
@@ -338,54 +296,100 @@
     if (qisurf == NULL)
 	return SURFACE_ERROR_NO_MEMORY;
 
-    memset (qisurf, 0, sizeof(cairo_quartz_image_surface_t));
-
-    image_data = _cairo_malloc_ab (height, stride);
-    if (unlikely (!image_data)) {
-	free(qisurf);
-	return SURFACE_ERROR_NO_MEMORY;
-    }
-
-    memcpy (image_data, image_surface->data, height * stride);
-    image = CairoQuartzCreateCGImage (format,
-				      width, height,
-				      stride,
-				      image_data,
-				      TRUE,
-				      NULL,
-				      DataProviderReleaseCallback,
-				      image_data);
-
-    if (!image) {
-	free (qisurf);
-	return SURFACE_ERROR_NO_MEMORY;
-    }
-
     _cairo_surface_init (&qisurf->base,
 			 &cairo_quartz_image_surface_backend,
 			 NULL, /* device */
 			 _cairo_content_from_format (format),
 			 FALSE); /* is_vector */
 
+    if (_cairo_surface_is_quartz (surface) || _cairo_surface_is_quartz_image (surface)) {
+	CGContextRef context = cairo_quartz_surface_get_cg_context(surface);
+	colorspace = _cairo_quartz_create_color_space (context);
+    }
+    else {
+	colorspace = CGDisplayCopyColorSpace (CGMainDisplayID ());
+    }
+
+    bitinfo |= format == CAIRO_FORMAT_ARGB32 ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaNoneSkipFirst;
+
     qisurf->width = width;
     qisurf->height = height;
 
-    qisurf->image = image;
+    qisurf->cgContext = CGBitmapContextCreate (image_surface->data, width, height, 8, image_surface->stride,
+					       colorspace, bitinfo);
     qisurf->imageSurface = (cairo_image_surface_t*) cairo_surface_reference(surface);
 
+    CGColorSpaceRelease (colorspace);
     return &qisurf->base;
 }
 
 
+/**
+ * cairo_quartz_image_surface_get_image:
+ * @surface: a #cairo_surface_t
+ *
+ * Returns a #cairo_surface_t image surface that refers to the same bits
+ * as the image of the quartz surface.
+ *
+ * Return value: a #cairo_surface_t (owned by the quartz #cairo_surface_t),
+ * or %NULL if the quartz surface is not an image surface.
+ *
+ * Since: 1.6
+ **/
 cairo_surface_t *
-cairo_quartz_image_surface_get_image (cairo_surface_t *asurface)
+cairo_quartz_image_surface_get_image (cairo_surface_t *surface)
 {
-    cairo_quartz_image_surface_t *surface = (cairo_quartz_image_surface_t*) asurface;
+    cairo_quartz_image_surface_t *qsurface = (cairo_quartz_image_surface_t*) surface;
 
     /* Throw an error for a non-quartz surface */
-    if (! _cairo_surface_is_quartz (asurface)) {
+    if (! _cairo_surface_is_quartz (surface)) {
         return SURFACE_ERROR_TYPE_MISMATCH;
     }

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-quartz-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-quartz-private.h Changed

@@ -81,8 +81,7 @@
     cairo_surface_t base;
 
     int width, height;
-
-    CGImageRef image;
+    CGContextRef cgContext;
     cairo_image_surface_t *imageSurface;
 } cairo_quartz_image_surface_t;
 
@@ -92,16 +91,15 @@
 cairo_private cairo_bool_t
 _cairo_surface_is_quartz (const cairo_surface_t *surface);
 
-cairo_private CGImageRef
-CairoQuartzCreateCGImage (cairo_format_t format,
-			      unsigned int width,
-			      unsigned int height,
-			      unsigned int stride,
-			      void *data,
-			      cairo_bool_t interpolate,
-			      CGColorSpaceRef colorSpaceOverride,
-			      CGDataProviderReleaseDataCallback releaseCallback,
-			      void *releaseInfo);
+cairo_private cairo_bool_t
+_cairo_surface_is_quartz_image (const cairo_surface_t *surface);
+cairo_private cairo_bool_t
+_cairo_quartz_image_surface_is_zero (const cairo_quartz_image_surface_t *surface);
+
+cairo_private CGColorSpaceRef
+_cairo_quartz_create_color_space (CGContextRef context);
+cairo_private CGContextRef
+_cairo_quartz_image_surface_get_cg_context (cairo_surface_t *surface);
 
 cairo_private CGFontRef
 _cairo_quartz_scaled_font_get_cg_font_ref (cairo_scaled_font_t *sfont);
@@ -112,6 +110,9 @@
 cairo_private void
 _cairo_quartz_set_antialiasing (CGContextRef context, cairo_antialias_t antialias);
 
+cairo_status_t _cairo_quartz_surface_to_png (cairo_surface_t *abstract_surface, const char *dest);
+cairo_private void _cairo_quartz_image_to_png (CGImageRef, const char *dest);
+
 #else
 
 # error Cairo was not compiled with support for the quartz backend

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-quartz-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-quartz-surface.c Changed

@@ -37,6 +37,7 @@
 #include "cairoint.h"
 
 #include "cairo-quartz-private.h"
+#include "cairo-quartz-image.h"
 
 #include "cairo-composite-rectangles-private.h"
 #include "cairo-compositor-private.h"
@@ -55,6 +56,7 @@
 #endif
 
 #include <limits.h>
+#include <assert.h>
 
 #undef QUARTZ_DEBUG
 
@@ -64,13 +66,30 @@
 #define ND(_x)	do {} while(0)
 #endif
 
-#define IS_EMPTY(s) ((s)->extents.width == 0 || (s)->extents.height == 0)
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1080
 #define FONT_ORIENTATION_HORIZONTAL kCTFontHorizontalOrientation
 #else
 #define FONT_ORIENTATION_HORIZONTAL kCTFontOrientationHorizontal
 #endif
 
+static inline cairo_bool_t
+_is_quartz_surface (cairo_surface_t *surface) {
+    return _cairo_surface_is_quartz (surface) || _cairo_surface_is_quartz_image (surface);
+}
+
+static inline cairo_bool_t
+_cairo_quartz_surface_is_zero (cairo_quartz_surface_t* surface) {
+    return surface->extents.width == 0 || surface->extents.height == 0;
+}
+
+static inline cairo_bool_t
+_cairo_quartz_is_zero_surface (cairo_surface_t* surface) {
+    assert (_is_quartz_surface (surface));
+    if (_cairo_surface_is_quartz (surface))
+	return (_cairo_quartz_surface_is_zero ((cairo_quartz_surface_t*) surface));
+    else
+	return (_cairo_quartz_image_surface_is_zero ((cairo_quartz_image_surface_t*) surface));
+}
 
 /**
  * SECTION:cairo-quartz
@@ -94,6 +113,20 @@
 /*
  * macOS Private functions
  */
+typedef enum {
+    kCGContextTypeUnknown,
+    kCGContextTypePDF,
+    kCGContextTypePostScript,
+    kCGContextTypeWindow,
+    kCGContextTypeBitmap,
+    kCGContextTypeGL,
+    kCGContextTypeDisplayList,
+    kCGContextTypeKSeparation,
+    kCGContextTypeIOSurface,
+    kCGContextTypeCount
+} CGContextType;
+
+
 static bool (*CGContextGetAllowsFontSmoothingPtr) (CGContextRef) = NULL;
 static unsigned int (*CGContextGetTypePtr) (CGContextRef) = NULL;
 static void
@@ -108,20 +141,15 @@
     }
 }
 
-#ifdef QUARTZ_DEBUG
-static void quartz_surface_to_png (cairo_quartz_surface_t *nq, const char *dest);
-static void quartz_image_to_png (CGImageRef, const char *dest);
-#endif
-
 typedef struct
 {
     cairo_surface_t base;
     CGImageRef image;
 } cairo_quartz_snapshot_t;
 
-static cairo_surface_t* _cairo_quartz_snapshot_create (cairo_quartz_surface_t *surface);
-static cairo_status_t _cairo_quartz_snapshot_finish (void* surface);
-static CGImageRef _cairo_quartz_surface_snapshot_get_image (cairo_quartz_surface_t *surface);
+static cairo_surface_t* _cairo_quartz_snapshot_create (cairo_surface_t *surface);
+static cairo_status_t _cairo_quartz_snapshot_finish (void *surface);
+static CGImageRef _cairo_quartz_surface_snapshot_get_image (cairo_surface_t *surface);
 
 static const cairo_surface_backend_t cairo_quartz_snapshot_backend = {
     CAIRO_INTERNAL_SURFACE_TYPE_QUARTZ_SNAPSHOT,
@@ -134,102 +162,72 @@
 				       unsigned int width,
 				       unsigned int height);
 
-CGImageRef
-CairoQuartzCreateCGImage (cairo_format_t format,
-			  unsigned int width,
-			  unsigned int height,
-			  unsigned int stride,
-			  void *data,
-			  cairo_bool_t interpolate,
-			  CGColorSpaceRef colorSpaceOverride,
-			  CGDataProviderReleaseDataCallback releaseCallback,
-			  void *releaseInfo)
+CGColorSpaceRef
+_cairo_quartz_create_color_space (CGContextRef context)
 {
-    CGImageRef image = NULL;
-    CGDataProviderRef dataProvider = NULL;
-    CGColorSpaceRef colorSpace = colorSpaceOverride;
-    CGBitmapInfo bitinfo = kCGBitmapByteOrder32Host;
-    int bitsPerComponent, bitsPerPixel;
-
-    switch (format) {
-	case CAIRO_FORMAT_ARGB32:
-	    if (colorSpace == NULL)
-		colorSpace = CGColorSpaceCreateDeviceRGB ();
-	    bitinfo |= kCGImageAlphaPremultipliedFirst;
-	    bitsPerComponent = 8;
-	    bitsPerPixel = 32;
-	    break;
-
-	case CAIRO_FORMAT_RGB24:
-	    if (colorSpace == NULL)
-		colorSpace = CGColorSpaceCreateDeviceRGB ();
-	    bitinfo |= kCGImageAlphaNoneSkipFirst;
-	    bitsPerComponent = 8;
-	    bitsPerPixel = 32;
-	    break;
-
-	case CAIRO_FORMAT_A8:
-	    bitsPerComponent = 8;
-	    bitsPerPixel = 8;
-	    break;
+    CGColorSpaceRef color_space = NULL;
+    CGContextType cgtype = kCGContextTypeUnknown;
 
-	case CAIRO_FORMAT_A1:
-#ifdef WORDS_BIGENDIAN
-	    bitsPerComponent = 1;
-	    bitsPerPixel = 1;
-	    break;
-#endif
-
-	case CAIRO_FORMAT_RGB30:
-	case CAIRO_FORMAT_RGB16_565:
-        case CAIRO_FORMAT_RGB96F:
-        case CAIRO_FORMAT_RGBA128F:
-	case CAIRO_FORMAT_INVALID:
-	default:
-	    return NULL;
-    }
-
-    dataProvider = CGDataProviderCreateWithData (releaseInfo,
-						 data,
-						 height * stride,
-						 releaseCallback);
-
-    if (unlikely (!dataProvider)) {
-	// manually release
-	if (releaseCallback)
-	    releaseCallback (releaseInfo, data, height * stride);
-	goto FINISH;
+    if (context)
+    {
+        if (CGBitmapContextGetBitsPerPixel (context) < 24)
+            return 0;
+
+        quartz_ensure_symbols();
+        cgtype = CGContextGetTypePtr (context);
+        switch (cgtype)
+        {
+        case kCGContextTypeUnknown:
+            break;
+        case kCGContextTypePDF:
+            color_space = CGColorSpaceCreateDeviceRGB ();
+            break;
+        case kCGContextTypePostScript:
+        case kCGContextTypeWindow:
+            break;
+        case kCGContextTypeBitmap:
+            color_space = CGBitmapContextGetColorSpace (context);
+            color_space = CGColorSpaceRetain (color_space);
+            break;
+        case kCGContextTypeGL:
+        case kCGContextTypeDisplayList:
+        case kCGContextTypeKSeparation:
+        case kCGContextTypeIOSurface:
+        case kCGContextTypeCount:
+        default:
+            break;
+        }
+        if (color_space)
+            return color_space;
     }
+    if (!color_space)
+        color_space =  CGDisplayCopyColorSpace (CGMainDisplayID ());

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-recording-surface-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-recording-surface-private.h Changed

@@ -155,6 +155,7 @@
     cairo_bool_t optimize_clears;
     cairo_bool_t has_bilevel_alpha;
     cairo_bool_t has_only_op_over;
+    cairo_bool_t has_tags;
 
     struct bbtree {
 	cairo_box_t extents;
@@ -182,8 +183,6 @@
     cairo_list_t link;
 } cairo_recording_regions_array_t;
 
-slim_hidden_proto (cairo_recording_surface_create);
-
 cairo_private cairo_int_status_t
 _cairo_recording_surface_get_path (cairo_surface_t	 *surface,
 				   cairo_path_fixed_t *path);
@@ -204,18 +203,26 @@
                                                        cairo_bool_t        *foreground_used);
 
 cairo_private cairo_status_t
-_cairo_recording_surface_replay_with_clip (cairo_surface_t *surface,
-					   const cairo_matrix_t *surface_transform,
-					   cairo_surface_t *target,
-					   const cairo_clip_t *target_clip,
-                                           cairo_bool_t surface_is_unbounded);
+_cairo_recording_surface_replay_with_transform (cairo_surface_t          *surface,
+						const cairo_matrix_t     *surface_transform,
+						cairo_surface_t          *target,
+						cairo_bool_t              surface_is_unbounded,
+						cairo_bool_t              replay_all);
+
+cairo_private cairo_status_t
+_cairo_recording_surface_replay_with_clip (cairo_surface_t               *surface,
+					   const cairo_matrix_t          *surface_transform,
+					   cairo_surface_t               *target,
+					   const cairo_clip_t            *target_clip);
 
 cairo_private cairo_status_t
 _cairo_recording_surface_replay_and_create_regions (cairo_surface_t      *surface,
                                                     unsigned int          regions_id,
 						    const cairo_matrix_t *surface_transform,
 						    cairo_surface_t      *target,
-						    cairo_bool_t          surface_is_unbounded);
+						    cairo_bool_t          surface_is_unbounded,
+						    cairo_bool_t          replay_all);
+
 cairo_private cairo_status_t
 _cairo_recording_surface_replay_region (cairo_surface_t			*surface,
                                         unsigned int                     regions_id,
@@ -239,6 +246,9 @@
 cairo_private cairo_bool_t
 _cairo_recording_surface_has_only_op_over (cairo_recording_surface_t *surface);
 
+cairo_private cairo_bool_t
+_cairo_recording_surface_has_tags (cairo_surface_t *surface);
+
 cairo_private cairo_status_t
 _cairo_recording_surface_region_array_attach (cairo_surface_t *surface,
                                               unsigned int    *id);

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-recording-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-recording-surface.c Changed

@@ -103,6 +103,7 @@
     unsigned int regions_id;
     const cairo_color_t *foreground_color;
     cairo_bool_t foreground_used;
+    cairo_bool_t replay_all;
 } cairo_recording_surface_replay_params_t;
 
 static const cairo_surface_backend_t cairo_recording_surface_backend;
@@ -364,7 +365,10 @@
     return CAIRO_STATUS_SUCCESS;
 
 cleanup:
-    bbtree_del (&surface->bbtree);
+    if (surface->bbtree.left)
+	bbtree_del (surface->bbtree.left);
+    if (surface->bbtree.right)
+	bbtree_del (surface->bbtree.right);
     return status;
 }
 
@@ -433,6 +437,7 @@
     surface->optimize_clears = TRUE;
     surface->has_bilevel_alpha = FALSE;
     surface->has_only_op_over = FALSE;
+    surface->has_tags = FALSE;
 
     CAIRO_MUTEX_INIT (surface->mutex);
 
@@ -440,7 +445,6 @@
 
     return &surface->base;
 }
-slim_hidden_def (cairo_recording_surface_create);
 
 static cairo_surface_t *
 _cairo_recording_surface_create_similar (void		       *abstract_surface,
@@ -1187,6 +1191,8 @@
 
     TRACE ((stderr, "%s: surface=%d\n", __FUNCTION__, surface->base.unique_id));
 
+    surface->has_tags = TRUE;
+
     command = calloc (1, sizeof (cairo_command_tag_t));
     if (unlikely (command == NULL)) {
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
@@ -1231,6 +1237,14 @@
     return status;
 }
 
+static cairo_bool_t
+_cairo_recording_surface_supports_color_glyph (void                 *abstract_surface,
+                                               cairo_scaled_font_t  *scaled_font,
+                                               unsigned long         glyph_index)
+{
+    return TRUE;
+}
+
 static void
 _command_init_copy (cairo_recording_surface_t *surface,
 		    cairo_command_header_t *dst,
@@ -1624,6 +1638,7 @@
     surface->unbounded = other->unbounded;
     surface->has_bilevel_alpha = other->has_bilevel_alpha;
     surface->has_only_op_over = other->has_only_op_over;
+    surface->has_tags = other->has_tags;
 
     surface->base.is_clear = other->base.is_clear;
 
@@ -1633,8 +1648,6 @@
     surface->indices = NULL;
     surface->num_indices = 0;
     surface->optimize_clears = TRUE;
-    surface->has_bilevel_alpha = other->has_bilevel_alpha;
-    surface->has_only_op_over = other->has_only_op_over;
 
     CAIRO_MUTEX_INIT (surface->mutex);
 
@@ -1703,6 +1716,9 @@
     _cairo_recording_surface_show_text_glyphs,
     NULL, /* get_supported_mime_types */
     _cairo_recording_surface_tag,
+    _cairo_recording_surface_supports_color_glyph,
+    NULL, /* analyze_recording_surface */
+    NULL, /* command_id */
 };
 
 static unsigned int
@@ -1906,7 +1922,7 @@
     cairo_box_t box;
 
     if (surface->commands.num_elements == 0)
-	    return 0;
+	return 0;
 
     _cairo_box_from_rectangle (&box, extents);
 
@@ -2066,7 +2082,7 @@
     if (regions_array)
 	region_elements = _cairo_array_index (&regions_array->regions, 0);
 
-    if (extents.width < r->width || extents.height < r->height) {
+    if (!params->replay_all && (extents.width < r->width || extents.height < r->height)) {
 	num_elements =
 	    _cairo_recording_surface_get_visible_commands (surface, &extents);
 	use_indices = num_elements != surface->commands.num_elements;
@@ -2094,6 +2110,13 @@
 		continue;
 	}
 
+
+	if (params->target->backend->command_id) {
+	    status = params->target->backend->command_id (params->target, params->regions_id, i);
+	    if (unlikely (status))
+		return status;
+	}
+
 	switch (command->header.type) {
 	case CAIRO_COMMAND_PAINT:
 	    if (region_element)
@@ -2445,6 +2468,7 @@
     params.region = CAIRO_RECORDING_REGION_ALL;
     params.regions_id = 0;
     params.foreground_color = NULL;
+    params.replay_all = FALSE;
 
     return _cairo_recording_surface_replay_internal ((cairo_recording_surface_t *) surface, &params);
 }
@@ -2468,6 +2492,7 @@
     params.regions_id = 0;
     params.foreground_color = foreground_color;
     params.foreground_used = FALSE;
+    params.replay_all = FALSE;
 
     status = _cairo_recording_surface_replay_internal ((cairo_recording_surface_t *) surface, &params);
     *foreground_used = params.foreground_used;
@@ -2476,11 +2501,33 @@
 }
 
 cairo_status_t
+_cairo_recording_surface_replay_with_transform (cairo_surface_t *surface,
+						const cairo_matrix_t *surface_transform,
+						cairo_surface_t *target,
+						cairo_bool_t surface_is_unbounded,
+						cairo_bool_t replay_all)
+{
+    cairo_recording_surface_replay_params_t params;
+
+    params.surface_extents = NULL;
+    params.surface_transform = surface_transform;
+    params.target = target;
+    params.target_clip = NULL;
+    params.surface_is_unbounded = surface_is_unbounded;
+    params.type = CAIRO_RECORDING_REPLAY;
+    params.region = CAIRO_RECORDING_REGION_ALL;
+    params.regions_id = 0;
+    params.foreground_color = NULL;
+    params.replay_all = replay_all;
+
+    return _cairo_recording_surface_replay_internal ((cairo_recording_surface_t *) surface, &params);
+}
+
+cairo_status_t
 _cairo_recording_surface_replay_with_clip (cairo_surface_t *surface,
 					   const cairo_matrix_t *surface_transform,
 					   cairo_surface_t *target,
-					   const cairo_clip_t *target_clip,
-                                           cairo_bool_t surface_is_unbounded)
+					   const cairo_clip_t *target_clip)
 {
     cairo_recording_surface_replay_params_t params;
 
@@ -2488,11 +2535,12 @@
     params.surface_transform = surface_transform;
     params.target = target;
     params.target_clip = target_clip;
-    params.surface_is_unbounded = surface_is_unbounded;
+    params.surface_is_unbounded = FALSE;
     params.type = CAIRO_RECORDING_REPLAY;
     params.region = CAIRO_RECORDING_REGION_ALL;
     params.regions_id = 0;
     params.foreground_color = NULL;
+    params.replay_all = FALSE;
 
     return _cairo_recording_surface_replay_internal ((cairo_recording_surface_t *) surface, &params);
 }
@@ -2508,7 +2556,8 @@
 						    unsigned int regions_id,
 						    const cairo_matrix_t *surface_transform,
 						    cairo_surface_t *target,
-						    cairo_bool_t surface_is_unbounded)
+						    cairo_bool_t surface_is_unbounded,
+						    cairo_bool_t replay_all)
 {
     cairo_recording_surface_replay_params_t params;
 
@@ -2521,6 +2570,7 @@
     params.region = CAIRO_RECORDING_REGION_ALL;
     params.regions_id = regions_id;
     params.foreground_color = NULL;
+    params.replay_all = replay_all;

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-region.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-region.c Changed

@@ -213,7 +213,6 @@
 
     return region;
 }
-slim_hidden_def (cairo_region_create);
 
 /**
  * cairo_region_create_rectangles:
@@ -281,7 +280,6 @@
 
     return region;
 }
-slim_hidden_def (cairo_region_create_rectangles);
 
 cairo_region_t *
 _cairo_region_create_from_boxes (const cairo_box_t *boxes, int count)
@@ -347,7 +345,6 @@
 
     return region;
 }
-slim_hidden_def (cairo_region_create_rectangle);
 
 /**
  * cairo_region_copy:
@@ -384,7 +381,6 @@
 
     return copy;
 }
-slim_hidden_def (cairo_region_copy);
 
 /**
  * cairo_region_reference:
@@ -409,7 +405,6 @@
     _cairo_reference_count_inc (&region->ref_count);
     return region;
 }
-slim_hidden_def (cairo_region_reference);
 
 /**
  * cairo_region_destroy:
@@ -435,7 +430,6 @@
     _cairo_region_fini (region);
     free (region);
 }
-slim_hidden_def (cairo_region_destroy);
 
 /**
  * cairo_region_num_rectangles:
@@ -455,7 +449,6 @@
 
     return pixman_region32_n_rects (CONST_CAST &region->rgn);
 }
-slim_hidden_def (cairo_region_num_rectangles);
 
 /**
  * cairo_region_get_rectangle:
@@ -487,7 +480,6 @@
     rectangle->width = pbox->x2 - pbox->x1;
     rectangle->height = pbox->y2 - pbox->y1;
 }
-slim_hidden_def (cairo_region_get_rectangle);
 
 /**
  * cairo_region_get_extents:
@@ -517,7 +509,6 @@
     extents->width = pextents->x2 - pextents->x1;
     extents->height = pextents->y2 - pextents->y1;
 }
-slim_hidden_def (cairo_region_get_extents);
 
 /**
  * cairo_region_status:
@@ -535,7 +526,6 @@
 {
     return region->status;
 }
-slim_hidden_def (cairo_region_status);
 
 /**
  * cairo_region_subtract:
@@ -566,7 +556,6 @@
 
     return CAIRO_STATUS_SUCCESS;
 }
-slim_hidden_def (cairo_region_subtract);
 
 /**
  * cairo_region_subtract_rectangle:
@@ -600,7 +589,6 @@
 
     return status;
 }
-slim_hidden_def (cairo_region_subtract_rectangle);
 
 /**
  * cairo_region_intersect:
@@ -627,7 +615,6 @@
 
     return CAIRO_STATUS_SUCCESS;
 }
-slim_hidden_def (cairo_region_intersect);
 
 /**
  * cairo_region_intersect_rectangle:
@@ -662,7 +649,6 @@
 
     return status;
 }
-slim_hidden_def (cairo_region_intersect_rectangle);
 
 /**
  * cairo_region_union:
@@ -690,7 +676,6 @@
 
     return CAIRO_STATUS_SUCCESS;
 }
-slim_hidden_def (cairo_region_union);
 
 /**
  * cairo_region_union_rectangle:
@@ -724,7 +709,6 @@
 
     return status;
 }
-slim_hidden_def (cairo_region_union_rectangle);
 
 /**
  * cairo_region_xor:
@@ -763,7 +747,6 @@
 
     return status;
 }
-slim_hidden_def (cairo_region_xor);
 
 /**
  * cairo_region_xor_rectangle:
@@ -804,7 +787,6 @@
 
     return status;
 }
-slim_hidden_def (cairo_region_xor_rectangle);
 
 /**
  * cairo_region_is_empty:
@@ -824,7 +806,6 @@
 
     return ! pixman_region32_not_empty (CONST_CAST &region->rgn);
 }
-slim_hidden_def (cairo_region_is_empty);
 
 /**
  * cairo_region_translate:
@@ -845,7 +826,6 @@
 
     pixman_region32_translate (&region->rgn, dx, dy);
 }
-slim_hidden_def (cairo_region_translate);
 
 /**
  * cairo_region_contains_rectangle:
@@ -886,7 +866,6 @@
     case PIXMAN_REGION_PART: return CAIRO_REGION_OVERLAP_PART;
     }
 }
-slim_hidden_def (cairo_region_contains_rectangle);
 
 /**
  * cairo_region_contains_point:
@@ -911,7 +890,6 @@
 
     return pixman_region32_contains_point (CONST_CAST &region->rgn, x, y, &box);
 }
-slim_hidden_def (cairo_region_contains_point);
 
 /**
  * cairo_region_equal:
@@ -942,4 +920,3 @@
 
     return pixman_region32_equal (CONST_CAST &a->rgn, CONST_CAST &b->rgn);
 }
-slim_hidden_def (cairo_region_equal);

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-scaled-font-subsets-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-scaled-font-subsets-private.h Changed

@@ -297,41 +297,6 @@
 				             void				      *closure);
 
 /**
- * _cairo_scaled_font_subsets_foreach_user:
- * @font_subsets: a #cairo_scaled_font_subsets_t
- * @font_subset_callback: a function to be called for each font subset
- * @closure: closure data for the callback function
- *
- * Iterate over each unique scaled font subset as created by calls to
- * _cairo_scaled_font_subsets_map_glyph(). A subset is determined by
- * unique pairs of (font_id, subset_id) as returned by
- * _cairo_scaled_font_subsets_map_glyph().
- *
- * For each subset, @font_subset_callback will be called and will be
- * provided with both a #cairo_scaled_font_subset_t object containing
- * all the glyphs in the subset as well as the value of @closure.
- *
- * The #cairo_scaled_font_subset_t object contains the scaled_font,
- * the font_id, and the subset_id corresponding to all glyphs
- * belonging to the subset. In addition, it contains an array providing
- * a mapping between subset glyph indices and the original scaled font
- * glyph indices.
- *
- * The index of the array corresponds to subset_glyph_index values
- * returned by _cairo_scaled_font_subsets_map_glyph() while the
- * values of the array correspond to the scaled_font_glyph_index
- * values passed as input to the same function.
- *
- * Return value: %CAIRO_STATUS_SUCCESS if successful, or a non-zero
- * value indicating an error. Possible errors include
- * %CAIRO_STATUS_NO_MEMORY.
- **/
-cairo_private cairo_status_t
-_cairo_scaled_font_subsets_foreach_user (cairo_scaled_font_subsets_t		  *font_subsets,
-					 cairo_scaled_font_subset_callback_func_t  font_subset_callback,
-					 void					  *closure);
-
-/**
  * _cairo_scaled_font_subset_create_glyph_names:
  * @font_subsets: a #cairo_scaled_font_subsets_t
  *

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-scaled-font-subsets.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-scaled-font-subsets.c Changed

@@ -62,7 +62,6 @@
 typedef enum {
     CAIRO_SUBSETS_FOREACH_UNSCALED,
     CAIRO_SUBSETS_FOREACH_SCALED,
-    CAIRO_SUBSETS_FOREACH_USER
 } cairo_subsets_foreach_type_t;
 
 typedef struct _cairo_sub_font {
@@ -70,7 +69,6 @@
 
     cairo_bool_t is_scaled;
     cairo_bool_t is_composite;
-    cairo_bool_t is_user;
     cairo_bool_t use_latin_subset;
     cairo_bool_t reserve_notdef;
     cairo_scaled_font_subsets_t *parent;
@@ -284,8 +282,7 @@
 
     sub_font->is_scaled = is_scaled;
     sub_font->is_composite = is_composite;
-    sub_font->is_user = _cairo_font_face_is_user (scaled_font->font_face);
-    sub_font->reserve_notdef = !sub_font->is_user;
+    sub_font->reserve_notdef = !sub_font->is_scaled;
     _cairo_sub_font_init_key (sub_font, scaled_font);
 
     sub_font->parent = parent;
@@ -295,7 +292,7 @@
     sub_font->use_latin_subset = parent->use_latin_subset;
 
     /* latin subsets of Type 3 and CID CFF fonts are not supported */
-    if (sub_font->is_user || sub_font->is_scaled ||
+    if (sub_font->is_scaled ||
 	_cairo_cff_scaled_font_is_cid_cff (scaled_font) )
     {
 	sub_font->use_latin_subset = FALSE;
@@ -433,7 +430,7 @@
     if (utf8 != NULL && utf8_len != 0) {
 	if (sub_font_glyph->utf8 != NULL) {
 	    if (utf8_len == sub_font_glyph->utf8_len &&
-		memcmp (utf8, sub_font_glyph->utf8, utf8_len) == 0)
+		strncmp (utf8, sub_font_glyph->utf8, utf8_len) == 0)
 	    {
 		/* Requested utf8 mapping matches the existing mapping */
 		*is_mapped = TRUE;
@@ -620,12 +617,11 @@
 	    }
 	}
 
-	/* If glyph is in the winansi encoding and font is not a user
+	/* If glyph is in the winansi encoding and font is not a scaled
 	 * font, put glyph in the latin subset. */
 	is_latin = FALSE;
 	latin_character = -1;
-	if (sub_font->use_latin_subset &&
-	    (! _cairo_font_face_is_user (sub_font->scaled_font->font_face)))
+	if (sub_font->use_latin_subset && !sub_font->is_scaled)
 	{
 	    latin_character = _cairo_unicode_to_winansi (font_unicode);
 	    if (latin_character > 0)
@@ -839,6 +835,9 @@
     cairo_int_status_t status;
     int max_glyphs;
     cairo_bool_t type1_font;
+    cairo_bool_t has_path;
+    cairo_bool_t has_color;
+    cairo_bool_t is_user;
 
     /* Lookup glyph in unscaled subsets */
     if (subsets->type != CAIRO_SUBSETS_SCALED) {
@@ -872,30 +871,47 @@
 
     /* Glyph not found. Determine whether the glyph is outline or
      * bitmap and add to the appropriate subset.
-     *
-     * glyph_index 0 (the .notdef glyph) is a special case. Some fonts
+     */
+    is_user = _cairo_font_face_is_user (scaled_font->font_face);
+    _cairo_scaled_font_freeze_cache (scaled_font);
+    /* Check if glyph is color */
+    status = _cairo_scaled_glyph_lookup (scaled_font,
+					 scaled_font_glyph_index,
+					 CAIRO_SCALED_GLYPH_INFO_COLOR_SURFACE,
+					 NULL, /* foreground color */
+					 &scaled_glyph);
+    has_color = (status == CAIRO_INT_STATUS_SUCCESS);
+
+    /* Check if glyph has a path */
+    status = _cairo_scaled_glyph_lookup (scaled_font,
+					 scaled_font_glyph_index,
+					 CAIRO_SCALED_GLYPH_INFO_PATH,
+					 NULL, /* foreground color */
+					 &scaled_glyph);
+    has_path = (status == CAIRO_INT_STATUS_SUCCESS);
+
+    /* glyph_index 0 (the .notdef glyph) is a special case. Some fonts
      * will return CAIRO_INT_STATUS_UNSUPPORTED when doing a
      * _scaled_glyph_lookup(_GLYPH_INFO_PATH). Type1-fallback creates
      * empty glyphs in this case so we can put the glyph in a unscaled
-     * subset. */
-    if (scaled_font_glyph_index == 0 ||
-	_cairo_font_face_is_user (scaled_font->font_face)) {
-	status = CAIRO_STATUS_SUCCESS;
-    } else {
-	_cairo_scaled_font_freeze_cache (scaled_font);
-	status = _cairo_scaled_glyph_lookup (scaled_font,
-					     scaled_font_glyph_index,
-					     CAIRO_SCALED_GLYPH_INFO_PATH,
+     * subset.
+     */
+    if (scaled_font_glyph_index == 0 && !is_user)
+        has_path = TRUE;
+
+    /* If this fails there is nothing we can do with this glyph. */
+    status = _cairo_scaled_glyph_lookup (scaled_font,
+					 scaled_font_glyph_index,
+					 CAIRO_SCALED_GLYPH_INFO_SURFACE,
                                              NULL, /* foreground color */
-					     &scaled_glyph);
-	_cairo_scaled_font_thaw_cache (scaled_font);
-    }
+					 &scaled_glyph);
+    _cairo_scaled_font_thaw_cache (scaled_font);
     if (_cairo_int_status_is_error (status))
         return status;
 
-    if (status == CAIRO_INT_STATUS_SUCCESS &&
-	subsets->type != CAIRO_SUBSETS_SCALED &&
-	! _cairo_font_face_is_user (scaled_font->font_face))
+    /* Type 3 glyphs (is_user and has_color) must be added to scaled subset */
+    if (subsets->type != CAIRO_SUBSETS_SCALED &&
+	has_path && !has_color && !is_user)
     {
         /* Path available. Add to unscaled subset. */
         key.is_scaled = FALSE;
@@ -1007,19 +1023,12 @@
 {
     cairo_sub_font_collection_t collection;
     cairo_sub_font_t *sub_font;
-    cairo_bool_t is_scaled, is_user;
+    cairo_bool_t is_scaled;
 
     is_scaled = FALSE;
-    is_user = FALSE;
 
-    if (type == CAIRO_SUBSETS_FOREACH_USER)
-	is_user = TRUE;
-
-    if (type == CAIRO_SUBSETS_FOREACH_SCALED ||
-	type == CAIRO_SUBSETS_FOREACH_USER)
-    {
+    if (type == CAIRO_SUBSETS_FOREACH_SCALED)
 	is_scaled = TRUE;
-    }
 
     if (is_scaled)
         collection.glyphs_size = font_subsets->max_glyphs_per_scaled_subset_used;
@@ -1055,9 +1064,7 @@
 	sub_font = font_subsets->unscaled_sub_fonts_list;
 
     while (sub_font) {
-	if (sub_font->is_user == is_user)
-	    _cairo_sub_font_collect (sub_font, &collection);
-
+	_cairo_sub_font_collect (sub_font, &collection);
 	sub_font = sub_font->next;
     }
     free (collection.utf8);
@@ -1090,17 +1097,6 @@
 							CAIRO_SUBSETS_FOREACH_UNSCALED);
 }
 
-cairo_status_t
-_cairo_scaled_font_subsets_foreach_user (cairo_scaled_font_subsets_t		  *font_subsets,
-					 cairo_scaled_font_subset_callback_func_t  font_subset_callback,
-					 void					  *closure)
-{
-    return _cairo_scaled_font_subsets_foreach_internal (font_subsets,
-                                                        font_subset_callback,
-                                                        closure,
-							CAIRO_SUBSETS_FOREACH_USER);
-}
-
 static cairo_bool_t
 _cairo_string_equal (const void *key_a, const void *key_b)
 {

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-scaled-font.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-scaled-font.c Changed

@@ -336,7 +336,6 @@
 {
     return scaled_font->status;
 }
-slim_hidden_def (cairo_scaled_font_status);
 
 /* Here we keep a unique mapping from
  * font_face/matrix/ctm/font_options => #cairo_scaled_font_t.
@@ -679,6 +678,12 @@
 	_cairo_scaled_font_compute_hash (scaled_font);
 }
 
+static void
+_cairo_scaled_font_fini_key (cairo_scaled_font_t *scaled_font)
+{
+    _cairo_font_options_fini (&scaled_font->options);
+}
+
 static cairo_bool_t
 _cairo_scaled_font_keys_equal (const void *abstract_key_a,
 			       const void *abstract_key_b)
@@ -915,6 +920,7 @@
 
     _cairo_scaled_font_reset_cache (scaled_font);
     _cairo_hash_table_destroy (scaled_font->glyphs);
+    _cairo_font_options_fini (&scaled_font->options);
 
     cairo_font_face_destroy (scaled_font->font_face);
     cairo_font_face_destroy (scaled_font->original_font_face);
@@ -1106,6 +1112,7 @@
 	 * just wait until it's done, then retry */
 	_cairo_scaled_font_placeholder_wait_for_creation_to_finish (scaled_font);
     }
+    _cairo_scaled_font_fini_key (&key);
 
     if (scaled_font != NULL) {
 	/* If the original reference count is 0, then this font must have
@@ -1239,7 +1246,6 @@
 
     return scaled_font;
 }
-slim_hidden_def (cairo_scaled_font_create);
 
 static cairo_scaled_font_t *_cairo_scaled_font_nil_objectsCAIRO_STATUS_LAST_STATUS + 1;
 
@@ -1325,7 +1331,6 @@
 
     return scaled_font;
 }
-slim_hidden_def (cairo_scaled_font_reference);
 
 /**
  * cairo_scaled_font_destroy:
@@ -1409,7 +1414,6 @@
 	free (lru);
     }
 }
-slim_hidden_def (cairo_scaled_font_destroy);
 
 /**
  * cairo_scaled_font_get_reference_count:
@@ -1453,7 +1457,6 @@
     return _cairo_user_data_array_get_data (&scaled_font->user_data,
 					    key);
 }
-slim_hidden_def (cairo_scaled_font_get_user_data);
 
 /**
  * cairo_scaled_font_set_user_data:
@@ -1485,7 +1488,6 @@
     return _cairo_user_data_array_set_data (&scaled_font->user_data,
 					    key, user_data, destroy);
 }
-slim_hidden_def (cairo_scaled_font_set_user_data);
 
 /* Public font API follows. */
 
@@ -1513,7 +1515,6 @@
 
     *extents = scaled_font->extents;
 }
-slim_hidden_def (cairo_scaled_font_extents);
 
 /**
  * cairo_scaled_font_text_extents:
@@ -1713,7 +1714,6 @@
     extents->x_advance = 0.0;
     extents->y_advance = 0.0;
 }
-slim_hidden_def (cairo_scaled_font_glyph_extents);
 
 #define GLYPH_LUT_SIZE 64
 static cairo_status_t
@@ -2180,7 +2180,6 @@
 
     return status;
 }
-slim_hidden_def (cairo_scaled_font_text_to_glyphs);
 
 static inline cairo_bool_t
 _range_contains_glyph (const cairo_box_t *extents,
@@ -2660,7 +2659,9 @@
  * @recording_surface: The recording surface
  * @foreground_color: The foreground color that was used to record the
  * glyph, or NULL if foreground color not required.
- */
+ *
+ * Sets the surface that was used to record the glyph.
+ **/
 void
 _cairo_scaled_glyph_set_recording_surface (cairo_scaled_glyph_t *scaled_glyph,
 					   cairo_scaled_font_t  *scaled_font,
@@ -2691,7 +2692,9 @@
  * @foreground_marker_color: The foreground color that was used to
  * substitute the foreground_marker, or NULL if foreground_marker not
  * used when rendering the surface color.
- */
+ *
+ * Sets the color surface of the glyph.
+ **/
 void
 _cairo_scaled_glyph_set_color_surface (cairo_scaled_glyph_t  *scaled_glyph,
 	                               cairo_scaled_font_t   *scaled_font,
@@ -2987,7 +2990,6 @@
     return scaled_font->max_scale;
 }
 
-
 /**
  * cairo_scaled_font_get_font_face:
  * @scaled_font: a #cairo_scaled_font_t
@@ -3013,7 +3015,6 @@
 
     return scaled_font->font_face;
 }
-slim_hidden_def (cairo_scaled_font_get_font_face);
 
 /**
  * cairo_scaled_font_get_font_matrix:
@@ -3036,7 +3037,6 @@
 
     *font_matrix = scaled_font->font_matrix;
 }
-slim_hidden_def (cairo_scaled_font_get_font_matrix);
 
 /**
  * cairo_scaled_font_get_ctm:
@@ -3061,7 +3061,6 @@
 
     *ctm = scaled_font->ctm;
 }
-slim_hidden_def (cairo_scaled_font_get_ctm);
 
 /**
  * cairo_scaled_font_get_scale_matrix:
@@ -3112,7 +3111,6 @@
     _cairo_font_options_fini (options);
     _cairo_font_options_init_copy (options, &scaled_font->options);
 }
-slim_hidden_def (cairo_scaled_font_get_font_options);
 
 cairo_bool_t
 _cairo_scaled_font_has_color_glyphs (cairo_scaled_font_t *scaled_font)

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-script-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-script-private.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-script-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-script-surface.c Changed

@@ -371,6 +371,21 @@
 }
 
 static const char *
+_dither_to_string (cairo_dither_t dither)
+{
+    static const char *names = {
+	"DITHER_DEFAULT",	/* CAIRO_FILTER_FAST */
+	"DITHER_NONE",		/* CAIRO_FILTER_GOOD */
+	"DITHER_FAST",		/* CAIRO_FILTER_BEST */
+	"DITHER_GOOD",		/* CAIRO_FILTER_NEAREST */
+	"DITHER_BEST",		/* CAIRO_FILTER_BILINEAR */
+    };
+    assert (dither < ARRAY_LENGTH (names));
+    return namesdither;
+}
+
+
+static const char *
 _fill_rule_to_string (cairo_fill_rule_t rule)
 {
     static const char *names = {
@@ -1731,6 +1746,17 @@
 				     " //%s set-filter\n ",
 				     _filter_to_string (pattern->filter));
     }
+    /* XXX need to discriminate the user explicitly setting the default */
+    if (pattern->dither != CAIRO_DITHER_DEFAULT) {
+	if (need_newline) {
+	    _cairo_output_stream_puts (ctx->stream, "\n ");
+	    need_newline = FALSE;
+	}
+
+	_cairo_output_stream_printf (ctx->stream,
+				     " //%s set-dither\n ",
+				     _dither_to_string (pattern->dither));
+    }
     if (! is_default_extend ){
 	if (need_newline) {
 	    _cairo_output_stream_puts (ctx->stream, "\n ");
@@ -2204,6 +2230,7 @@
 
     _cairo_pattern_fini (&surface->cr.current_source.base);
     _cairo_path_fixed_fini (&surface->cr.current_path);
+    _cairo_font_options_fini (&surface->cr.current_font_options);
     _cairo_surface_clipper_reset (&surface->clipper);
 
     status = cairo_device_acquire (&ctx->base);
@@ -2239,8 +2266,7 @@
 		    cairo_list_del (&surface->operand.link);
 		} else {
 		    link->operand.type = DEFERRED;
-		    cairo_list_swap (&link->operand.link,
-				     &surface->operand.link);
+		    cairo_list_move_list (&surface->operand.link, &link->operand.link);
 		    cairo_list_add (&link->link, &ctx->deferred);
 		}
 	    }
@@ -3964,7 +3990,6 @@
 						   content, extents,
 						   NULL)->base;
 }
-slim_hidden_def (cairo_script_surface_create);
 
 /**
  * cairo_script_surface_create_for_target:

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-shape-mask-compositor.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-shape-mask-compositor.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-spans-compositor.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-spans-compositor.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-surface-backend-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-surface-backend-private.h Changed

@@ -1,3 +1,4 @@
+/* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */
 /* cairo - a vector graphics library with display and print output
  *
  * Copyright © 2002 University of Southern California
@@ -40,6 +41,7 @@
 
 #include "cairo-compiler-private.h"
 #include "cairo-error-private.h"
+#include "cairo-pattern-private.h"
 
 CAIRO_BEGIN_DECLS
 
@@ -124,14 +126,14 @@
     (*paint)			(void			*surface,
 				 cairo_operator_t	 op,
 				 const cairo_pattern_t	*source,
-				 const cairo_clip_t		*clip);
+				 const cairo_clip_t	*clip);
 
     cairo_warn cairo_int_status_t
     (*mask)			(void			*surface,
 				 cairo_operator_t	 op,
 				 const cairo_pattern_t	*source,
 				 const cairo_pattern_t	*mask,
-				 const cairo_clip_t		*clip);
+				 const cairo_clip_t	*clip);
 
     cairo_warn cairo_int_status_t
     (*stroke)			(void			*surface,
@@ -143,7 +145,7 @@
 				 const cairo_matrix_t	*ctm_inverse,
 				 double			 tolerance,
 				 cairo_antialias_t	 antialias,
-				 const cairo_clip_t		*clip);
+				 const cairo_clip_t	*clip);
 
     cairo_warn cairo_int_status_t
     (*fill)			(void			*surface,
@@ -153,7 +155,7 @@
 				 cairo_fill_rule_t	 fill_rule,
 				 double			 tolerance,
 				 cairo_antialias_t	 antialias,
-				 const cairo_clip_t           *clip);
+				 const cairo_clip_t     *clip);
 
     cairo_warn cairo_int_status_t
     (*fill_stroke)		(void			*surface,
@@ -196,7 +198,7 @@
 				 int			     num_clusters,
 				 cairo_text_cluster_flags_t  cluster_flags,
 				 cairo_scaled_font_t	    *scaled_font,
-				 const cairo_clip_t               *clip);
+				 const cairo_clip_t         *clip);
 
     const char **
     (*get_supported_mime_types)	(void			    *surface);
@@ -207,6 +209,33 @@
 				 const char             *tag_name,
 				 const char             *attributes);
 
+    cairo_bool_t
+    (*supports_color_glyph) (void                       *surface,
+                             cairo_scaled_font_t        *scaled_font,
+                             unsigned long               glyph_index);
+
+    /* Paginated surfaces only. During the analysis stage, if any
+     * recording surfaces used as a source are to be replayed, this
+     * function will be called at the begining and end of the replay.
+     *
+     * @recording_surface - the recording surface used as a source
+     * @source_type - a type indicating the combination of drawing
+     * operation and source type
+     * @begin - TRUE when called before the replay, FALSE when called
+     * after the replay has finished.
+     */
+    cairo_warn cairo_int_status_t
+    (*analyze_recording_surface)(void	                       *surface,
+				 const cairo_surface_pattern_t *recording_surface_pattern,
+				 unsigned int                   region_id,
+                                 cairo_analysis_source_t        source_type,
+                                 cairo_bool_t                   begin);
+
+    cairo_warn cairo_int_status_t
+    (*command_id)		(void			*surface,
+				 unsigned int            recording_id,
+				 unsigned int            command_id);
+
 };
 
 cairo_private cairo_status_t

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-surface-observer.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-surface-observer.c Changed

@@ -54,6 +54,24 @@
 #include "cairo-script-private.h"
 #endif
 
+/**
+ * SECTION:cairo-surface-observer
+ * @Title: Surface Observer
+ * @Short_Description: Observing other surfaces
+ * @See_Also: #cairo_surface_t
+ *
+ * A surface that exists solely to watch what another surface is doing.
+ **/
+
+/**
+ * CAIRO_HAS_OBSERVER_SURFACE:
+ *
+ * Defined if the observer surface backend is available.
+ * This macro can be used to conditionally compile backend-specific code.
+ *
+ * Since: 1.12
+ **/
+
 static const cairo_surface_backend_t _cairo_surface_observer_backend;
 
 /* observation/stats */
@@ -1373,8 +1391,8 @@
  * the process it will log operations and times, which are fast, which are
  * slow, which are frequent, etc.
  *
- * The @mode parameter can be set to either CAIRO_SURFACE_OBSERVER_NORMAL
- * or CAIRO_SURFACE_OBSERVER_RECORD_OPERATIONS, to control whether or not
+ * The @mode parameter can be set to either %CAIRO_SURFACE_OBSERVER_NORMAL
+ * or %CAIRO_SURFACE_OBSERVER_RECORD_OPERATIONS, to control whether or not
  * the internal observer should record operations.
  *
  * Return value: a pointer to the newly allocated surface. The caller
@@ -1429,6 +1447,18 @@
     return CAIRO_STATUS_SUCCESS;
 }
 
+/**
+ * cairo_surface_observer_add_paint_callback:
+ * @abstract_surface: a #cairo_surface_observer_t
+ * @func: callback function for paint operations
+ * @data: closure to pass to the callback
+ *
+ * Adds a callback for paint operations on the observed surface.
+ *
+ * Returns: the status of the surface
+ *
+ * Since: 1.12
+ **/
 cairo_status_t
 cairo_surface_observer_add_paint_callback (cairo_surface_t *abstract_surface,
 					    cairo_surface_observer_callback_t func,
@@ -1447,6 +1477,18 @@
 						 func, data);
 }
 
+/**
+ * cairo_surface_observer_add_mask_callback:
+ * @abstract_surface: a #cairo_surface_observer_t
+ * @func: callback function for mask operations
+ * @data: closure to pass to the callback
+ *
+ * Adds a callback for mask operations on the observed surface.
+ *
+ * Returns: the status of the surface
+ *
+ * Since: 1.12
+ **/
 cairo_status_t
 cairo_surface_observer_add_mask_callback (cairo_surface_t *abstract_surface,
 					  cairo_surface_observer_callback_t func,
@@ -1465,6 +1507,18 @@
 						 func, data);
 }
 
+/**
+ * cairo_surface_observer_add_fill_callback:
+ * @abstract_surface: a #cairo_surface_observer_t
+ * @func: callback function for fill operations
+ * @data: closure to pass to the callback
+ *
+ * Adds a callback for fill operations on the observed surface.
+ *
+ * Returns: the status of the surface
+ *
+ * Since: 1.12
+ **/
 cairo_status_t
 cairo_surface_observer_add_fill_callback (cairo_surface_t *abstract_surface,
 					  cairo_surface_observer_callback_t func,
@@ -1483,6 +1537,18 @@
 						 func, data);
 }
 
+/**
+ * cairo_surface_observer_add_stroke_callback:
+ * @abstract_surface: a #cairo_surface_observer_t
+ * @func: callback function for stroke operations
+ * @data: closure to pass to the callback
+ *
+ * Adds a callback for stroke operations on the observed surface.
+ *
+ * Returns: the status of the surface
+ *
+ * Since: 1.12
+ **/
 cairo_status_t
 cairo_surface_observer_add_stroke_callback (cairo_surface_t *abstract_surface,
 					    cairo_surface_observer_callback_t func,
@@ -1501,6 +1567,18 @@
 						 func, data);
 }
 
+/**
+ * cairo_surface_observer_add_glyphs_callback:
+ * @abstract_surface: a #cairo_surface_observer_t
+ * @func: callback function for glyph operations
+ * @data: closure to pass to the callback
+ *
+ * Adds a callback for glyph operations on the observed surface.
+ *
+ * Returns: the status of the surface
+ *
+ * Since: 1.10
+ **/
 cairo_status_t
 cairo_surface_observer_add_glyphs_callback (cairo_surface_t *abstract_surface,
 					    cairo_surface_observer_callback_t func,
@@ -1519,6 +1597,18 @@
 						 func, data);
 }
 
+/**
+ * cairo_surface_observer_add_flush_callback:
+ * @abstract_surface: a #cairo_surface_observer_t
+ * @func: callback for flush operations
+ * @data: closure to pass to the callback
+ *
+ * Adds a callback for flush operations on the observed surface.
+ *
+ * Returns: the status of the surface
+ *
+ * Since: 1.10
+ **/
 cairo_status_t
 cairo_surface_observer_add_flush_callback (cairo_surface_t *abstract_surface,
 					   cairo_surface_observer_callback_t func,
@@ -1537,6 +1627,18 @@
 						 func, data);
 }
 
+/**
+ * cairo_surface_observer_add_finish_callback:
+ * @abstract_surface: a #cairo_surface_observer_t
+ * @func: callback function for the finish operation
+ * @data: closure to pass to the callback
+ *
+ * Adds a callback for finish operations on the observed surface.
+ *
+ * Returns: the status of the surface
+ *
+ * Since: 1.10
+ **/
 cairo_status_t
 cairo_surface_observer_add_finish_callback (cairo_surface_t *abstract_surface,
 					    cairo_surface_observer_callback_t func,
@@ -1957,6 +2059,18 @@
     cairo_device_destroy (script);
 }
 
+/**
+ * cairo_surface_observer_print:
+ * @abstract_surface: a #cairo_surface_observer_t
+ * @write_func: callback for writing on a stream
+ * @closure: data to pass to @write_func
+ *
+ * Prints the observer log using the given callback.
+ *
+ * Returns: the status of the print operation
+ *
+ * Since: 1.12
+ **/
 cairo_status_t
 cairo_surface_observer_print (cairo_surface_t *abstract_surface,
 			      cairo_write_func_t write_func,
@@ -1978,6 +2092,16 @@
     return _cairo_output_stream_destroy (stream);
 }
 
+/**
+ * cairo_surface_observer_elapsed:
+ * @abstract_surface: a #cairo_surface_observer_t
+ *
+ * Returns the total observation time.
+ *
+ * Returns: the elapsed time, in nanoseconds
+ *

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-surface.c Changed

@@ -49,7 +49,6 @@
 #include "cairo-recording-surface-private.h"
 #include "cairo-region-private.h"
 #include "cairo-surface-inline.h"
-#include "cairo-tee-surface-private.h"
 
 /**
  * SECTION:cairo-surface
@@ -128,13 +127,18 @@
     NULL,				/* snapshot_detach */	\
     { NULL, NULL },			/* snapshots */		\
     { NULL, NULL },			/* snapshot */		\
-    { CAIRO_ANTIALIAS_DEFAULT,		/* antialias */		\
+    {                                   /* font options begin */\
+      CAIRO_ANTIALIAS_DEFAULT,		/* antialias */		\
       CAIRO_SUBPIXEL_ORDER_DEFAULT,	/* subpixel_order */	\
       CAIRO_LCD_FILTER_DEFAULT,		/* lcd_filter */	\
       CAIRO_HINT_STYLE_DEFAULT,		/* hint_style */	\
       CAIRO_HINT_METRICS_DEFAULT,	/* hint_metrics */	\
-      CAIRO_ROUND_GLYPH_POS_DEFAULT	/* round_glyph_positions */	\
-    },					/* font_options */		\
+      CAIRO_ROUND_GLYPH_POS_DEFAULT,	/* round_glyph_positions */	\
+      NULL,                            /* variations */ \
+      CAIRO_COLOR_MODE_DEFAULT,                /* color mode */ \
+      CAIRO_COLOR_PALETTE_DEFAULT,     /* color palette */ \
+      NULL, 0,                         /* custom palette */ \
+    },					/* font_options end */		\
     NULL,                               /* foreground_source */		\
     FALSE,                              /* foreground_used */   \
 }
@@ -261,7 +265,6 @@
 {
     return surface->status;
 }
-slim_hidden_def (cairo_surface_status);
 
 static unsigned int
 _cairo_surface_allocate_unique_id (void)
@@ -455,6 +458,7 @@
 
 	cairo_surface_get_font_options (other, &options);
 	_cairo_surface_set_font_options (surface, &options);
+	_cairo_font_options_fini (&options);
     }
 
     cairo_surface_set_fallback_resolution (surface,
@@ -606,7 +610,6 @@
 
     return image;
 }
-slim_hidden_def (cairo_surface_create_similar_image);
 
 /**
  * _cairo_surface_map_to_image:
@@ -938,7 +941,6 @@
 
     return surface;
 }
-slim_hidden_def (cairo_surface_reference);
 
 /**
  * cairo_surface_destroy:
@@ -987,6 +989,9 @@
     if (surface->owns_device)
         cairo_device_destroy (surface->device);
 
+    if (surface->has_font_options)
+	_cairo_font_options_fini (&surface->font_options);
+
     assert (surface->snapshot_of == NULL);
     assert (! _cairo_surface_has_snapshots (surface));
     /* paranoid check that nobody took a reference whilst finishing */
@@ -994,7 +999,6 @@
 
     free (surface);
 }
-slim_hidden_def(cairo_surface_destroy);
 
 /**
  * cairo_surface_get_reference_count:
@@ -1088,7 +1092,6 @@
 
     cairo_surface_destroy (surface);
 }
-slim_hidden_def (cairo_surface_finish);
 
 /**
  * _cairo_surface_release_device_reference:
@@ -1216,7 +1219,6 @@
 	}
     }
 }
-slim_hidden_def (cairo_surface_get_mime_data);
 
 static void
 _cairo_mime_data_destroy (void *ptr)
@@ -1473,7 +1475,6 @@
 
     return CAIRO_STATUS_SUCCESS;
 }
-slim_hidden_def (cairo_surface_set_mime_data);
 
 /**
  * cairo_surface_supports_mime_type:
@@ -1513,7 +1514,6 @@
 
     return FALSE;
 }
-slim_hidden_def (cairo_surface_supports_mime_type);
 
 static void
 _cairo_mime_data_reference (const void *key, void *elt, void *closure)
@@ -1625,7 +1625,6 @@
 
     _cairo_font_options_init_copy (options, &surface->font_options);
 }
-slim_hidden_def (cairo_surface_get_font_options);
 
 cairo_status_t
 _cairo_surface_flush (cairo_surface_t *surface, unsigned flags)
@@ -1667,7 +1666,6 @@
     if (unlikely (status))
 	_cairo_surface_set_error (surface, status);
 }
-slim_hidden_def (cairo_surface_flush);
 
 /**
  * cairo_surface_mark_dirty:
@@ -1696,7 +1694,6 @@
 					extents.x, extents.y,
 					extents.width, extents.height);
 }
-slim_hidden_def (cairo_surface_mark_dirty);
 
 /**
  * cairo_surface_mark_dirty_rectangle:
@@ -1770,7 +1767,6 @@
 	    _cairo_surface_set_error (surface, status);
     }
 }
-slim_hidden_def (cairo_surface_mark_dirty_rectangle);
 
 /**
  * cairo_surface_set_device_scale:
@@ -1826,7 +1822,6 @@
 
     _cairo_observers_notify (&surface->device_transform_observers, surface);
 }
-slim_hidden_def (cairo_surface_set_device_scale);
 
 /**
  * cairo_surface_get_device_scale:
@@ -1849,7 +1844,6 @@
     if (y_scale)
 	*y_scale = surface->device_transform.yy;
 }
-slim_hidden_def (cairo_surface_get_device_scale);
 
 /**
  * cairo_surface_set_device_offset:
@@ -1904,7 +1898,6 @@
 
     _cairo_observers_notify (&surface->device_transform_observers, surface);
 }
-slim_hidden_def (cairo_surface_set_device_offset);
 
 /**
  * cairo_surface_get_device_offset:
@@ -1927,7 +1920,6 @@
     if (y_offset)
 	*y_offset = surface->device_transform.y0;
 }
-slim_hidden_def (cairo_surface_get_device_offset);
 
 /**
  * cairo_surface_set_fallback_resolution:
@@ -1996,7 +1988,6 @@
     surface->x_fallback_resolution = x_pixels_per_inch;
     surface->y_fallback_resolution = y_pixels_per_inch;
 }
-slim_hidden_def (cairo_surface_set_fallback_resolution);
 
 /**
  * cairo_surface_get_fallback_resolution:
@@ -2504,7 +2495,6 @@
 
     _cairo_surface_set_error (surface, surface->backend->copy_page (surface));
 }
-slim_hidden_def (cairo_surface_copy_page);
 
 /**
  * cairo_surface_show_page:
@@ -2543,7 +2533,6 @@
 
     _cairo_surface_set_error (surface, surface->backend->show_page (surface));
 }
-slim_hidden_def (cairo_surface_show_page);
 
 /**
  * _cairo_surface_get_extents:

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-svg-glyph-render.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-svg-glyph-render.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-svg-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-svg-surface.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-svg.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-svg.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-tag-attributes-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-tag-attributes-private.h Changed

@@ -49,6 +49,15 @@
     TAG_LINK_FILE,
 } cairo_tag_link_type_t;
 
+typedef struct _cairo_content_attrs {
+    char *id;
+    char *tag_name;
+} cairo_content_attrs_t;
+
+typedef struct _cairo_content_ref_attrs {
+    char *ref;
+} cairo_content_ref_attrs_t;
+
 typedef struct _cairo_link_attrs {
     cairo_tag_link_type_t link_type;
     cairo_array_t rects;
@@ -58,6 +67,9 @@
     int page;
     cairo_bool_t has_pos;
     cairo_point_double_t pos;
+    char *id;
+    char *ref;
+    int link_page;
 } cairo_link_attrs_t;
 
 typedef struct _cairo_dest_attrs {
@@ -91,9 +103,27 @@
 _cairo_tag_parse_dest_attributes (const char *attributes, cairo_dest_attrs_t *dest_attrs);
 
 cairo_private cairo_int_status_t
+_cairo_tag_parse_content_attributes (const char *attributes, cairo_content_attrs_t *content_attrs);
+
+cairo_private cairo_int_status_t
+_cairo_tag_parse_content_ref_attributes (const char *attributes, cairo_content_ref_attrs_t *content_ref_attrs);
+
+cairo_private cairo_int_status_t
 _cairo_tag_parse_ccitt_params (const char *attributes, cairo_ccitt_params_t *dest_attrs);
 
 cairo_private cairo_int_status_t
 _cairo_tag_parse_eps_params (const char *attributes, cairo_eps_params_t *dest_attrs);
 
+cairo_private void
+_cairo_tag_free_link_attributes (cairo_link_attrs_t *link_attrs);
+
+cairo_private void
+_cairo_tag_free_dest_attributes (cairo_dest_attrs_t *link_attrs);
+
+cairo_private void
+_cairo_tag_free_content_attributes (cairo_content_attrs_t *link_attrs);
+
+cairo_private void
+_cairo_tag_free_content_ref_attributes (cairo_content_ref_attrs_t *link_attrs);
+
 #endif /* CAIRO_TAG_ATTRIBUTES_PRIVATE_H */

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-tag-attributes.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-tag-attributes.c Changed

@@ -60,6 +60,25 @@
 } attribute_spec_t;
 
 /*
+ * id      optional content id
+ * content optional One or more content ids
+ */
+static const attribute_spec_t _content_attrib_spec = {
+    { "tag_name", ATTRIBUTE_STRING },
+    { "id",       ATTRIBUTE_STRING },
+    { NULL }
+};
+
+/*
+ * id      optional content id
+ * content optional One or more content ids
+ */
+static const attribute_spec_t _content_ref_attrib_spec = {
+    { "ref",       ATTRIBUTE_STRING },
+    { NULL }
+};
+
+/*
  * name required Unique name of this destination (UTF-8)
  * x    optional x coordinate of destination on page. Default is x coord of
  *                 extents of operations enclosed by the dest begin/end tags.
@@ -68,7 +87,7 @@
  * internal optional If true, the name may be optimized out of the PDF where
  *                     possible. Default false.
  */
-static attribute_spec_t _dest_attrib_spec = {
+static const attribute_spec_t _dest_attrib_spec = {
     { "name",     ATTRIBUTE_STRING },
     { "x",        ATTRIBUTE_FLOAT },
     { "y",        ATTRIBUTE_FLOAT },
@@ -103,7 +122,7 @@
  *     page - Page number in the PDF file to link to
  *     pos  - optional Position of destination on page. Default is 0,0.
  */
-static attribute_spec_t _link_attrib_spec =
+static const attribute_spec_t _link_attrib_spec =
 {
     { "rect", ATTRIBUTE_FLOAT, -1 },
     { "dest", ATTRIBUTE_STRING },
@@ -111,6 +130,9 @@
     { "file", ATTRIBUTE_STRING },
     { "page", ATTRIBUTE_INT },
     { "pos",  ATTRIBUTE_FLOAT, 2 },
+    { "id",   ATTRIBUTE_STRING },
+    { "ref",  ATTRIBUTE_STRING },
+    { "link_page", ATTRIBUTE_INT },
     { NULL }
 };
 
@@ -131,7 +153,7 @@
  *   DamagedRowsBeforeError - Number of damages rows tolerated before an error
  *                            occurs. Default: 0.
  */
-static attribute_spec_t _ccitt_params_spec =
+static const attribute_spec_t _ccitt_params_spec =
 {
     { "Columns",                ATTRIBUTE_INT },
     { "Rows",                   ATTRIBUTE_INT },
@@ -152,7 +174,7 @@
  *          ury - upper right y xoordinate
  *        all coordinates are in PostScript coordinates.
  */
-static attribute_spec_t _eps_params_spec =
+static const attribute_spec_t _eps_params_spec =
 {
     { "bbox", ATTRIBUTE_FLOAT, 4 },
     { NULL }
@@ -362,7 +384,7 @@
 	    attributes, p);
 
     p2 = p;
-    while (_cairo_isalpha (*p2) || _cairo_isdigit (*p2))
+    while (_cairo_isalpha (*p2) || _cairo_isdigit (*p2) || *p2  == '_')
 	p2++;
 
     len = p2 - p;
@@ -376,9 +398,9 @@
 }
 
 static cairo_int_status_t
-parse_attributes (const char *attributes, attribute_spec_t *attrib_def, cairo_list_t *list)
+parse_attributes (const char *attributes, const attribute_spec_t *attrib_def, cairo_list_t *list)
 {
-    attribute_spec_t *def;
+    const attribute_spec_t *def;
     attribute_t *attrib;
     char *name = NULL;
     cairo_int_status_t status;
@@ -490,13 +512,79 @@
 }
 
 cairo_int_status_t
+_cairo_tag_parse_content_attributes (const char *attributes, cairo_content_attrs_t *content_attrs)
+{
+    cairo_list_t list;
+    cairo_int_status_t status;
+    attribute_t *attr;
+
+    cairo_list_init (&list);
+    status = parse_attributes (attributes, _content_attrib_spec, &list);
+    if (unlikely (status))
+	goto cleanup;
+
+    memset (content_attrs, 0, sizeof (cairo_content_attrs_t));
+    cairo_list_foreach_entry (attr, attribute_t, &list, link)
+    {
+	if (strcmp (attr->name, "tag_name") == 0) {
+	    content_attrs->tag_name = strdup (attr->scalar.s);
+	} else if (strcmp (attr->name, "id") == 0) {
+	    content_attrs->id = strdup (attr->scalar.s);
+	}
+    }
+
+    if (! content_attrs->tag_name) {
+	status = _cairo_tag_error ("CONTENT attributes: \"%s\" missing tag_name attribute",
+				   attributes);
+    } else if (! content_attrs->tag_name) {
+	status = _cairo_tag_error ("CONTENT attributes: \"%s\" missing id attribute",
+				   attributes);
+    }
+
+  cleanup:
+    free_attributes_list (&list);
+
+    return status;
+}
+
+cairo_int_status_t
+_cairo_tag_parse_content_ref_attributes (const char *attributes, cairo_content_ref_attrs_t *content_ref_attrs)
+{
+    cairo_list_t list;
+    cairo_int_status_t status;
+    attribute_t *attr;
+
+    cairo_list_init (&list);
+    status = parse_attributes (attributes, _content_ref_attrib_spec, &list);
+    if (unlikely (status))
+	goto cleanup;
+
+    memset (content_ref_attrs, 0, sizeof (cairo_content_ref_attrs_t));
+    cairo_list_foreach_entry (attr, attribute_t, &list, link)
+    {
+	if (strcmp (attr->name, "ref") == 0) {
+	    content_ref_attrs->ref = strdup (attr->scalar.s);
+	}
+    }
+
+    if (! content_ref_attrs->ref) {
+	status = _cairo_tag_error ("CONTENT_REF  attributes: \"%s\" missing ref attribute",
+				   attributes);
+    }
+
+  cleanup:
+    free_attributes_list (&list);
+
+    return status;
+}
+
+cairo_int_status_t
 _cairo_tag_parse_link_attributes (const char *attributes, cairo_link_attrs_t *link_attrs)
 {
     cairo_list_t list;
     cairo_int_status_t status;
     attribute_t *attr;
     attrib_val_t val;
-    cairo_bool_t has_rect = FALSE;
     cairo_bool_t invalid_combination = FALSE;
 
     cairo_list_init (&list);
@@ -554,7 +642,16 @@
 		if (unlikely (status))
 		    goto cleanup;
 	    }
-	    has_rect = TRUE;
+	} else if (strcmp (attr->name, "id") == 0) {
+	    link_attrs->id = strdup (attr->scalar.s);
+	} else if (strcmp (attr->name, "ref") == 0) {
+	    link_attrs->ref = strdup (attr->scalar.s);
+	} else if (strcmp (attr->name, "link_page") == 0) {
+	    link_attrs->link_page = attr->scalar.i;
+	    if (link_attrs->link_page < 1) {
+		status = _cairo_tag_error ("Link attributes: \"%s\" page must be >= 1", attributes);
+		goto cleanup;
+	    }
 	}
     }
 
@@ -723,3 +820,33 @@
 
     return status;
 }
+
+void
+_cairo_tag_free_link_attributes (cairo_link_attrs_t *link_attrs)
+{

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-tag-stack-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-tag-stack-private.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-tag-stack.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-tag-stack.c Changed

@@ -99,6 +99,9 @@
     "Formula",
     "Form",
 
+    /* Section 14.8.2.2.2 - Artifacts */
+    "Artifact",
+
     NULL
 };
 
@@ -106,6 +109,8 @@
 static const char * _cairo_tag_stack_cairo_tag_list =
 {
     CAIRO_TAG_DEST,
+    CAIRO_TAG_CONTENT,
+    CAIRO_TAG_CONTENT_REF,
     NULL
 };
 
@@ -166,6 +171,17 @@
 	return _cairo_tag_error ("Invalid tag: %s", name);
     }
 
+    cairo_tag_stack_elem_t *top = _cairo_tag_stack_top_elem (stack);
+    if (top &&
+	(strcmp (top->name, CAIRO_TAG_CONTENT) == 0 ||
+	 strcmp (top->name, CAIRO_TAG_CONTENT_REF) == 0 ||
+	 strcmp (top->name, "Artifact") == 0))
+    {
+	return _cairo_tag_error ("%s tag can not contain nested tags",
+				 (strcmp (top->name, CAIRO_TAG_CONTENT) == 0) ? "CAIRO_TAG_CONTENT" :
+				 ((strcmp (top->name, CAIRO_TAG_CONTENT_REF) == 0) ? "CAIRO_TAG_CONTENT_REF" : top->name));
+    }
+
     if (stack->type == TAG_TREE_TYPE_NO_TAGS) {
 	if (name_in_list (name, _cairo_tag_stack_tagged_pdf_top_level_element_list))
 	    stack->type = TAG_TREE_TYPE_TAGGED;
@@ -233,10 +249,12 @@
     cairo_list_del (&top->link);
     stack->size--;
     if (strcmp (top->name, name) != 0) {
+	cairo_status_t status =
+	    _cairo_tag_error ("cairo_tag_end(\"%s\") does not matching previous begin tag \"%s\"",
+			      name, top->name);
 	stack->type = TAG_TYPE_INVALID;
 	_cairo_tag_stack_free_elem (top);
-	return _cairo_tag_error ("cairo_tag_end(\"%s\") does not matching previous begin tag \"%s\"",
-				 name, top->name);
+	return status;
     }
 
     if (elem)
@@ -257,6 +275,19 @@
 }
 
 void
+_cairo_tag_stack_foreach (cairo_tag_stack_t *stack,
+			  void (*func)(cairo_tag_stack_elem_t *elem,
+				       void *closure),
+			  void *closure)
+{
+    cairo_tag_stack_elem_t *elem;
+
+    cairo_list_foreach_entry (elem, cairo_tag_stack_elem_t, &stack->list, link) {
+	func (elem, closure);
+    }
+}
+
+void
 _cairo_tag_stack_free_elem (cairo_tag_stack_elem_t *elem)
 {
     free (elem->name);
@@ -274,9 +305,15 @@
     if (strcmp(name, "Link") == 0)
 	return (TAG_TYPE_LINK | TAG_TYPE_STRUCTURE);
 
-    if (strcmp(name, "cairo.dest") == 0)
+    if (strcmp(name, CAIRO_TAG_DEST) == 0)
 	return TAG_TYPE_DEST;
 
+    if (strcmp(name, CAIRO_TAG_CONTENT) == 0)
+	return TAG_TYPE_CONTENT;
+
+    if (strcmp(name, CAIRO_TAG_CONTENT_REF) == 0)
+	return TAG_TYPE_CONTENT_REF;
+
     return TAG_TYPE_STRUCTURE;
 }

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-tee-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-tee-surface.c Changed

@@ -35,8 +35,22 @@
  *	Chris Wilson <chris@chris-wilson.co.uk>
  */
 
-/* This surface supports redirecting all its input to multiple surfaces.
- */
+/**
+ * SECTION:cairo-tee
+ * @Title: Tee surface
+ * @Short_Description: Redirect input to multiple surfaces
+ * @See_Also: #cairo_surface_t
+ *
+ * The "tee" surface supports redirecting all its input to multiple surfaces.
+ **/
+
+/**
+ * CAIRO_HAS_TEE_SURFACE:
+ *
+ * Defined if the tee surface backend is available.
+ *
+ * Since: 1.10
+ **/
 
 #include "cairoint.h"
 
@@ -44,7 +58,6 @@
 
 #include "cairo-default-context-private.h"
 #include "cairo-error-private.h"
-#include "cairo-tee-surface-private.h"
 #include "cairo-recording-surface-inline.h"
 #include "cairo-surface-wrapper-private.h"
 #include "cairo-array-private.h"
@@ -53,13 +66,10 @@
 typedef struct _cairo_tee_surface {
     cairo_surface_t base;
 
-    cairo_surface_wrapper_t master;
-    cairo_array_t slaves;
+    cairo_surface_wrapper_t primary;
+    cairo_array_t replicas;
 } cairo_tee_surface_t;
 
-slim_hidden_proto (cairo_tee_surface_create);
-slim_hidden_proto (cairo_tee_surface_add);
-
 static cairo_surface_t *
 _cairo_tee_surface_create_similar (void			*abstract_surface,
 				   cairo_content_t	 content,
@@ -70,21 +80,21 @@
     cairo_tee_surface_t *other = abstract_surface;
     cairo_surface_t *similar;
     cairo_surface_t *surface;
-    cairo_surface_wrapper_t *slaves;
-    int n, num_slaves;
+    cairo_surface_wrapper_t *replicas;
+    int n, num_replicas;
 
-    similar = _cairo_surface_wrapper_create_similar (&other->master,
+    similar = _cairo_surface_wrapper_create_similar (&other->primary,
 						     content, width, height);
     surface = cairo_tee_surface_create (similar);
     cairo_surface_destroy (similar);
     if (unlikely (surface->status))
 	return surface;
 
-    num_slaves = _cairo_array_num_elements (&other->slaves);
-    slaves = _cairo_array_index (&other->slaves, 0);
-    for (n = 0; n < num_slaves; n++) {
+    num_replicas = _cairo_array_num_elements (&other->replicas);
+    replicas = _cairo_array_index (&other->replicas, 0);
+    for (n = 0; n < num_replicas; n++) {
 
-	similar = _cairo_surface_wrapper_create_similar (&slavesn,
+	similar = _cairo_surface_wrapper_create_similar (&replicasn,
 							 content,
 							 width, height);
 	cairo_tee_surface_add (surface, similar);
@@ -104,17 +114,17 @@
 _cairo_tee_surface_finish (void *abstract_surface)
 {
     cairo_tee_surface_t *surface = abstract_surface;
-    cairo_surface_wrapper_t *slaves;
-    int n, num_slaves;
+    cairo_surface_wrapper_t *replicas;
+    int n, num_replicas;
 
-    _cairo_surface_wrapper_fini (&surface->master);
+    _cairo_surface_wrapper_fini (&surface->primary);
 
-    num_slaves = _cairo_array_num_elements (&surface->slaves);
-    slaves = _cairo_array_index (&surface->slaves, 0);
-    for (n = 0; n < num_slaves; n++)
-	_cairo_surface_wrapper_fini (&slavesn);
+    num_replicas = _cairo_array_num_elements (&surface->replicas);
+    replicas = _cairo_array_index (&surface->replicas, 0);
+    for (n = 0; n < num_replicas; n++)
+	_cairo_surface_wrapper_fini (&replicasn);
 
-    _cairo_array_fini (&surface->slaves);
+    _cairo_array_fini (&surface->replicas);
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -124,7 +134,7 @@
 			   cairo_rectangle_int_t *extents)
 {
     cairo_tee_surface_t *surface = abstract_surface;
-    return _cairo_surface_get_source (surface->master.target, extents);
+    return _cairo_surface_get_source (surface->primary.target, extents);
 }
 
 static cairo_status_t
@@ -133,26 +143,26 @@
 					 void		 **image_extra)
 {
     cairo_tee_surface_t *surface = abstract_surface;
-    cairo_surface_wrapper_t *slaves;
-    int num_slaves, n;
+    cairo_surface_wrapper_t *replicas;
+    int num_replicas, n;
 
     /* we prefer to use a real image surface if available */
-    if (_cairo_surface_is_image (surface->master.target)) {
-	return _cairo_surface_wrapper_acquire_source_image (&surface->master,
+    if (_cairo_surface_is_image (surface->primary.target)) {
+	return _cairo_surface_wrapper_acquire_source_image (&surface->primary,
 							    image_out, image_extra);
     }
 
-    num_slaves = _cairo_array_num_elements (&surface->slaves);
-    slaves = _cairo_array_index (&surface->slaves, 0);
-    for (n = 0; n < num_slaves; n++) {
-	if (_cairo_surface_is_image (slavesn.target)) {
-	    return _cairo_surface_wrapper_acquire_source_image (&slavesn,
+    num_replicas = _cairo_array_num_elements (&surface->replicas);
+    replicas = _cairo_array_index (&surface->replicas, 0);
+    for (n = 0; n < num_replicas; n++) {
+	if (_cairo_surface_is_image (replicasn.target)) {
+	    return _cairo_surface_wrapper_acquire_source_image (&replicasn,
 								image_out,
 								image_extra);
 	}
     }
 
-    return _cairo_surface_wrapper_acquire_source_image (&surface->master,
+    return _cairo_surface_wrapper_acquire_source_image (&surface->primary,
 							image_out, image_extra);
 }
 
@@ -163,7 +173,7 @@
 {
     cairo_tee_surface_t *surface = abstract_surface;
 
-    _cairo_surface_wrapper_release_source_image (&surface->master,
+    _cairo_surface_wrapper_release_source_image (&surface->primary,
 						 image, image_extra);
 }
 
@@ -171,21 +181,21 @@
 _cairo_tee_surface_snapshot (void *abstract_surface)
 {
     cairo_tee_surface_t *surface = abstract_surface;
-    cairo_surface_wrapper_t *slaves;
-    int num_slaves, n;
+    cairo_surface_wrapper_t *replicas;
+    int num_replicas, n;
 
     /* we prefer to use a recording surface for our snapshots */
-    if (_cairo_surface_is_recording (surface->master.target))
-	return _cairo_surface_wrapper_snapshot (&surface->master);
-
-    num_slaves = _cairo_array_num_elements (&surface->slaves);
-    slaves = _cairo_array_index (&surface->slaves, 0);
-    for (n = 0; n < num_slaves; n++) {
-	if (_cairo_surface_is_recording (slavesn.target))
-	    return _cairo_surface_wrapper_snapshot (&slavesn);
+    if (_cairo_surface_is_recording (surface->primary.target))
+	return _cairo_surface_wrapper_snapshot (&surface->primary);
+
+    num_replicas = _cairo_array_num_elements (&surface->replicas);
+    replicas = _cairo_array_index (&surface->replicas, 0);
+    for (n = 0; n < num_replicas; n++) {
+	if (_cairo_surface_is_recording (replicasn.target))
+	    return _cairo_surface_wrapper_snapshot (&replicasn);
     }
 
-    return _cairo_surface_wrapper_snapshot (&surface->master);
+    return _cairo_surface_wrapper_snapshot (&surface->primary);
 }
 
 static cairo_bool_t
@@ -194,7 +204,7 @@
 {
     cairo_tee_surface_t *surface = abstract_surface;
 
-    return _cairo_surface_wrapper_get_extents (&surface->master, rectangle);
+    return _cairo_surface_wrapper_get_extents (&surface->primary, rectangle);
 }

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-tee.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-tee.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-tor22-scan-converter.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-tor22-scan-converter.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-toy-font-face.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-toy-font-face.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-traps-compositor.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-traps-compositor.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-truetype-subset.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-truetype-subset.c Changed

@@ -1317,8 +1317,10 @@
 
     /* A Format 4 cmap contains 8 uint16_t numbers and 4 arrays of
      * uint16_t each num_segments long. */
-    if (size < (8 + 4*num_segments)*sizeof(uint16_t))
-	return CAIRO_INT_STATUS_UNSUPPORTED;
+    if (size < (8 + 4*num_segments)*sizeof(uint16_t)) {
+        status = CAIRO_INT_STATUS_UNSUPPORTED;
+        goto fail;
+    }
 
     end_code = map->endCount;
     start_code = &(end_codenum_segments + 1);
@@ -1355,8 +1357,10 @@
 	    int j;
 
 	    if (range_size > 0) {
-		if ((char*)glyph_ids + 2*range_size > (char*)map + size)
-		    return CAIRO_INT_STATUS_UNSUPPORTED;
+		if ((char*)glyph_ids + 2*range_size > (char*)map + size) {
+                    status = CAIRO_INT_STATUS_UNSUPPORTED;
+                    goto fail;
+                }
 
 		for (j = 0; j < range_size; j++) {
 		    if (glyph_idsj == g_id_be) {
@@ -1471,10 +1475,14 @@
 	    if (offset + len > size)
 		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-	    str = _cairo_strndup (((char*)name) + offset, len);
+	    str = _cairo_malloc (len + 1);
 	    if (str == NULL)
 		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
+	    memcpy (str,
+		    ((char*)name) + offset,
+		    len);
+	    strlen = 0;
 	    break;
 	}
     }

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-type1-subset.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-type1-subset.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-type3-glyph-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-type3-glyph-surface.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-types-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-types-private.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-user-font.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-user-font.c Changed

@@ -183,7 +183,9 @@
     } else {
 	status = CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED;
 
-	if (face->scaled_font_methods.render_color_glyph) {
+	if (face->scaled_font_methods.render_color_glyph &&
+	    scaled_font->base.options.color_mode != CAIRO_COLOR_MODE_NO_COLOR)
+	{
 	    recording_surface = _cairo_user_scaled_font_create_recording_surface (scaled_font, TRUE, foreground_color);
 
 	    cr = _cairo_user_scaled_font_create_recording_context (scaled_font, recording_surface, TRUE);
@@ -732,7 +734,6 @@
 
     return &font_face->base;
 }
-slim_hidden_def(cairo_user_font_face_create);
 
 /* User-font method setters */
 
@@ -773,7 +774,6 @@
     }
     user_font_face->scaled_font_methods.init = init_func;
 }
-slim_hidden_def(cairo_user_font_face_set_init_func);
 
 /**
  * cairo_user_font_face_set_render_color_glyph_func:
@@ -824,7 +824,6 @@
     user_font_face->scaled_font_methods.render_color_glyph = render_glyph_func;
     user_font_face->has_color = render_glyph_func ? TRUE : FALSE;
 }
-slim_hidden_def(cairo_user_font_face_set_render_color_glyph_func);
 
 /**
  * cairo_user_font_face_set_render_glyph_func:
@@ -874,7 +873,6 @@
     }
     user_font_face->scaled_font_methods.render_glyph = render_glyph_func;
 }
-slim_hidden_def(cairo_user_font_face_set_render_glyph_func);
 
 /**
  * cairo_user_font_face_set_text_to_glyphs_func:
@@ -948,7 +946,6 @@
     }
     user_font_face->scaled_font_methods.unicode_to_glyph = unicode_to_glyph_func;
 }
-slim_hidden_def(cairo_user_font_face_set_unicode_to_glyph_func);
 
 /* User-font method getters */

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-version.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-version.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-version.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-version.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-xcb-connection.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-xcb-connection.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-xcb-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-xcb-private.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-xcb-shm.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-xcb-shm.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-xcb-surface-render.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-xcb-surface-render.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-xcb-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-xcb-surface.c Changed

@@ -50,12 +50,6 @@
 #include "cairo-surface-backend-private.h"
 #include "cairo-compositor-private.h"
 
-#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
-slim_hidden_proto (cairo_xcb_surface_create);
-slim_hidden_proto (cairo_xcb_surface_create_for_bitmap);
-slim_hidden_proto (cairo_xcb_surface_create_with_xrender_format);
-#endif
-
 /**
  * SECTION:cairo-xcb
  * @Title: XCB Surfaces
@@ -1236,9 +1230,6 @@
 					       xrender_format,
 					       width, height);
 }
-#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
-slim_hidden_def (cairo_xcb_surface_create);
-#endif
 
 /**
  * cairo_xcb_surface_create_for_bitmap:
@@ -1287,9 +1278,6 @@
 					       cairo_xcb_screen->connection->standard_formatsCAIRO_FORMAT_A1,
 					       width, height);
 }
-#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
-slim_hidden_def (cairo_xcb_surface_create_for_bitmap);
-#endif
 
 /**
  * cairo_xcb_surface_create_with_xrender_format:
@@ -1379,9 +1367,6 @@
 					       format->id,
 					       width, height);
 }
-#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
-slim_hidden_def (cairo_xcb_surface_create_with_xrender_format);
-#endif
 
 /* This does the necessary fixup when a surface's drawable or size changed. */
 static void
@@ -1451,9 +1436,6 @@
     surface->width  = width;
     surface->height = height;
 }
-#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
-slim_hidden_def (cairo_xcb_surface_set_size);
-#endif
 
 /**
  * cairo_xcb_surface_set_drawable:
@@ -1526,6 +1508,3 @@
     surface->width  = width;
     surface->height = height;
 }
-#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
-slim_hidden_def (cairo_xcb_surface_set_drawable);
-#endif

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-xlib-source.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-xlib-source.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo-xlib-surface.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo-xlib-surface.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo.c Changed

@@ -458,7 +458,6 @@
     return target->backend->create_context (target);
 
 }
-slim_hidden_def (cairo_create);
 
 void
 _cairo_init (cairo_t *cr,
@@ -528,7 +527,6 @@
 
     cr->backend->destroy (cr);
 }
-slim_hidden_def (cairo_destroy);
 
 /**
  * cairo_get_user_data:
@@ -632,7 +630,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def(cairo_save);
 
 /**
  * cairo_restore:
@@ -656,7 +653,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def(cairo_restore);
 
 /**
  * cairo_push_group:
@@ -707,7 +703,6 @@
 {
     cairo_push_group_with_content (cr, CAIRO_CONTENT_COLOR_ALPHA);
 }
-slim_hidden_def (cairo_push_group);
 
 /**
  * cairo_push_group_with_content:
@@ -740,7 +735,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def(cairo_push_group_with_content);
 
 /**
  * cairo_pop_group:
@@ -777,7 +771,6 @@
 
     return group_pattern;
 }
-slim_hidden_def(cairo_pop_group);
 
 /**
  * cairo_pop_group_to_source:
@@ -815,7 +808,6 @@
     cairo_set_source (cr, group_pattern);
     cairo_pattern_destroy (group_pattern);
 }
-slim_hidden_def (cairo_pop_group_to_source);
 
 /**
  * cairo_set_operator:
@@ -842,7 +834,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def (cairo_set_operator);
 
 
 #if 0
@@ -903,7 +894,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def (cairo_set_source_rgb);
 
 /**
  * cairo_set_source_rgba:
@@ -942,7 +932,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def (cairo_set_source_rgba);
 
 /**
  * cairo_set_source_surface:
@@ -989,7 +978,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def (cairo_set_source_surface);
 
 /**
  * cairo_set_source:
@@ -1034,7 +1022,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def (cairo_set_source);
 
 /**
  * cairo_get_source:
@@ -1056,7 +1043,6 @@
 
     return cr->backend->get_source (cr);
 }
-slim_hidden_def (cairo_get_source);
 
 /**
  * cairo_set_tolerance:
@@ -1088,7 +1074,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def (cairo_set_tolerance);
 
 /**
  * cairo_set_antialias:
@@ -1166,9 +1151,8 @@
  * cairo_set_line_width() and ignore this note.
  *
  * As with the other stroke parameters, the current line width is
- * examined by cairo_stroke(), cairo_stroke_extents(), and
- * cairo_stroke_to_path(), but does not have any effect during path
- * construction.
+ * examined by cairo_stroke(), and cairo_stroke_extents(), but does not have
+ * any effect during path construction.
  *
  * The default line width value is 2.0.
  *
@@ -1189,7 +1173,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def (cairo_set_line_width);
 
 /**
  * cairo_set_hairline:
@@ -1230,7 +1213,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def (cairo_set_hairline);
 
 /**
  * cairo_set_line_cap:
@@ -1242,9 +1224,8 @@
  * styles are drawn.
  *
  * As with the other stroke parameters, the current line cap style is
- * examined by cairo_stroke(), cairo_stroke_extents(), and
- * cairo_stroke_to_path(), but does not have any effect during path
- * construction.
+ * examined by cairo_stroke(), and cairo_stroke_extents(), but does not have
+ * any effect during path construction.
  *
  * The default line cap style is %CAIRO_LINE_CAP_BUTT.
  *
@@ -1262,7 +1243,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def (cairo_set_line_cap);
 
 /**
  * cairo_set_line_join:
@@ -1274,9 +1254,8 @@
  * styles are drawn.
  *
  * As with the other stroke parameters, the current line join style is
- * examined by cairo_stroke(), cairo_stroke_extents(), and
- * cairo_stroke_to_path(), but does not have any effect during path
- * construction.
+ * examined by cairo_stroke(), and cairo_stroke_extents(), but does not have
+ * any effect during path construction.
  *
  * The default line join style is %CAIRO_LINE_JOIN_MITER.
  *
@@ -1294,7 +1273,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def (cairo_set_line_join);
 
 /**
  * cairo_set_dash:
@@ -1345,7 +1323,6 @@
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
-slim_hidden_def (cairo_set_dash);
 
 /**
  * cairo_get_dash_count:
@@ -1411,9 +1388,8 @@
  * converted to a bevel.
  *
  * As with the other stroke parameters, the current line miter limit is

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairo.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairo.h Changed

@@ -50,14 +50,25 @@
 # define CAIRO_END_DECLS
 #endif
 
-#ifndef cairo_public
-# if defined (_MSC_VER) && ! defined (CAIRO_WIN32_STATIC_BUILD)
-#  define cairo_public __declspec(dllimport)
-# else
-#  define cairo_public
-# endif
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(CAIRO_WIN32_STATIC_BUILD)
+# define _cairo_export __declspec(dllexport)
+# define _cairo_import __declspec(dllimport)
+#elif defined(__GNUC__) && (__GNUC__ >= 4)
+# define _cairo_export __attribute__((__visibility__("default")))
+# define _cairo_import
+#else
+# define _cairo_export
+# define _cairo_import
 #endif
 
+#ifdef CAIRO_COMPILATION
+# define _cairo_api _cairo_export
+#else
+# define _cairo_api _cairo_import
+#endif
+
+#define cairo_public _cairo_api extern
+
 CAIRO_BEGIN_DECLS
 
 #define CAIRO_VERSION_ENCODE(major, minor, micro) (	\
@@ -295,6 +306,7 @@
  * @CAIRO_STATUS_WIN32_GDI_ERROR: error occurred in the Windows Graphics Device Interface (Since 1.16)
  * @CAIRO_STATUS_TAG_ERROR: invalid tag name, attributes, or nesting (Since 1.16)
  * @CAIRO_STATUS_DWRITE_ERROR: error occurred in the Windows Direct Write API (Since 1.18)
+ * @CAIRO_STATUS_SVG_FONT_ERROR: error occurred in OpenType-SVG font rendering (Since 1.18)
  * @CAIRO_STATUS_LAST_STATUS: this is a special value indicating the number of
  *   status values defined in this enumeration.  When using this value, note
  *   that the version of cairo at run-time may have additional status values
@@ -428,6 +440,38 @@
     CAIRO_FORMAT_RGBA128F  = 7
 } cairo_format_t;
 
+/**
+ * cairo_dither_t:
+ * @CAIRO_DITHER_NONE: No dithering.
+ * @CAIRO_DITHER_DEFAULT: Default choice at cairo compile time. Currently NONE.
+ * @CAIRO_DITHER_FAST: Fastest dithering algorithm supported by the backend
+ * @CAIRO_DITHER_GOOD: An algorithm with smoother dithering than FAST
+ * @CAIRO_DITHER_BEST: Best algorithm available in the backend
+ *
+ * Dither is an intentionally applied form of noise used to randomize
+ * quantization error, preventing large-scale patterns such as color banding
+ * in images (e.g. for gradients). Ordered dithering applies a precomputed
+ * threshold matrix to spread the errors smoothly.
+ *
+ *  #cairo_dither_t is modeled on pixman dithering algorithm choice.
+ * As of Pixman 0.40, FAST corresponds to a 8x8 ordered bayer noise and GOOD
+ * and BEST use an ordered 64x64 precomputed blue noise.
+ *
+ * Since: 1.18
+ **/
+typedef enum _cairo_dither {
+    CAIRO_DITHER_NONE,
+    CAIRO_DITHER_DEFAULT,
+    CAIRO_DITHER_FAST,
+    CAIRO_DITHER_GOOD,
+    CAIRO_DITHER_BEST
+} cairo_dither_t;
+
+cairo_public void
+cairo_pattern_set_dither (cairo_pattern_t *pattern, cairo_dither_t dither);
+
+cairo_public cairo_dither_t
+cairo_pattern_get_dither (cairo_pattern_t *pattern);
 
 /**
  * cairo_write_func_t:
@@ -1038,6 +1082,8 @@
 
 #define CAIRO_TAG_DEST "cairo.dest"
 #define CAIRO_TAG_LINK "Link"
+#define CAIRO_TAG_CONTENT "cairo.content"
+#define CAIRO_TAG_CONTENT_REF "cairo.content_ref"
 
 cairo_public void
 cairo_tag_begin (cairo_t *cr, const char *tag_name, const char *attributes);
@@ -2354,6 +2400,16 @@
 cairo_surface_create_observer (cairo_surface_t *target,
 			       cairo_surface_observer_mode_t mode);
 
+/**
+ * cairo_surface_observer_callback_t:
+ * @observer: the #cairo_surface_observer_t
+ * @target: the observed surface
+ * @data: closure used when adding the callback
+ *
+ * A generic callback function for surface operations.
+ *
+ * Since: 1.12
+ **/
 typedef void (*cairo_surface_observer_callback_t) (cairo_surface_t *observer,
 						   cairo_surface_t *target,
 						   void *data);
@@ -2394,34 +2450,34 @@
 					    void *data);
 
 cairo_public cairo_status_t
-cairo_surface_observer_print (cairo_surface_t *surface,
+cairo_surface_observer_print (cairo_surface_t *abstract_surface,
 			      cairo_write_func_t write_func,
 			      void *closure);
 cairo_public double
-cairo_surface_observer_elapsed (cairo_surface_t *surface);
+cairo_surface_observer_elapsed (cairo_surface_t *abstract_surface);
 
 cairo_public cairo_status_t
-cairo_device_observer_print (cairo_device_t *device,
+cairo_device_observer_print (cairo_device_t *abstract_device,
 			     cairo_write_func_t write_func,
 			     void *closure);
 
 cairo_public double
-cairo_device_observer_elapsed (cairo_device_t *device);
+cairo_device_observer_elapsed (cairo_device_t *abstract_device);
 
 cairo_public double
-cairo_device_observer_paint_elapsed (cairo_device_t *device);
+cairo_device_observer_paint_elapsed (cairo_device_t *abstract_device);
 
 cairo_public double
-cairo_device_observer_mask_elapsed (cairo_device_t *device);
+cairo_device_observer_mask_elapsed (cairo_device_t *abstract_device);
 
 cairo_public double
-cairo_device_observer_fill_elapsed (cairo_device_t *device);
+cairo_device_observer_fill_elapsed (cairo_device_t *abstract_device);
 
 cairo_public double
-cairo_device_observer_stroke_elapsed (cairo_device_t *device);
+cairo_device_observer_stroke_elapsed (cairo_device_t *abstract_device);
 
 cairo_public double
-cairo_device_observer_glyphs_elapsed (cairo_device_t *device);
+cairo_device_observer_glyphs_elapsed (cairo_device_t *abstract_device);
 
 cairo_public cairo_surface_t *
 cairo_surface_reference (cairo_surface_t *surface);
@@ -2448,26 +2504,37 @@
  * @CAIRO_SURFACE_TYPE_PS: The surface is of type ps, since 1.2
  * @CAIRO_SURFACE_TYPE_XLIB: The surface is of type xlib, since 1.2
  * @CAIRO_SURFACE_TYPE_XCB: The surface is of type xcb, since 1.2
- * @CAIRO_SURFACE_TYPE_GLITZ: The surface is of type glitz, since 1.2
+ * @CAIRO_SURFACE_TYPE_GLITZ: The surface is of type glitz, since 1.2, deprecated 1.18
+ *   (glitz support have been removed, this surface type will never be set by cairo)
  * @CAIRO_SURFACE_TYPE_QUARTZ: The surface is of type quartz, since 1.2
  * @CAIRO_SURFACE_TYPE_WIN32: The surface is of type win32, since 1.2
- * @CAIRO_SURFACE_TYPE_BEOS: The surface is of type beos, since 1.2
- * @CAIRO_SURFACE_TYPE_DIRECTFB: The surface is of type directfb, since 1.2
+ * @CAIRO_SURFACE_TYPE_BEOS: The surface is of type beos, since 1.2, deprecated 1.18
+ *   (beos support have been removed, this surface type will never be set by cairo)
+ * @CAIRO_SURFACE_TYPE_DIRECTFB: The surface is of type directfb, since 1.2, deprecated 1.18
+ *   (directfb support have been removed, this surface type will never be set by cairo)
  * @CAIRO_SURFACE_TYPE_SVG: The surface is of type svg, since 1.2
- * @CAIRO_SURFACE_TYPE_OS2: The surface is of type os2, since 1.4
+ * @CAIRO_SURFACE_TYPE_OS2: The surface is of type os2, since 1.4, deprecated 1.18
+ *   (os2 support have been removed, this surface type will never be set by cairo)
  * @CAIRO_SURFACE_TYPE_WIN32_PRINTING: The surface is a win32 printing surface, since 1.6
  * @CAIRO_SURFACE_TYPE_QUARTZ_IMAGE: The surface is of type quartz_image, since 1.6
  * @CAIRO_SURFACE_TYPE_SCRIPT: The surface is of type script, since 1.10
- * @CAIRO_SURFACE_TYPE_QT: The surface is of type Qt, since 1.10
+ * @CAIRO_SURFACE_TYPE_QT: The surface is of type Qt, since 1.10, deprecated 1.18
+ *   (Ot support have been removed, this surface type will never be set by cairo)
  * @CAIRO_SURFACE_TYPE_RECORDING: The surface is of type recording, since 1.10
- * @CAIRO_SURFACE_TYPE_VG: The surface is a OpenVG surface, since 1.10
- * @CAIRO_SURFACE_TYPE_GL: The surface is of type OpenGL, since 1.10
- * @CAIRO_SURFACE_TYPE_DRM: The surface is of type Direct Render Manager, since 1.10
+ * @CAIRO_SURFACE_TYPE_VG: The surface is a OpenVG surface, since 1.10, deprecated 1.18
+ *   (OpenVG support have been removed, this surface type will never be set by cairo)
+ * @CAIRO_SURFACE_TYPE_GL: The surface is of type OpenGL, since 1.10, deprecated 1.18
+ *   (OpenGL support have been removed, this surface type will never be set by cairo)
+ * @CAIRO_SURFACE_TYPE_DRM: The surface is of type Direct Render Manager, since 1.10, deprecated 1.18
+ *   (DRM support have been removed, this surface type will never be set by cairo)
  * @CAIRO_SURFACE_TYPE_TEE: The surface is of type 'tee' (a multiplexing surface), since 1.10
  * @CAIRO_SURFACE_TYPE_XML: The surface is of type XML (for debugging), since 1.10
+ * @CAIRO_SURFACE_TYPE_SKIA: The surface is of type Skia, since 1.10, deprecated 1.18
+ *   (Skia support have been removed, this surface type will never be set by cairo)
  * @CAIRO_SURFACE_TYPE_SUBSURFACE: The surface is a subsurface created with
  *   cairo_surface_create_for_rectangle(), since 1.10
- * @CAIRO_SURFACE_TYPE_COGL: This surface is of type Cogl, since 1.12
+ * @CAIRO_SURFACE_TYPE_COGL: This surface is of type Cogl, since 1.12, deprecated 1.18
+ *   (Cogl support have been removed, this surface type will never be set by cairo)
  *
  * #cairo_surface_type_t is used to describe the type of a given
  * surface. The surface types are also known as "backends" or "surface

_service:tar_scm:cairo-1.17.8.tar.xz/src/cairoint.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/cairoint.h Changed

@@ -1,3 +1,4 @@
+/* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */
 /* cairo - a vector graphics library with display and print output
  *
  * Copyright © 2002 University of Southern California
@@ -48,10 +49,6 @@
 
 #include "config.h"
 
-#ifdef _MSC_VER
-#define cairo_public __declspec(dllexport)
-#endif
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -73,8 +70,7 @@
 
 #if CAIRO_HAS_PDF_SURFACE    || \
     CAIRO_HAS_PS_SURFACE     || \
-    CAIRO_HAS_SCRIPT_SURFACE || \
-    CAIRO_HAS_XML_SURFACE
+    CAIRO_HAS_SCRIPT_SURFACE
 #define CAIRO_HAS_DEFLATE_STREAM 1
 #endif
 
@@ -406,6 +402,10 @@
 		   const void *bytes,
 		   unsigned int length);
 
+cairo_private uintptr_t
+_cairo_hash_uintptr (uintptr_t hash,
+                     uintptr_t u);
+
 /* We use bits 24-27 to store phases for subpixel positions */
 #define _cairo_scaled_glyph_index(g) ((unsigned long)((g)->hash_entry.hash & 0xffffff))
 #define _cairo_scaled_glyph_xphase(g) (int)(((g)->hash_entry.hash >> 24) & 3)
@@ -893,6 +893,10 @@
 _cairo_font_options_init_copy (cairo_font_options_t		*options,
 			       const cairo_font_options_t	*other);
 
+cairo_private cairo_bool_t
+_cairo_font_options_compare (const cairo_font_options_t	*a,
+                             const cairo_font_options_t	*b);
+
 cairo_private void
 _cairo_font_options_fini (cairo_font_options_t *options);
 
@@ -1483,6 +1487,11 @@
 		    const char                  *tag_name,
 		    const char                  *attributes);
 
+cairo_private cairo_bool_t
+_cairo_surface_supports_color_glyph (cairo_surface_t       *surface,
+				     cairo_scaled_font_t   *scaled_font,
+				     unsigned long          glyph_index);
+
 cairo_private cairo_status_t
 _cairo_surface_acquire_source_image (cairo_surface_t         *surface,
 				     cairo_image_surface_t  **image_out,
@@ -1597,6 +1606,7 @@
 _pixman_format_to_masks (pixman_format_code_t	 pixman_format,
 			 cairo_format_masks_t	*masks);
 
+
 cairo_private void
 _cairo_image_scaled_glyph_fini (cairo_scaled_font_t *scaled_font,
 				cairo_scaled_glyph_t *scaled_glyph);
@@ -1952,209 +1962,6 @@
 cairo_private cairo_status_t
 _cairo_fopen (const char *filename, const char *mode, FILE **file_out);
 
-/* Avoid unnecessary PLT entries.  */
-slim_hidden_proto (cairo_append_path);
-slim_hidden_proto (cairo_arc);
-slim_hidden_proto (cairo_arc_negative);
-slim_hidden_proto (cairo_clip);
-slim_hidden_proto (cairo_clip_extents);
-slim_hidden_proto (cairo_clip_preserve);
-slim_hidden_proto (cairo_close_path);
-slim_hidden_proto (cairo_copy_path);
-slim_hidden_proto (cairo_create);
-slim_hidden_proto (cairo_curve_to);
-slim_hidden_proto (cairo_destroy);
-slim_hidden_proto (cairo_device_to_user);
-slim_hidden_proto (cairo_fill);
-slim_hidden_proto (cairo_fill_preserve);
-slim_hidden_proto (cairo_font_face_destroy);
-slim_hidden_proto (cairo_font_face_get_user_data);
-slim_hidden_proto_no_warn (cairo_font_face_reference);
-slim_hidden_proto (cairo_font_face_set_user_data);
-slim_hidden_proto (cairo_font_options_equal);
-slim_hidden_proto (cairo_font_options_get_custom_palette_color);
-slim_hidden_proto (cairo_font_options_hash);
-slim_hidden_proto (cairo_font_options_merge);
-slim_hidden_proto (cairo_font_options_set_antialias);
-slim_hidden_proto (cairo_font_options_set_hint_metrics);
-slim_hidden_proto (cairo_font_options_set_hint_style);
-slim_hidden_proto (cairo_font_options_set_subpixel_order);
-slim_hidden_proto (cairo_font_options_status);
-slim_hidden_proto (cairo_format_stride_for_width);
-slim_hidden_proto (cairo_get_current_point);
-slim_hidden_proto (cairo_get_hairline);
-slim_hidden_proto (cairo_get_line_width);
-slim_hidden_proto (cairo_get_matrix);
-slim_hidden_proto (cairo_get_scaled_font);
-slim_hidden_proto (cairo_get_source);
-slim_hidden_proto (cairo_get_target);
-slim_hidden_proto (cairo_get_tolerance);
-slim_hidden_proto (cairo_glyph_allocate);
-slim_hidden_proto (cairo_glyph_free);
-slim_hidden_proto (cairo_has_current_point);
-slim_hidden_proto (cairo_identity_matrix);
-slim_hidden_proto (cairo_image_surface_create);
-slim_hidden_proto (cairo_image_surface_create_for_data);
-slim_hidden_proto (cairo_image_surface_get_data);
-slim_hidden_proto (cairo_image_surface_get_format);
-slim_hidden_proto (cairo_image_surface_get_height);
-slim_hidden_proto (cairo_image_surface_get_stride);
-slim_hidden_proto (cairo_image_surface_get_width);
-slim_hidden_proto (cairo_line_to);
-slim_hidden_proto (cairo_mask);
-slim_hidden_proto (cairo_matrix_init);
-slim_hidden_proto (cairo_matrix_init_identity);
-slim_hidden_proto (cairo_matrix_init_rotate);
-slim_hidden_proto (cairo_matrix_init_scale);
-slim_hidden_proto (cairo_matrix_init_translate);
-slim_hidden_proto (cairo_matrix_invert);
-slim_hidden_proto (cairo_matrix_multiply);
-slim_hidden_proto (cairo_matrix_rotate);
-slim_hidden_proto (cairo_matrix_scale);
-slim_hidden_proto (cairo_matrix_transform_distance);
-slim_hidden_proto (cairo_matrix_transform_point);
-slim_hidden_proto (cairo_matrix_translate);
-slim_hidden_proto (cairo_mesh_pattern_begin_patch);
-slim_hidden_proto (cairo_mesh_pattern_curve_to);
-slim_hidden_proto (cairo_mesh_pattern_end_patch);
-slim_hidden_proto (cairo_mesh_pattern_get_control_point);
-slim_hidden_proto (cairo_mesh_pattern_get_corner_color_rgba);
-slim_hidden_proto (cairo_mesh_pattern_get_patch_count);
-slim_hidden_proto (cairo_mesh_pattern_get_path);
-slim_hidden_proto (cairo_mesh_pattern_line_to);
-slim_hidden_proto (cairo_mesh_pattern_move_to);
-slim_hidden_proto (cairo_mesh_pattern_set_corner_color_rgba);
-slim_hidden_proto (cairo_move_to);
-slim_hidden_proto (cairo_new_path);
-slim_hidden_proto (cairo_paint);
-slim_hidden_proto (cairo_paint_with_alpha);
-slim_hidden_proto_no_warn (cairo_path_destroy);
-slim_hidden_proto (cairo_pattern_add_color_stop_rgba);
-slim_hidden_proto (cairo_pattern_create_for_surface);
-slim_hidden_proto (cairo_pattern_create_linear);
-slim_hidden_proto (cairo_pattern_create_mesh);
-slim_hidden_proto (cairo_pattern_create_radial);
-slim_hidden_proto (cairo_pattern_create_rgb);
-slim_hidden_proto (cairo_pattern_create_rgba);
-slim_hidden_proto (cairo_pattern_destroy);
-slim_hidden_proto (cairo_pattern_get_extend);
-slim_hidden_proto (cairo_pattern_get_rgba);
-slim_hidden_proto (cairo_pattern_get_type);
-slim_hidden_proto_no_warn (cairo_pattern_reference);
-slim_hidden_proto (cairo_pattern_set_extend);
-slim_hidden_proto (cairo_pattern_set_matrix);
-slim_hidden_proto (cairo_pop_group);
-slim_hidden_proto (cairo_pop_group_to_source);
-slim_hidden_proto (cairo_push_group);
-slim_hidden_proto (cairo_push_group_with_content);
-slim_hidden_proto (cairo_recording_surface_create);
-slim_hidden_proto (cairo_recording_surface_ink_extents);
-slim_hidden_proto (cairo_rectangle);
-slim_hidden_proto (cairo_region_contains_point);
-slim_hidden_proto (cairo_region_contains_rectangle);
-slim_hidden_proto (cairo_region_copy);
-slim_hidden_proto (cairo_region_create);
-slim_hidden_proto (cairo_region_create_rectangle);
-slim_hidden_proto (cairo_region_create_rectangles);
-slim_hidden_proto (cairo_region_destroy);
-slim_hidden_proto (cairo_region_equal);
-slim_hidden_proto (cairo_region_get_extents);
-slim_hidden_proto (cairo_region_get_rectangle);
-slim_hidden_proto (cairo_region_intersect);
-slim_hidden_proto (cairo_region_intersect_rectangle);
-slim_hidden_proto (cairo_region_is_empty);
-slim_hidden_proto (cairo_region_num_rectangles);
-slim_hidden_proto (cairo_region_reference);
-slim_hidden_proto (cairo_region_status);
-slim_hidden_proto (cairo_region_subtract);
-slim_hidden_proto (cairo_region_subtract_rectangle);
-slim_hidden_proto (cairo_region_translate);
-slim_hidden_proto (cairo_region_union);
-slim_hidden_proto (cairo_region_union_rectangle);
-slim_hidden_proto (cairo_region_xor);
-slim_hidden_proto (cairo_region_xor_rectangle);
-slim_hidden_proto (cairo_rel_line_to);
-slim_hidden_proto (cairo_restore);
-slim_hidden_proto (cairo_rotate);
-slim_hidden_proto (cairo_save);
-slim_hidden_proto (cairo_scale);
-slim_hidden_proto (cairo_scaled_font_create);
-slim_hidden_proto (cairo_scaled_font_destroy);

_service:tar_scm:cairo-1.17.8.tar.xz/src/check-doc-syntax.sh -> _service:tar_scm:cairo-1.18.0.tar.xz/src/check-doc-syntax.sh Changed

@@ -28,7 +28,7 @@
 if test "x$SGML_DOCS" = x; then
 	enum_regexp='^^:*:/ *$\| \t.*$'$enum_regexp$$\|^:$
 fi
-if echo $FILES | xargs grep . /dev/null | sed -e '/<programlisting>/,/<\/programlisting>/d' | grep "$enum_regexp" | grep -v '#####'; then
+if echo $FILES | xargs grep . /dev/null | sed -e '/<programlisting>/,/<\/programlisting>/d' -e '/\|\/,/\\|/d' | grep "$enum_regexp" | grep -v '#####'; then
 	stat=1
 	echo Error: some macros in the docs are not prefixed by percent sign.
 	echo Fix this by searching for the following regexp in the above files:
@@ -42,7 +42,7 @@
 	type_regexp='$.'$type_regexp'$\|$'$type_regexp'.$'
 fi
 
-if echo $FILES | xargs grep . /dev/null | sed -e '/<programlisting>/,/<\/programlisting>/d' | grep -v "@Title" | grep "$type_regexp" | grep -v '#####'; then
+if echo $FILES | xargs grep . /dev/null | sed -e '/<programlisting>/,/<\/programlisting>/d' -e '/\|\/,/\\|/d' | grep -v "@Title" | grep "$type_regexp" | grep -v '#####'; then
 	stat=1
 	echo Error: some type names in the docs are not prefixed by hash sign,
 	echo neither are the only token in the doc line followed by colon.
@@ -56,7 +56,7 @@
 fi
 
 # We need to filter out gtk-doc markup errors for program listings.
-if echo $FILES | xargs grep . /dev/null | sed -e '/<programlisting>/,/<\/programlisting>/d' | grep "$func_regexp" | grep -v '^^:*: * a-z_0-9*:$' | grep -v '#####'; then
+if echo $FILES | xargs grep . /dev/null | sed -e '/<programlisting>/,/<\/programlisting>/d' -e '/\|\/,/\\|/d' | grep "$func_regexp" | grep -v '^^:*: * a-z_0-9*:$' | grep -v '#####'; then
 	stat=1
 	echo Error: some function names in the docs are not followed by parentheses.
 	echo Fix this by searching for the following regexp in the above files:

_service:tar_scm:cairo-1.17.8.tar.xz/src/meson.build -> _service:tar_scm:cairo-1.18.0.tar.xz/src/meson.build Changed

@@ -195,9 +195,6 @@
   'cairo-svg': 
     'cairo-svg-surface.c',
   ,
-  'cairo-xml': 
-    'cairo-xml-surface.c',
-  ,
   'cairo-tee': 
     'cairo-tee-surface.c',
   ,
@@ -218,7 +215,6 @@
   'cairo-gl': 'cairo-gl.h',
   'cairo-script': 'cairo-script.h',
   'cairo-tee': 'cairo-tee.h',
-  'cairo-xml': 'cairo-xml.h',
   'cairo-vg': 'cairo-vg.h',
 }
 
@@ -246,9 +242,10 @@
 
 libcairo = library('cairo', cairo_sources,
   dependencies: deps,
-  c_args: cairo_no_warn_c_args + pthread_c_args,
-  cpp_args: cairo_no_warn_c_args + pthread_c_args,
+  c_args: cairo_no_warn_c_args + pthread_c_args + '-DCAIRO_COMPILATION',
+  cpp_args: cairo_no_warn_c_args + pthread_c_args + '-DCAIRO_COMPILATION',
   link_args: extra_link_args,
+  gnu_symbol_visibility: 'hidden',
   soversion: cairo_version_sonum,
   version: cairo_libversion,
   install: true,
@@ -287,29 +284,4 @@
       suite: 'fast', 'lint',
       workdir: meson.current_source_dir())
   endforeach
-
-  env = environment()
-  env.set('CAIRO_HAS_HIDDEN_SYMBOLS', '1')
-
-  cairo_def = custom_target('make-cairo-def',
-                            input : cairo_headers,
-                            output : 'cairo.def',
-                            command :  shell,
-                                        meson.current_source_dir()/'make-cairo-def.sh',
-                                        '@OUTPUT@',
-                                        cairo_features_file,
-                                        '@INPUT@'
-                                      )
-
-  test('check-def', shell,
-       args: 'meson-check-def.sh', cairo_def, libcairo ,
-       env: env,
-       workdir: meson.current_source_dir())
-
-  test('check-plt.sh', shell,
-    args: 'check-plt.sh', libcairo ,
-    env: env,
-    suite: 'fast', 'plt',
-    workdir: meson.current_source_dir())
-
 endif

_service:tar_scm:cairo-1.17.8.tar.xz/src/win32/cairo-dwrite-font.cpp -> _service:tar_scm:cairo-1.18.0.tar.xz/src/win32/cairo-dwrite-font.cpp Changed

@@ -212,6 +212,9 @@
 
 
 RefPtr<IDWriteFactory> DWriteFactory::mFactoryInstance;
+RefPtr<IDWriteFactory1> DWriteFactory::mFactoryInstance1;
+RefPtr<IDWriteFactory2> DWriteFactory::mFactoryInstance2;
+RefPtr<IDWriteFactory3> DWriteFactory::mFactoryInstance3;
 RefPtr<IDWriteFactory4> DWriteFactory::mFactoryInstance4;
 
 RefPtr<IWICImagingFactory> WICImagingFactory::mFactoryInstance;
@@ -221,6 +224,107 @@
 RefPtr<ID2D1Factory> D2DFactory::mFactoryInstance;
 RefPtr<ID2D1DCRenderTarget> D2DFactory::mRenderTarget;
 
+static int
+_quality_from_antialias_mode(cairo_antialias_t antialias)
+{
+    switch (antialias) {
+    case CAIRO_ANTIALIAS_NONE:
+	return NONANTIALIASED_QUALITY;
+    case CAIRO_ANTIALIAS_FAST:
+    case CAIRO_ANTIALIAS_GRAY:
+	return ANTIALIASED_QUALITY;
+    default:
+	break;
+    }
+    return CLEARTYPE_QUALITY;    
+}
+
+static RefPtr<IDWriteRenderingParams>
+_create_rendering_params(IDWriteRenderingParams     *params,
+			 const cairo_font_options_t *options,
+			 cairo_antialias_t           antialias)
+{
+    if (!params)
+	params = DWriteFactory::DefaultRenderingParams();
+    FLOAT gamma = params->GetGamma();
+    FLOAT enhanced_contrast = params->GetEnhancedContrast();
+    FLOAT clear_type_level = params->GetClearTypeLevel();
+    DWRITE_PIXEL_GEOMETRY pixel_geometry = params->GetPixelGeometry();
+    DWRITE_RENDERING_MODE rendering_mode = params->GetRenderingMode();
+
+    cairo_bool_t modified = FALSE;
+    switch (antialias) {
+    case CAIRO_ANTIALIAS_NONE:
+	if (rendering_mode != DWRITE_RENDERING_MODE_ALIASED) {
+	    rendering_mode = DWRITE_RENDERING_MODE_ALIASED;
+	    modified = TRUE;
+	}
+	break;
+    case CAIRO_ANTIALIAS_FAST:
+    case CAIRO_ANTIALIAS_GRAY:
+	if (clear_type_level) {
+	    clear_type_level = 0;
+	    modified = TRUE;
+	}
+	break;
+    default:
+	break;
+    }
+    auto subpixel_order = cairo_font_options_get_subpixel_order (options);
+    switch (subpixel_order) {
+    case CAIRO_SUBPIXEL_ORDER_RGB:
+	if (pixel_geometry != DWRITE_PIXEL_GEOMETRY_RGB) {
+	    pixel_geometry = DWRITE_PIXEL_GEOMETRY_RGB;
+	    modified = TRUE;
+	}
+	break;
+    case CAIRO_SUBPIXEL_ORDER_BGR:
+	if (pixel_geometry != DWRITE_PIXEL_GEOMETRY_BGR) {
+	    pixel_geometry = DWRITE_PIXEL_GEOMETRY_BGR;
+	    modified = TRUE;
+	}
+	break;
+    default:
+	break;
+    }	
+    if (!modified)
+	return params;
+
+    HRESULT hr;
+    RefPtr<IDWriteRenderingParams1> params1;
+    hr = params->QueryInterface(&params1);
+    if (FAILED(hr)) {
+	RefPtr<IDWriteRenderingParams> ret;
+	DWriteFactory::Instance()->CreateCustomRenderingParams(gamma, enhanced_contrast, clear_type_level, pixel_geometry, rendering_mode, &ret);
+	return ret;
+    }
+
+    FLOAT grayscaleEnhancedContrast = params1->GetGrayscaleEnhancedContrast();
+    RefPtr<IDWriteRenderingParams2> params2;
+    hr = params->QueryInterface(&params2);
+    if (FAILED(hr)) {
+	RefPtr<IDWriteRenderingParams1> ret;
+	DWriteFactory::Instance1()->CreateCustomRenderingParams(gamma, enhanced_contrast, grayscaleEnhancedContrast, clear_type_level, pixel_geometry, rendering_mode, &ret);
+	return ret;
+    }    
+
+    DWRITE_GRID_FIT_MODE gridFitMode = params2->GetGridFitMode();
+    RefPtr<IDWriteRenderingParams3> params3;
+    hr = params->QueryInterface(&params3);
+    if (FAILED(hr)) {
+	RefPtr<IDWriteRenderingParams2> ret;
+	DWriteFactory::Instance2()->CreateCustomRenderingParams(gamma, enhanced_contrast, grayscaleEnhancedContrast, clear_type_level, pixel_geometry, rendering_mode, gridFitMode, &ret);
+	return ret;
+    }    
+    
+    DWRITE_RENDERING_MODE1 rendering_mode1 = params3->GetRenderingMode1();
+    if (antialias == CAIRO_ANTIALIAS_NONE)
+	rendering_mode1 = DWRITE_RENDERING_MODE1_ALIASED;
+    RefPtr<IDWriteRenderingParams3> ret;
+    DWriteFactory::Instance3()->CreateCustomRenderingParams(gamma, enhanced_contrast, grayscaleEnhancedContrast, clear_type_level, pixel_geometry, rendering_mode1, gridFitMode, &ret);
+    return ret;
+}
+
 /* Functions #cairo_font_face_backend_t */
 static cairo_status_t
 _cairo_dwrite_font_face_create_for_toy (cairo_toy_font_face_t   *toy_face,
@@ -557,13 +661,6 @@
     dwrite_font->mat_inverse = dwrite_font->mat;
     cairo_matrix_invert (&dwrite_font->mat_inverse);
 
-    dwrite_font->rendering_params = NULL;
-    if (font_face->rendering_params) {
-	dwrite_font->rendering_params = font_face->rendering_params;
-	dwrite_font->rendering_params->AddRef();
-    }
-    dwrite_font->measuring_mode = font_face->measuring_mode;
-
     cairo_font_extents_t extents;
 
     DWRITE_FONT_METRICS metrics;
@@ -612,6 +709,9 @@
 	dwrite_font->antialias_mode = options->antialias;
     }
 
+    dwrite_font->rendering_params = _create_rendering_params(font_face->rendering_params, options, dwrite_font->antialias_mode).forget().drop();
+    dwrite_font->measuring_mode = font_face->measuring_mode;
+
     return _cairo_scaled_font_set_metrics (*font, &extents);
 }
 
@@ -716,10 +816,15 @@
     // We pad the extents here because GetDesignGlyphMetrics returns "ideal" metrics
     // for the glyph outline, without accounting for hinting/gridfitting/antialiasing,
     // and therefore it does not always cover all pixels that will actually be touched.
-    if (scaled_font->base.options.antialias != CAIRO_ANTIALIAS_NONE &&
-	extents.width > 0 && extents.height > 0) {
-	extents.width += scaled_font->mat_inverse.xx * 2;
-	extents.x_bearing -= scaled_font->mat_inverse.xx;
+    if (extents.width > 0 && extents.height > 0) {
+	double x = 1, y = 1;
+	cairo_matrix_transform_distance (&scaled_font->mat_inverse, &x, &y);
+	x = fabs(x);
+	y = fabs(y);
+	extents.width += x * 2;
+	extents.x_bearing -= x;
+	extents.height += y * 2;
+	extents.y_bearing -= y;
     }
 
     _cairo_scaled_glyph_set_metrics (scaled_glyph,
@@ -736,8 +841,9 @@
 class GeometryRecorder : public IDWriteGeometrySink
 {
 public:
-    GeometryRecorder(cairo_path_fixed_t *aCairoPath)
-	: mCairoPath(aCairoPath) {}
+    GeometryRecorder(cairo_path_fixed_t *aCairoPath, const cairo_matrix_t &matrix)
+	: mCairoPath(aCairoPath)
+	, mMatrix(matrix) {}
 
     // IUnknown interface
     IFACEMETHOD(QueryInterface)(IID const& iid, OUT void** ppObject)
@@ -779,10 +885,14 @@
 	D2D1_POINT_2F startPoint,
 	D2D1_FIGURE_BEGIN figureBegin)
     {
-	mStartPoint = startPoint;
+	double x = startPoint.x;
+	double y = startPoint.y;
+	cairo_matrix_transform_point(&mMatrix, &x, &y);
+	mStartPointX = _cairo_fixed_from_double(x);
+	mStartPointY = _cairo_fixed_from_double(y);
 	cairo_status_t status = _cairo_path_fixed_move_to(mCairoPath,
-							  _cairo_fixed_from_double(startPoint.x),
-							  _cairo_fixed_from_double(startPoint.y));
+							  mStartPointX,
+							  mStartPointY);
 	(void)status; /* squelch warning */
     }
 
@@ -791,8 +901,8 @@
     {
 	if (figureEnd == D2D1_FIGURE_END_CLOSED) {
 	    cairo_status_t status = _cairo_path_fixed_line_to(mCairoPath,
-							      _cairo_fixed_from_double(mStartPoint.x),
-							      _cairo_fixed_from_double(mStartPoint.y));
+							      mStartPointX,
+							      mStartPointY);

_service:tar_scm:cairo-1.17.8.tar.xz/src/win32/cairo-dwrite-private.hpp -> _service:tar_scm:cairo-1.18.0.tar.xz/src/win32/cairo-dwrite-private.hpp Changed

@@ -36,27 +36,25 @@
 
 #include "cairoint.h"
 #include "cairo-win32-refptr.hpp"
-#include <dwrite.h>
-#include <dwrite_2.h>
+#include <dwrite_3.h>
 #include <d2d1.h>
 
-/* If either of the dwrite_3.h or d2d1_3.h headers required for color fonts
- * are not available, include our own version containing just the functions we need.
- */
-
-#if HAVE_DWRITE_3_H
-#include <dwrite_3.h>
-#else
+#ifdef __MINGW32__
 #include "dw-extra.h"
+#else
+typedef DWRITE_COLOR_GLYPH_RUN1 DWRITE_COLOR_GLYPH_RUN1_WORKAROUND;
 #endif
 
+/* If d2d1_3.h header required for color fonts is not available,
+ * include our own version containing just the functions we need.
+ */
+
 #if HAVE_D2D1_3_H
 #include <d2d1_3.h>
 #else
 #include "d2d1-extra.h"
 #endif
 
-
 // DirectWrite is not available on all platforms.
 typedef HRESULT (WINAPI*DWriteCreateFactoryFunc)(
   DWRITE_FACTORY_TYPE factoryType,
@@ -101,6 +99,36 @@
 	return mFactoryInstance;
     }
 
+    static RefPtr<IDWriteFactory1> Instance1()
+    {
+	if (!mFactoryInstance1) {
+	    if (Instance()) {
+		Instance()->QueryInterface(&mFactoryInstance1);
+	    }
+	}
+	return mFactoryInstance1;
+    }
+
+    static RefPtr<IDWriteFactory2> Instance2()
+    {
+	if (!mFactoryInstance2) {
+	    if (Instance()) {
+		Instance()->QueryInterface(&mFactoryInstance2);
+	    }
+	}
+	return mFactoryInstance2;
+    }
+
+    static RefPtr<IDWriteFactory3> Instance3()
+    {
+	if (!mFactoryInstance3) {
+	    if (Instance()) {
+		Instance()->QueryInterface(&mFactoryInstance3);
+	    }
+	}
+	return mFactoryInstance3;
+    }
+
     static RefPtr<IDWriteFactory4> Instance4()
     {
 	if (!mFactoryInstance4) {
@@ -151,6 +179,9 @@
 
 private:
     static RefPtr<IDWriteFactory> mFactoryInstance;
+    static RefPtr<IDWriteFactory1> mFactoryInstance1;
+    static RefPtr<IDWriteFactory2> mFactoryInstance2;
+    static RefPtr<IDWriteFactory3> mFactoryInstance3;
     static RefPtr<IDWriteFactory4> mFactoryInstance4;
     static RefPtr<IDWriteFontCollection> mSystemCollection;
     static RefPtr<IDWriteRenderingParams> mDefaultRenderingParams;

_service:tar_scm:cairo-1.17.8.tar.xz/src/win32/cairo-win32-font.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/win32/cairo-win32-font.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/win32/cairo-win32-gdi-compositor.c -> _service:tar_scm:cairo-1.18.0.tar.xz/src/win32/cairo-win32-gdi-compositor.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/win32/cairo-win32-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/win32/cairo-win32-private.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/src/win32/dw-extra.h -> _service:tar_scm:cairo-1.18.0.tar.xz/src/win32/dw-extra.h Changed

@@ -1,165 +1,28 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
-/* Mingw-w64 dwrite_3.h is broken
+/* MinGW workarounds
  *
- * We only need the definitions of the following functions and their dependencies.
- *   IDWriteFactory4::TranslateColorGlyphRun()
- *   IDWriteFontResource::GetDefaultFontAxisValues()
- *   IDWriteFontResource::GetFontAxisCount()
- *   IDWriteFontResource::HasVariations()
- *   IDWriteFontFace5::GetFontAxisValueCount()
- *   IDWriteFontFace5::GetFontAxisValues()
- *   IDWriteFontFace5::HasVariations()
- *   IDWriteFontFace5::GetFontResource()
- *
- * But we need to include all the prior functions in the same struct,
- * and parent structs, so that the functions are in the correct position
- * in the vtable. The parameters of the unused functions are not
- * required as we only need a function in the struct to create a
- * function pointer in the vtable.
+ * It doesn't define operators for DWRITE_GLYPH_IMAGE_FORMATS.
+ * The DWRITE_COLOR_GLYPH_RUN struct isn't valid.
+ * <https://sourceforge.net/p/mingw-w64/bugs/913/>
  */
 
 #ifndef DWRITE_EXTRA_H
 #define DWRITE_EXTRA_H
 
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-
-#include <dwrite_2.h>
-
-interface IDWriteFactory3;
-interface IDWriteFactory4;
-interface IDWriteColorGlyphRunEnumerator1;
-
-DEFINE_ENUM_FLAG_OPERATORS(DWRITE_GLYPH_IMAGE_FORMATS);
+#if defined(__MINGW64_VERSION_MAJOR) && __MINGW64_VERSION_MAJOR < 10
 
-struct DWRITE_COLOR_GLYPH_RUN1 : DWRITE_COLOR_GLYPH_RUN
+typedef struct DWRITE_COLOR_GLYPH_RUN1_WORKAROUND DWRITE_COLOR_GLYPH_RUN1_WORKAROUND;
+struct DWRITE_COLOR_GLYPH_RUN1_WORKAROUND : DWRITE_COLOR_GLYPH_RUN
 {
     DWRITE_GLYPH_IMAGE_FORMATS glyphImageFormat;
     DWRITE_MEASURING_MODE measuringMode;
 };
 
+#else
+typedef DWRITE_COLOR_GLYPH_RUN1 DWRITE_COLOR_GLYPH_RUN1_WORKAROUND;
+#endif
 
-DEFINE_GUID(IID_IDWriteColorGlyphRunEnumerator1, 0x7c5f86da, 0xc7a1, 0x4f05, 0xb8,0xe1, 0x55,0xa1,0x79,0xfe,0x5a,0x35);
-MIDL_INTERFACE("7c5f86da-c7a1-4f05-b8e1-55a179fe5a35")
-IDWriteColorGlyphRunEnumerator1 : public IDWriteColorGlyphRunEnumerator
-{
-    virtual HRESULT STDMETHODCALLTYPE GetCurrentRun(
-        const DWRITE_COLOR_GLYPH_RUN1 **run) = 0;
-
-};
-__CRT_UUID_DECL(IDWriteColorGlyphRunEnumerator1, 0x7c5f86da, 0xc7a1, 0x4f05, 0xb8,0xe1, 0x55,0xa1,0x79,0xfe,0x5a,0x35)
-
-DEFINE_GUID(IID_IDWriteFactory3, 0x9a1b41c3, 0xd3bb, 0x466a, 0x87,0xfc, 0xfe,0x67,0x55,0x6a,0x3b,0x65);
-MIDL_INTERFACE("9a1b41c3-d3bb-466a-87fc-fe67556a3b65")
-IDWriteFactory3 : public IDWriteFactory2
-{
-  virtual void STDMETHODCALLTYPE CreateGlyphRunAnalysis() = 0;
-  virtual void STDMETHODCALLTYPE CreateCustomRenderingParams() = 0;
-  virtual void STDMETHODCALLTYPE CreateFontFaceReference() = 0;
-  virtual void STDMETHODCALLTYPE CreateFontFaceReference2() = 0;
-  virtual void STDMETHODCALLTYPE GetSystemFontSet() = 0;
-  virtual void STDMETHODCALLTYPE CreateFontSetBuilder() = 0;
-  virtual void STDMETHODCALLTYPE CreateFontCollectionFromFontSet() = 0;
-  virtual void STDMETHODCALLTYPE GetSystemFontCollection() = 0;
-  virtual void STDMETHODCALLTYPE GetFontDownloadQueue() = 0;
-};
-__CRT_UUID_DECL(IDWriteFactory3, 0x9a1b41c3, 0xd3bb, 0x466a, 0x87,0xfc, 0xfe,0x67,0x55,0x6a,0x3b,0x65)
-
-DEFINE_GUID(IID_IDWriteFactory4, 0x4b0b5bd3, 0x0797, 0x4549, 0x8a,0xc5, 0xfe,0x91,0x5c,0xc5,0x38,0x56);
-MIDL_INTERFACE("4b0b5bd3-0797-4549-8ac5-fe915cc53856")
-IDWriteFactory4 : public IDWriteFactory3
-{
-  virtual HRESULT STDMETHODCALLTYPE TranslateColorGlyphRun(
-    D2D1_POINT_2F                      baselineOrigin,
-    DWRITE_GLYPH_RUN const             *glyphRun,
-    DWRITE_GLYPH_RUN_DESCRIPTION const *glyphRunDescription,
-    DWRITE_GLYPH_IMAGE_FORMATS         desiredGlyphImageFormats,
-    DWRITE_MEASURING_MODE              measuringMode,
-    DWRITE_MATRIX const                *worldAndDpiTransform,
-    UINT32                             colorPaletteIndex,
-    IDWriteColorGlyphRunEnumerator1    **colorLayers) = 0;
-};
-__CRT_UUID_DECL(IDWriteFactory4, 0x4b0b5bd3, 0x0797, 0x4549, 0x8a,0xc5, 0xfe,0x91,0x5c,0xc5,0x38,0x56)
-
-typedef enum DWRITE_FONT_AXIS_TAG {
-    DWRITE_FONT_AXIS_TAG_WEIGHT = 0x74686777,
-    DWRITE_FONT_AXIS_TAG_WIDTH = 0x68746477,
-    DWRITE_FONT_AXIS_TAG_SLANT = 0x746e6c73,
-    DWRITE_FONT_AXIS_TAG_OPTICAL_SIZE = 0x7a73706f,
-    DWRITE_FONT_AXIS_TAG_ITALIC = 0x6c617469
-} DWRITE_FONT_AXIS_TAG;
-
-typedef struct DWRITE_FONT_AXIS_VALUE {
-    DWRITE_FONT_AXIS_TAG axisTag;
-    FLOAT value;
-} DWRITE_FONT_AXIS_VALUE;
-
-DEFINE_GUID(IID_IDWriteFontResource, 0x1f803a76, 0x6871, 0x48e8, 0x98,0x7f, 0xb9,0x75,0x55,0x1c,0x50,0xf2);
-MIDL_INTERFACE("1f803a76-6871-48e8-987f-b975551c50f2")
-IDWriteFontResource : public IUnknown
-{
-  virtual void STDMETHODCALLTYPE GetFontFile() = 0;
-  virtual void STDMETHODCALLTYPE GetFontFaceIndex() = 0;
-  virtual UINT32 STDMETHODCALLTYPE GetFontAxisCount() = 0;
-  virtual HRESULT STDMETHODCALLTYPE GetDefaultFontAxisValues(
-    const DWRITE_FONT_AXIS_VALUE *values,
-    UINT32 num_values) = 0;
-  virtual void STDMETHODCALLTYPE GetFontAxisRanges() = 0;
-  virtual void STDMETHODCALLTYPE GetFontAxisAttributes() = 0;
-  virtual void STDMETHODCALLTYPE GetAxisNames() = 0;
-  virtual void STDMETHODCALLTYPE GetAxisValueNameCount() = 0;
-  virtual void STDMETHODCALLTYPE GetAxisValueNames() = 0;
-  virtual WINBOOL STDMETHODCALLTYPE HasVariations() = 0;
-  virtual void STDMETHODCALLTYPE CreateFontFace() = 0;
-  virtual void STDMETHODCALLTYPE CreateFontFaceReference() = 0;
-};
-__CRT_UUID_DECL(IDWriteFontResource, 0x1f803a76, 0x6871, 0x48e8, 0x98,0x7f, 0xb9,0x75,0x55,0x1c,0x50,0xf2)
-
-DEFINE_GUID(IID_IDWriteFontFace3, 0xd37d7598, 0x09be, 0x4222, 0xa2,0x36, 0x20,0x81,0x34,0x1c,0xc1,0xf2);
-MIDL_INTERFACE("d37d7598-09be-4222-a236-2081341cc1f2")
-IDWriteFontFace3 : public IDWriteFontFace2
-{
-  virtual void STDMETHODCALLTYPE GetFontFaceReference() = 0;
-  virtual void STDMETHODCALLTYPE GetPanose() = 0;
-  virtual void STDMETHODCALLTYPE GetWeight() = 0;
-  virtual void STDMETHODCALLTYPE GetStretch() = 0;
-  virtual void STDMETHODCALLTYPE GetStyle() = 0;
-  virtual void STDMETHODCALLTYPE GetFamilyNames() = 0;
-  virtual void STDMETHODCALLTYPE GetFaceNames() = 0;
-  virtual void STDMETHODCALLTYPE GetInformationalStrings() = 0;
-  virtual void STDMETHODCALLTYPE HasCharacter() = 0;
-  virtual void STDMETHODCALLTYPE GetRecommendedRenderingMode() = 0;
-  virtual void STDMETHODCALLTYPE IsCharacterLocal() = 0;
-  virtual void STDMETHODCALLTYPE IsGlyphLocal() = 0;
-  virtual void STDMETHODCALLTYPE AreCharactersLocal() = 0;
-  virtual void STDMETHODCALLTYPE AreGlyphsLocal() = 0;
-};
-__CRT_UUID_DECL(IDWriteFontFace3, 0xd37d7598, 0x09be, 0x4222, 0xa2,0x36, 0x20,0x81,0x34,0x1c,0xc1,0xf2)
-
-DEFINE_GUID(IID_IDWriteFontFace4, 0x27f2a904, 0x4eb8, 0x441d, 0x96,0x78, 0x05,0x63,0xf5,0x3e,0x3e,0x2f);
-MIDL_INTERFACE("27f2a904-4eb8-441d-9678-0563f53e3e2f")
-IDWriteFontFace4 : public IDWriteFontFace3
-{
-  virtual void STDMETHODCALLTYPE GetGlyphImageFormats_() = 0;
-  virtual void STDMETHODCALLTYPE GetGlyphImageFormats() = 0;
-  virtual void STDMETHODCALLTYPE GetGlyphImageData() = 0;
-  virtual void STDMETHODCALLTYPE ReleaseGlyphImageData() = 0;
-};
-__CRT_UUID_DECL(IDWriteFontFace4, 0x27f2a904, 0x4eb8, 0x441d, 0x96,0x78, 0x05,0x63,0xf5,0x3e,0x3e,0x2f)
-
-DEFINE_GUID(IID_IDWriteFontFace5, 0x98eff3a5, 0xb667, 0x479a, 0xb1,0x45, 0xe2,0xfa,0x5b,0x9f,0xdc,0x29);
-MIDL_INTERFACE("98eff3a5-b667-479a-b145-e2fa5b9fdc29")
-IDWriteFontFace5 : public IDWriteFontFace4
-{
-  virtual UINT32 STDMETHODCALLTYPE GetFontAxisValueCount() = 0;
-  virtual HRESULT STDMETHODCALLTYPE GetFontAxisValues(
-    DWRITE_FONT_AXIS_VALUE *values,
-    UINT32 value_count) = 0;
-  virtual WINBOOL STDMETHODCALLTYPE HasVariations() = 0;
-  virtual HRESULT STDMETHODCALLTYPE GetFontResource(
-    IDWriteFontResource **resource) = 0;
-  virtual void STDMETHODCALLTYPE Equals() = 0;
-};
-__CRT_UUID_DECL(IDWriteFontFace5, 0x98eff3a5, 0xb667, 0x479a, 0xb1,0x45, 0xe2,0xfa,0x5b,0x9f,0xdc,0x29)
+DEFINE_ENUM_FLAG_OPERATORS(DWRITE_GLYPH_IMAGE_FORMATS);
 
 #endif /* DWRITE_EXTRA_H */

_service:tar_scm:cairo-1.17.8.tar.xz/test/bug-431.c -> _service:tar_scm:cairo-1.18.0.tar.xz/test/bug-431.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/cairo-test-runner.c -> _service:tar_scm:cairo-1.18.0.tar.xz/test/cairo-test-runner.c Changed

@@ -726,42 +726,6 @@
 			     CAIRO_VERSION_ENCODE (major, minor, micro));
 }
 
-static cairo_bool_t
-_has_required_ghostscript_version (const char *str)
-{
-#if ! CAIRO_CAN_TEST_PS_SURFACE
-    return TRUE;
-#endif
-
-    str += 2; /* advance over "gs" */
-
-    return TRUE;
-}
-
-static cairo_bool_t
-_has_required_poppler_version (const char *str)
-{
-#if ! CAIRO_CAN_TEST_PDF_SURFACE
-    return TRUE;
-#endif
-
-    str += 7; /* advance over "poppler" */
-
-    return TRUE;
-}
-
-static cairo_bool_t
-_has_required_rsvg_version (const char *str)
-{
-#if ! CAIRO_CAN_TEST_SVG_SURFACE
-    return TRUE;
-#endif
-
-    str += 4; /* advance over "rsvg" */
-
-    return TRUE;
-}
-
 #define TEST_SIMILAR	0x1
 #define TEST_OFFSET	0x2
 #define TEST_SCALE	0x4
@@ -905,30 +869,6 @@
 		else
 		    goto TEST_SKIPPED;
 	    }
-
-	    str = strstr (requirements, "gs");
-	    if (str != NULL && ! _has_required_ghostscript_version (str)) {
-		if (runner.list_only)
-		    goto TEST_NEXT;
-		else
-		    goto TEST_SKIPPED;
-	    }
-
-	    str = strstr (requirements, "poppler");
-	    if (str != NULL && ! _has_required_poppler_version (str)) {
-		if (runner.list_only)
-		    goto TEST_NEXT;
-		else
-		    goto TEST_SKIPPED;
-	    }
-
-	    str = strstr (requirements, "rsvg");
-	    if (str != NULL && ! _has_required_rsvg_version (str)) {
-		if (runner.list_only)
-		    goto TEST_NEXT;
-		else
-		    goto TEST_SKIPPED;
-	    }
 	}
 
 	if (runner.list_only) {
@@ -943,7 +883,7 @@
 	if (ctx.test->preamble != NULL) {
 	    status = _cairo_test_runner_preamble (&runner, &ctx);
 	    if (getenv ("CAIRO_TEST_UGLY_HACK_TO_IGNORE_PS_FAILURES")) {
-		if (strcmp (ctx.test_name, "ps-eps") == 0 || strcmp (ctx.test_name, "fallback-resolution") == 0) {
+		if (strcmp (ctx.test_name, "ps-eps") == 0) {
 		    if (status == CAIRO_TEST_FAILURE) {
 			cairo_test_log (&ctx, "Turning FAIL into XFAIL due to env\n");
 			fprintf (stderr, "Turning FAIL into XFAIL due to env\n");

_service:tar_scm:cairo-1.17.8.tar.xz/test/cairo-test-trace.c -> _service:tar_scm:cairo-1.18.0.tar.xz/test/cairo-test-trace.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/cairo-test.c -> _service:tar_scm:cairo-1.18.0.tar.xz/test/cairo-test.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/cairo-test.h -> _service:tar_scm:cairo-1.18.0.tar.xz/test/cairo-test.h Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/check-pdf-structure.sh Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/dithergradient.c Added

@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2023 Marc Jeanmougin
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Red Hat, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Red Hat, Inc. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Marc Jeanmougin <marc@jeanmougin.fr>
+ */
+
+#include "cairo-test.h"
+
+static void
+set_dither_source (cairo_t *cr, int width)
+{
+    cairo_pattern_t *gradient = cairo_pattern_create_linear (0, 0, width, 0);
+    cairo_pattern_add_color_stop_rgba (gradient, 0., 25./255, 25./255, 25./255, 1.0);
+    cairo_pattern_add_color_stop_rgba (gradient, 1., 45./255, 45./255, 45./255, 1.0);
+    
+    cairo_set_source (cr, gradient);
+    cairo_pattern_set_dither (gradient, CAIRO_DITHER_BEST);
+    cairo_pattern_destroy (gradient);
+}
+
+/* History:
+ *
+ * 2023: v3 of a patch to use pixman dithering with cairo
+ */
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    set_dither_source (cr, width);
+    cairo_paint (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+static cairo_test_status_t
+draw2 (cairo_t *cr, int width, int height)
+{
+    cairo_set_source_rgb (cr, 0, 0, 0);
+    cairo_paint (cr);
+
+    set_dither_source (cr, width);
+
+    cairo_set_operator (cr, CAIRO_OPERATOR_ADD);
+    for (int i = 0; i < 5; i++) {
+        cairo_paint (cr);
+    }
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (dithergradient,
+	    "Testing the creation of a dithered gradient (in argb32)",
+	    "gradient, dither", /* keywords */
+	    NULL, /* requirements */
+	    400, 100,
+	    NULL, draw)
+CAIRO_TEST (dithergradient2,
+	    "Testing the creation of a dithered gradient (in argb32)",
+	    "gradient, dither", /* keywords */
+	    NULL, /* requirements */
+	    400, 100,
+	    NULL, draw2)

_service:tar_scm:cairo-1.18.0.tar.xz/test/leaks.c Added

@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2023 Uli Schlachter
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author: Uli Schlachter <psychon@znc.in>
+ */
+
+#include "cairo-test.h"
+
+
+// Once upon a time, _cairo_gstate_fini(), _cairo_scaled_font_fini_internal(),
+// and _cairo_ft_scaled_font_fini() leaked font options.
+static cairo_test_status_t
+leaks_set_scaled_font (cairo_t *cr, int width, int height)
+{
+    cairo_font_options_t *opt;
+    cairo_matrix_t matrix;
+    cairo_scaled_font_t *font;
+
+    cairo_matrix_init_identity (&matrix);
+
+    opt = cairo_font_options_create ();
+    cairo_font_options_set_custom_palette_color (opt, 0, 1, 1, 1, 1);
+
+    font = cairo_scaled_font_create (cairo_get_font_face (cr), &matrix, &matrix, opt);
+
+    cairo_set_scaled_font (cr, font);
+
+    cairo_font_options_destroy (opt);
+    cairo_scaled_font_destroy (font);
+
+    // Fill the output so that the same ref image works for everying
+    cairo_paint (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (leaks_set_scaled_font,
+	    "Regression test for font options memory leak in cairo_set_scaled_font",
+	    "leak", /* keywords */
+	    NULL, /* requirements */
+	    1, 1,
+	    NULL, leaks_set_scaled_font)

_service:tar_scm:cairo-1.17.8.tar.xz/test/meson.build -> _service:tar_scm:cairo-1.18.0.tar.xz/test/meson.build Changed

@@ -124,6 +124,7 @@
   'device-offset-fractional.c',
   'device-offset-positive.c',
   'device-offset-scale.c',
+  'dithergradient.c',
   'error-setters.c',
   'extend-pad.c',
   'extend-pad-border.c',
@@ -190,6 +191,7 @@
   'large-source.c',
   'large-source-roi.c',
   'large-twin-antialias-mixed.c',
+  'leaks.c',
   'leaky-dash.c',
   'leaky-dashed-rectangle.c',
   'leaky-dashed-stroke.c',
@@ -452,6 +454,10 @@
   'pdf-tagged-text.c',
 
 
+test_pdf_structure_sources = 
+  'pdf-structure.c',
+
+
 test_ps_sources = 
   'ps-eps.c',
   'ps-features.c',
@@ -555,6 +561,9 @@
 
 if feature_conf.get('CAIRO_HAS_PDF_SURFACE', 0) == 1
   test_sources += test_pdf_sources
+  if host_machine.system() != 'windows'
+    test_sources += test_pdf_structure_sources
+  endif
   has_multipage_surfaces = true
   add_fallback_resolution = true
   build_any2ppm = true
@@ -653,7 +662,7 @@
 endforeach
 
 if build_machine.system() != 'windows'
-  run_command('ln', '-sf',
+  run_command('ln', '-sfn',
               meson.current_source_dir(),
               meson.current_build_dir() / 'srcdir',
               check: true)

_service:tar_scm:cairo-1.17.8.tar.xz/test/pattern-getters.c -> _service:tar_scm:cairo-1.18.0.tar.xz/test/pattern-getters.c Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/pdf-structure.c Added

@@ -0,0 +1,568 @@
+/*
+ * Copyright © 2023 Adrian Johnson
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author: Adrian Johnson <ajohnson@redneon.com>
+ */
+
+#include "cairo-test.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h> /* __unix__ */
+#endif
+
+#include <cairo.h>
+#include <cairo-pdf.h>
+
+/* Test PDF logical structure
+ */
+
+#define BASENAME "pdf-structure"
+
+#define PAGE_WIDTH 595
+#define PAGE_HEIGHT 842
+
+#define PDF_VERSION CAIRO_PDF_VERSION_1_4
+
+struct pdf_structure_test {
+    const char *name;
+    void (*func)(cairo_t *cr);
+};
+
+static void
+text(cairo_t *cr, const char *text)
+{
+    double x, y;
+
+    cairo_show_text (cr, text);
+    cairo_get_current_point (cr, &x, &y);
+    cairo_move_to (cr, 20, y + 15);
+}
+
+static void
+test_simple (cairo_t *cr)
+{
+    cairo_tag_begin (cr, "Document", NULL);
+
+    cairo_tag_begin (cr, "H", "");
+    text (cr, "Heading");
+    cairo_tag_end (cr, "H");
+
+    cairo_tag_begin (cr, "Sect", NULL);
+
+    cairo_tag_begin (cr, "P", "");
+    text (cr, "Para1");
+    text (cr, "Para2");
+    cairo_tag_end (cr, "P");
+
+    cairo_tag_begin (cr, "P", "");
+    text (cr, "Para3");
+
+    cairo_tag_begin (cr, "Note", "");
+    text (cr, "Note");
+    cairo_tag_end (cr, "Note");
+
+    text (cr, "Para4");
+    cairo_tag_end (cr, "P");
+
+    cairo_tag_end (cr, "Sect");
+
+    cairo_tag_end (cr, "Document");
+}
+
+static void
+test_simple_ref (cairo_t *cr)
+{
+    cairo_tag_begin (cr, CAIRO_TAG_CONTENT, "tag_name='H' id='heading'");
+    text (cr, "Heading");
+    cairo_tag_end (cr, CAIRO_TAG_CONTENT);
+
+    cairo_tag_begin (cr, CAIRO_TAG_CONTENT, "tag_name='P' id='para1'");
+    text (cr, "Para1");
+    text (cr, "Para2");
+    cairo_tag_end (cr, CAIRO_TAG_CONTENT);
+
+    cairo_tag_begin (cr, CAIRO_TAG_CONTENT, "tag_name='P' id='para2'");
+    text (cr, "Para3");
+    cairo_tag_end (cr, CAIRO_TAG_CONTENT);
+
+    cairo_tag_begin (cr, CAIRO_TAG_CONTENT, "tag_name='Note' id='note'");
+    text (cr, "Note");
+    cairo_tag_end (cr, CAIRO_TAG_CONTENT);
+
+    cairo_tag_begin (cr, CAIRO_TAG_CONTENT, "tag_name='P' id='para3'");
+    text (cr, "Para4");
+    cairo_tag_end (cr, CAIRO_TAG_CONTENT);
+
+    cairo_tag_begin (cr, "Document", NULL);
+
+    cairo_tag_begin (cr, "H", "");
+    cairo_tag_begin (cr, CAIRO_TAG_CONTENT_REF, "ref='heading'");
+    cairo_tag_end (cr, CAIRO_TAG_CONTENT_REF);
+    cairo_tag_end (cr, "H");
+
+    cairo_tag_begin (cr, "Sect", NULL);
+
+    cairo_tag_begin (cr, "P", "");
+    cairo_tag_begin (cr, CAIRO_TAG_CONTENT_REF, "ref='para1'");
+    cairo_tag_end (cr, CAIRO_TAG_CONTENT_REF);
+    cairo_tag_end (cr, "P");
+
+    cairo_tag_begin (cr, "P", "");
+
+    cairo_tag_begin (cr, CAIRO_TAG_CONTENT_REF, "ref='para2'");
+    cairo_tag_end (cr, CAIRO_TAG_CONTENT_REF);
+
+    cairo_tag_begin (cr, "Note", "");
+    cairo_tag_begin (cr, CAIRO_TAG_CONTENT_REF, "ref='note'");
+    cairo_tag_end (cr, CAIRO_TAG_CONTENT_REF);
+    cairo_tag_end (cr, "Note");
+
+    cairo_tag_begin (cr, CAIRO_TAG_CONTENT_REF, "ref='para3'");
+    cairo_tag_end (cr, CAIRO_TAG_CONTENT_REF);
+
+    cairo_tag_end (cr, "P");
+
+    cairo_tag_end (cr, "Sect");
+
+    cairo_tag_end (cr, "Document");
+}
+
+static void
+test_group (cairo_t *cr)
+{
+    cairo_tag_begin (cr, "Document", NULL);
+
+    cairo_tag_begin (cr, "H", "");
+    text (cr, "Heading");
+    cairo_tag_end (cr, "H");
+
+    cairo_tag_begin (cr, "Sect", NULL);
+
+    cairo_push_group (cr);
+
+    cairo_tag_begin (cr, "P", "");
+    text (cr, "Para1");
+    text (cr, "Para2");
+    cairo_tag_end (cr, "P");
+
+    cairo_pop_group_to_source (cr);
+    cairo_paint (cr);
+
+    cairo_tag_end (cr, "Sect");
+
+    cairo_tag_end (cr, "Document");
+}
+
+static void
+test_group_ref (cairo_t *cr)
+{
+    cairo_tag_begin (cr, CAIRO_TAG_CONTENT, "tag_name='H' id='heading'");
+    text (cr, "Heading");
+    cairo_tag_end (cr, CAIRO_TAG_CONTENT);
+
+    cairo_push_group (cr);
+
+    cairo_tag_begin (cr, CAIRO_TAG_CONTENT, "tag_name='P' id='para'");
+    text (cr, "Para1");
+    text (cr, "Para2");
+    cairo_tag_end (cr, CAIRO_TAG_CONTENT);
+
+    cairo_pop_group_to_source (cr);
+    cairo_paint (cr);
+
+    cairo_tag_begin (cr, "Document", NULL);
+
+    cairo_tag_begin (cr, "H", "");

_service:tar_scm:cairo-1.17.8.tar.xz/test/pdf-tagged-text.c -> _service:tar_scm:cairo-1.18.0.tar.xz/test/pdf-tagged-text.c Changed

@@ -149,7 +149,7 @@
 	*end = ' ';
 	if (text_extents.width + 2*MARGIN > PAGE_WIDTH) {
 	    int len = prev_end - begin;
-	    char *s = malloc (len);
+	    char *s = xmalloc (len);
 	    memcpy (s, begin, len);
 	    slen-1 = 0;
 	    paragraph_textparagraph_num_lines++ = s;
@@ -204,9 +204,9 @@
 static void
 draw_contents (cairo_surface_t *surface, cairo_t *cr, const struct section *section)
 {
-    char buf100;
+    char *attrib;
 
-    sprintf(buf, "dest='%s'", section->heading);
+    xasprintf (&attrib, "dest='%s'", section->heading);
     cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
     switch (section->level) {
 	case 0:
@@ -230,25 +230,26 @@
     cairo_set_source_rgb (cr, 0, 0, 1);
     cairo_tag_begin (cr, "TOCI", NULL);
     cairo_tag_begin (cr, "Reference", NULL);
-    cairo_tag_begin (cr, CAIRO_TAG_LINK, buf);
+    cairo_tag_begin (cr, CAIRO_TAG_LINK, attrib);
     cairo_show_text (cr, section->heading);
     cairo_tag_end (cr, CAIRO_TAG_LINK);
     cairo_tag_end (cr, "Reference");
     cairo_tag_end (cr, "TOCI");
     cairo_restore (cr);
     y_pos += HEADING_HEIGHT;
+    free (attrib);
 }
 
 static void
 draw_section (cairo_surface_t *surface, cairo_t *cr, const struct section *section)
 {
     int flags, i;
-    char buf100;
-    char buf2100;
+    char *name_attrib;
+    char *dest_attrib;
 
     cairo_tag_begin (cr, "Sect", NULL);
-    sprintf(buf, "name='%s'", section->heading);
-    sprintf(buf2, "dest='%s'", section->heading);
+    xasprintf(&name_attrib, "name='%s'", section->heading);
+    xasprintf(&dest_attrib, "dest='%s'", section->heading);
     cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
     if (section->level == 0) {
 	cairo_show_page (cr);
@@ -256,7 +257,7 @@
 	cairo_set_font_size(cr, HEADING1_SIZE);
 	cairo_move_to (cr, MARGIN, MARGIN);
 	cairo_tag_begin (cr, "H1", NULL);
-	cairo_tag_begin (cr, CAIRO_TAG_DEST, buf);
+	cairo_tag_begin (cr, CAIRO_TAG_DEST, name_attrib);
 	cairo_show_text (cr, section->heading);
 	cairo_tag_end (cr, CAIRO_TAG_DEST);
 	cairo_tag_end (cr, "H1");
@@ -265,7 +266,7 @@
 	outline_parents0 = cairo_pdf_surface_add_outline (surface,
 							    CAIRO_PDF_OUTLINE_ROOT,
 							    section->heading,
-							    buf2,
+							    dest_attrib,
 							    flags);
     } else {
 	if (section->level == 1) {
@@ -286,7 +287,7 @@
 	    cairo_tag_begin (cr, "H2", NULL);
 	else
 	    cairo_tag_begin (cr, "H3", NULL);
-	cairo_tag_begin (cr, CAIRO_TAG_DEST, buf);
+	cairo_tag_begin (cr, CAIRO_TAG_DEST, name_attrib);
 	cairo_show_text (cr, section->heading);
 	cairo_tag_end (cr, CAIRO_TAG_DEST);
 	if (section->level == 1)
@@ -297,7 +298,7 @@
 	outline_parentssection->level = cairo_pdf_surface_add_outline (surface,
 									 outline_parentssection->level - 1,
 									 section->heading,
-									 buf2,
+									 dest_attrib,
 									 flags);
     }
 
@@ -310,13 +311,15 @@
 	draw_paragraph (cr);
     }
     cairo_tag_end (cr, "Sect");
+    free (name_attrib);
+    free (dest_attrib);
 }
 
 static void
 draw_cover (cairo_surface_t *surface, cairo_t *cr)
 {
     cairo_text_extents_t text_extents;
-    char buf200;
+    char *attrib;
     cairo_rectangle_t url_box;
     const char *cairo_url = "https://www.cairographics.org/";
     const double url_box_margin = 20.0;
@@ -344,10 +347,11 @@
     url_box.height = -text_extents.height + 2*url_box_margin;
     cairo_rectangle(cr, url_box.x, url_box.y, url_box.width, url_box.height);
     cairo_stroke(cr);
-    snprintf(buf, sizeof(buf), "rect=%f %f %f %f uri=\'%s\'",
+    xasprintf(&attrib, "rect=%f %f %f %f uri=\'%s\'",
              url_box.x, url_box.y, url_box.width, url_box.height, cairo_url);
-    cairo_tag_begin (cr, CAIRO_TAG_LINK, buf);
+    cairo_tag_begin (cr, CAIRO_TAG_LINK, attrib);
     cairo_tag_end (cr, CAIRO_TAG_LINK);
+    free (attrib);
 
     /* Create link to not yet emmited page number */
     cairo_tag_begin (cr, CAIRO_TAG_LINK, "page=5");
@@ -419,6 +423,32 @@
     cairo_tag_begin (cr, CAIRO_TAG_LINK, "uri='http://127.0.0.1/' rect=10.0 -10.0 100.0 100.0");
     cairo_tag_end (cr, CAIRO_TAG_LINK);
 
+
+    /* Distilled from Mozilla bug https://bugzilla.mozilla.org/show_bug.cgi?id=1725743:
+     * attempting to emit a Destination tag within a pushed group will lead to an
+     * assertion in _cairo_pdf_interchange_end_structure_tag when processing a
+     * following LINK tag that is outside the pushed group.
+     */
+
+    /* PushLayer */
+    cairo_push_group_with_content (cr, CAIRO_CONTENT_COLOR_ALPHA);
+
+    /* Destination */
+    cairo_tag_begin (cr, CAIRO_TAG_DEST, "name='a' x=42 y=42");
+    cairo_tag_end (cr, CAIRO_TAG_DEST);
+
+    /* PopLayer */
+    cairo_pop_group_to_source (cr);
+    cairo_paint_with_alpha (cr, 1);
+    cairo_set_source_rgb (cr, 0, 0, 0);
+
+    /* Link */
+    cairo_tag_begin (cr, CAIRO_TAG_LINK, "rect=100 200 300 400 uri='http://127.0.0.1/'");
+    cairo_tag_end (cr, CAIRO_TAG_LINK);
+
+    /* End of extra Mozilla testcase. */
+
+
     cairo_show_page (cr);
 
     page_num = 0;
@@ -449,6 +479,8 @@
 
     cairo_show_page (cr);
 
+    cairo_set_source_rgb (cr, 0, 0, 1);
+
     cairo_tag_begin (cr, CAIRO_TAG_LINK, "dest='cover'");
     cairo_move_to (cr, PAGE_WIDTH/3, 2*PAGE_HEIGHT/5);
     cairo_show_text (cr, "link to cover");

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/big-line.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/big-line.ps.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/big-trap.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/bug-bo-collins.ps.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/bug-bo-rectangular.ps.xfail.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/bug-bo-rectangular.ps.xfail.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/bug-source-cu.ps.argb32.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/bug-source-cu.ps.argb32.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/bug-source-cu.ps.rgb24.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/bug-source-cu.ps.rgb24.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/clip-complex-shape-eo-aa.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/clip-complex-shape-eo-mono.ps.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/clip-disjoint-quad.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/clip-disjoint-quad.ps.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/clip-fill-rule-pixel-aligned.ps.argb32.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/clip-fill-rule-pixel-aligned.ps.argb32.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/clip-fill-rule-pixel-aligned.ps.rgb24.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/clip-fill-rule-pixel-aligned.ps.rgb24.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/clip-group-shapes-aligned-rectangles.ps.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/clip-rectilinear.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/clip-rectilinear.ps.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/copy-disjoint.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/dithergradient.image.argb32.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/dithergradient.image.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/dithergradient.image16.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/extended-blend-alpha-mask.svg.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/extended-blend-alpha.svg.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/extended-blend-alpha.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/extended-blend-mask.svg.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/extended-blend-mask.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/extended-blend.svg.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/extended-blend.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi144x144.pdf.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi144x144.pdf.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi144x144.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi144x144.ps.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi144x144.svg.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi144x144.svg.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi144x72.pdf.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi144x72.pdf.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi144x72.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi144x72.ps.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi144x72.svg.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi144x72.svg.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi288x288.pdf.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi288x288.pdf.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi288x288.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi288x288.ps.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi288x288.svg.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi288x288.svg.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi288x72.pdf.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi288x72.pdf.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi288x72.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi288x72.ps.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi288x72.svg.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi288x72.svg.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi576x576.pdf.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi576x576.pdf.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi576x576.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi576x576.ps.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi576x576.svg.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi576x576.svg.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi576x72.pdf.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi576x72.pdf.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi576x72.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi576x72.ps.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi576x72.svg.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi576x72.svg.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi72x144.pdf.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi72x144.pdf.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi72x144.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi72x144.ps.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi72x144.svg.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi72x144.svg.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi72x288.pdf.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi72x288.pdf.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi72x288.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi72x288.ps.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi72x288.svg.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi72x288.svg.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi72x576.pdf.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi72x576.pdf.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi72x576.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi72x576.ps.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi72x576.svg.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi72x576.svg.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi72x72.pdf.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi72x72.pdf.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi72x72.ps.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/fallback-resolution.ppi72x72.svg.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/fallback-resolution.ppi72x72.svg.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/ft-color-font.image16.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-color-font.image16.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/ft-color-font.pdf.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-color-font.pdf.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-color-font.ps2.argb32.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-color-font.ps2.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-color-font.ps3.argb32.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-color-font.ps3.rgb24.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/ft-color-font.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-color-font.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-color-font.script.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-cairo-logo.image16.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-cairo-logo.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-cairo-logo.ps.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-cairo-logo.script.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-cairo-logo.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-color.image16.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-color.pdf.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-color.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-color.ps.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-color.script.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-color.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-doc.image16.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-doc.pdf.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-doc.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-doc.ps.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-doc.script.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-doc.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-fill.image16.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-fill.pdf.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-fill.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-fill.ps.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-fill.script.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-fill.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-gradient.image16.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-gradient.pdf.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-gradient.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-gradient.ps.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-gradient.script.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-gradient.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-path.image16.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-path.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-path.ps.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-path.script.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-path.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-shapes.image16.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-shapes.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-shapes.ps.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-shapes.script.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-shapes.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-stroke.image16.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-stroke.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-stroke.ps.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-stroke.script.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-stroke.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-transform.image16.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-transform.pdf.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-transform.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-transform.ps.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-transform.script.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-transform.svg.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ft-svg-render-transform.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/implicit-close.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/implicit-close.ps.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/leaks-set-scaled-font.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/line-width-large-overlap-flipped.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/line-width-large-overlap-flopped.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/line-width-large-overlap-offset.ps.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/line-width-large-overlap-rotated.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/line-width-large-overlap-rotated.ps.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/line-width-large-overlap.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/linear-gradient-extend.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/linear-gradient-one-stop.ps.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/linear-gradient-one-stop.ps.rgb24.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/linear-gradient-one-stop.ps.rgb24.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/long-lines.ps.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/mask.svg.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/mask.svg.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/mask.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/paint-clip-fill-aa.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/paint-clip-fill-mono.ps.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/partial-clip-text-bottom.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/partial-clip-text-bottom.ps.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/partial-clip-text-left.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/partial-clip-text-left.ps.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/partial-clip-text-right.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/partial-clip-text-right.ps.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/pdf-structure-group-ref.ref.txt Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/pdf-structure-group.ref.txt Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/pdf-structure-multipage-group.ref.txt Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/pdf-structure-multipage-group2.ref.txt Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/pdf-structure-multipage-simple-ref.ref.txt Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/pdf-structure-multipage-simple.ref.txt Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/pdf-structure-repeated-group.ref.txt Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/pdf-structure-simple-ref.ref.txt Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/pdf-structure-simple.ref.txt Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/pdf-surface-source.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/pdf-surface-source.svg.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ps-surface-source.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/ps-surface-source.svg.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/pthread-same-source.svg.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/pthread-same-source.svg.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/pthread-show-text.ps.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/pthread-show-text.ps.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/record1414x-paint.ps.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/record1414x-paint.ps.rgb24.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/self-copy.ps2.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/self-copy.ps2.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/self-copy.ps3.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/self-copy.ps3.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/self-copy.svg.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/surface-pattern.quartz.xfail.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/surface-pattern.quartz.xfail.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/text-unhinted-metrics.xcb-fallback.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/text-unhinted-metrics.xcb.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/user-font-color.image16.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font-color.image16.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/user-font-color.pdf.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font-color.pdf.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font-color.ps2.argb32.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font-color.ps2.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font-color.ps3.argb32.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font-color.ps3.rgb24.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/user-font-color.quartz.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font-color.quartz.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/user-font-color.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font-color.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/user-font-color.script.xfail.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font-color.script.xfail.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/user-font-color.xcb.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font-color.xcb.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/user-font-color.xlib.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font-color.xlib.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/user-font-proxy.pdf.argb32.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font-proxy.pdf.argb32.ref.png Changed

_service:tar_scm:cairo-1.17.8.tar.xz/test/reference/user-font-proxy.pdf.rgb24.ref.png -> _service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font-proxy.pdf.rgb24.ref.png Changed

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font.pdf.xfail.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font.svg.argb32.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/user-font.svg.rgb24.ref.png Added

_service:tar_scm:cairo-1.18.0.tar.xz/test/reference/xlib-expose-event.svg.ref.png Added

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-fdr/meson.build -> _service:tar_scm:cairo-1.18.0.tar.xz/util/cairo-fdr/meson.build Changed

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-gobject/cairo-gobject-structs.c -> _service:tar_scm:cairo-1.18.0.tar.xz/util/cairo-gobject/cairo-gobject-structs.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-gobject/cairo-gobject.h -> _service:tar_scm:cairo-1.18.0.tar.xz/util/cairo-gobject/cairo-gobject.h Changed

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-gobject/meson.build -> _service:tar_scm:cairo-1.18.0.tar.xz/util/cairo-gobject/meson.build Changed

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-script/cairo-script-interpreter.c -> _service:tar_scm:cairo-1.18.0.tar.xz/util/cairo-script/cairo-script-interpreter.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-script/cairo-script-private.h -> _service:tar_scm:cairo-1.18.0.tar.xz/util/cairo-script/cairo-script-private.h Changed

@@ -97,28 +97,6 @@
 #endif
 
 
-#if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun)
-# define slim_hidden_proto(name)		slim_hidden_proto1(name, slim_hidden_int_name(name)) csi_private
-# define slim_hidden_proto_no_warn(name)	slim_hidden_proto1(name, slim_hidden_int_name(name)) csi_private_no_warn
-# define slim_hidden_def(name)			slim_hidden_def1(name, slim_hidden_int_name(name))
-# define slim_hidden_int_name(name) INT_##name
-# define slim_hidden_proto1(name, internal)				\
-  extern __typeof (name) name						\
-	__asm__ (slim_hidden_asmname (internal))
-# define slim_hidden_def1(name, internal)				\
-  extern __typeof (name) EXT_##name __asm__(slim_hidden_asmname(name))	\
-	__attribute__((__alias__(slim_hidden_asmname(internal))))
-# define slim_hidden_ulp		slim_hidden_ulp1(__USER_LABEL_PREFIX__)
-# define slim_hidden_ulp1(x)		slim_hidden_ulp2(x)
-# define slim_hidden_ulp2(x)		#x
-# define slim_hidden_asmname(name)	slim_hidden_asmname1(name)
-# define slim_hidden_asmname1(name)	slim_hidden_ulp #name
-#else
-# define slim_hidden_proto(name)		int _csi_dummy_prototype(void)
-# define slim_hidden_proto_no_warn(name)	int _csi_dummy_prototype(void)
-# define slim_hidden_def(name)			int _csi_dummy_prototype(void)
-#endif
-
 #if __GNUC__ >= 3
 #define csi_pure __attribute__((pure))
 #define csi_const __attribute__((const))
@@ -158,7 +136,6 @@
     (type *)((char *) (ptr) - (char *) &((type *)0)->member)
 #endif
 
-/* slim_internal.h */
 #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun)
 #define csi_private_no_warn	__attribute__((__visibility__("hidden")))
 #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
@@ -989,7 +966,4 @@
     return _csi_stack_push (ctx, &ctx->ostack, &obj);
 }
 
-slim_hidden_proto_no_warn (cairo_script_interpreter_destroy);
-slim_hidden_proto_no_warn (cairo_script_interpreter_reference);
-
 #endif /* CAIRO_SCRIPT_PRIVATE_H */

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-script/meson.build -> _service:tar_scm:cairo-1.18.0.tar.xz/util/cairo-script/meson.build Changed

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-trace/meson.build -> _service:tar_scm:cairo-1.18.0.tar.xz/util/cairo-trace/meson.build Changed

_service:tar_scm:cairo-1.17.8.tar.xz/util/cairo-trace/trace.c -> _service:tar_scm:cairo-1.18.0.tar.xz/util/cairo-trace/trace.c Changed

_service:tar_scm:cairo-1.17.8.tar.xz/util/meson.build -> _service:tar_scm:cairo-1.18.0.tar.xz/util/meson.build Changed

Changes of Revision 3