Attachment 4253 Details for Bug 5496 – Add 4 getter functions

[patch] Add 4 getter functions

cairo-5496.patch (text/plain), 3.12 KB, created by Carl Worth on 2006-01-06 11:22:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Worth

Created: 2006-01-06 11:22:08 UTC

Size: 3.12 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>RCS file: /mirrors/freedesktop/cairo/cairo/ChangeLog,v
>retrieving revision 1.1206
>diff -u -p -r1.1206 ChangeLog
>--- ChangeLog	5 Jan 2006 23:17:02 -0000	1.1206
>+++ ChangeLog	6 Jan 2006 00:20:22 -0000
>@@ -1,5 +1,13 @@
> 2006-01-05  Carl Worth  <cworth@cworth.org>
> 
>+	* src/cairo.h:
>+	* src/cairo-scaled-font.c: (cairo_scaled_font_get_font_face),
>+	(cairo_scaled_font_get_font_matrix), (cairo_scaled_font_get_ctm),
>+	(cairo_scaled_font_get_font_options): Add getter functions for
>+	cairo_scaled_font_t.
>+
>+2006-01-05  Carl Worth  <cworth@cworth.org>
>+
> 	* ROADMAP: Slip 1.2.0 projected data (again) out to
> 	2006-01-13. Note that win32 is now incorporated into the test
> 	suite and is only failing two tests (self-copy and
>Index: src/cairo-scaled-font.c
>===================================================================
>RCS file: /mirrors/freedesktop/cairo/cairo/src/cairo-scaled-font.c,v
>retrieving revision 1.9
>diff -u -p -r1.9 cairo-scaled-font.c
>--- src/cairo-scaled-font.c	16 Dec 2005 11:02:35 -0000	1.9
>+++ src/cairo-scaled-font.c	6 Jan 2006 00:18:56 -0000
>@@ -1191,3 +1191,48 @@ _cairo_scaled_glyph_lookup (cairo_scaled
> 
>     return status;
> }
>+
>+cairo_font_face_t *
>+cairo_scaled_font_get_font_face (cairo_scaled_font_t *scaled_font)
>+{
>+    if (scaled_font->status)
>+	return (cairo_font_face_t*) &_cairo_font_face_nil;
>+
>+    return scaled_font->font_face;
>+}
>+
>+void
>+cairo_scaled_font_get_font_matrix (cairo_scaled_font_t	*scaled_font,
>+				   cairo_matrix_t	*font_matrix)
>+{
>+    if (scaled_font->status) {
>+	cairo_matrix_init_identity (font_matrix);
>+	return;
>+    }
>+
>+    *font_matrix = scaled_font->font_matrix;
>+}
>+
>+void
>+cairo_scaled_font_get_ctm (cairo_scaled_font_t	*scaled_font,
>+			   cairo_matrix_t	*ctm)
>+{
>+    if (scaled_font->status) {
>+	cairo_matrix_init_identity (ctm);
>+	return;
>+    }
>+
>+    *ctm = scaled_font->ctm;
>+}
>+
>+void
>+cairo_scaled_font_get_font_options (cairo_scaled_font_t		*scaled_font,
>+				    cairo_font_options_t	*options)
>+{
>+    if (scaled_font->status) {
>+	_cairo_font_options_init_default (options);
>+	return;
>+    }
>+
>+    _cairo_font_options_init_copy (options, &scaled_font->options);
>+}
>Index: src/cairo.h
>===================================================================
>RCS file: /mirrors/freedesktop/cairo/cairo/src/cairo.h,v
>retrieving revision 1.155
>diff -u -p -r1.155 cairo.h
>--- src/cairo.h	10 Oct 2005 19:45:15 -0000	1.155
>+++ src/cairo.h	6 Jan 2006 00:18:01 -0000
>@@ -933,6 +933,21 @@ cairo_scaled_font_glyph_extents (cairo_s
> 				 int                   num_glyphs,
> 				 cairo_text_extents_t  *extents);
> 
>+cairo_public cairo_font_face_t *
>+cairo_scaled_font_get_font_face (cairo_scaled_font_t *scaled_font);
>+
>+cairo_public void
>+cairo_scaled_font_get_font_matrix (cairo_scaled_font_t	*scaled_font,
>+				   cairo_matrix_t	*font_matrix);
>+
>+cairo_public void
>+cairo_scaled_font_get_ctm (cairo_scaled_font_t	*scaled_font,
>+			   cairo_matrix_t	*ctm);
>+
>+cairo_public void
>+cairo_scaled_font_get_font_options (cairo_scaled_font_t		*scaled_font,
>+				    cairo_font_options_t	*options);
>+
> /* Query functions */
> 
> cairo_public cairo_operator_t

Actions: View | Splinter Review

Attachments on bug 5496: 4253

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