[cairo-commit] 2 commits - src/cairo-quartz-font.c

[Jeff Muizelaar]

 src/cairo-quartz-font.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e3675f8ac0acb285b2d669c0a44322623dac5fe9
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date:   Fri Dec 19 08:50:26 2008 -0500

    Fix definition of _cairo_quartz_font_face_backend
    
    Removes the NULL so that _cairo_quartz_font_face_scaled_font_create
    is in the correct location.

diff --git a/src/cairo-quartz-font.c b/src/cairo-quartz-font.c
index b439541..63f050c 100644
--- a/src/cairo-quartz-font.c
+++ b/src/cairo-quartz-font.c
@@ -299,7 +299,6 @@ const cairo_font_face_backend_t _cairo_quartz_font_face_backend = {
     CAIRO_FONT_TYPE_QUARTZ,
     _cairo_quartz_font_face_create_for_toy,
     _cairo_quartz_font_face_destroy,
-    NULL, /* direct implementation */
     _cairo_quartz_font_face_scaled_font_create
 };
 
commit fa7d96e1236cdfa0016f96e5c7b6bd209c405cba
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date:   Fri Dec 19 08:47:07 2008 -0500

    Fix compilation of quartz surface.
    
    Declares _cairo_quartz_scaled_font_backend ahead of time and makes it static.
    Also, removes the 'static' from the _cairo_quartz_font_backend definition.

diff --git a/src/cairo-quartz-font.c b/src/cairo-quartz-font.c
index a54dacd..b439541 100644
--- a/src/cairo-quartz-font.c
+++ b/src/cairo-quartz-font.c
@@ -210,6 +210,8 @@ _cairo_quartz_font_face_destroy (void *abstract_face)
     CGFontRelease (font_face->cgFont);
 }
 
+static const cairo_scaled_font_backend_t _cairo_quartz_scaled_font_backend;
+
 static cairo_status_t
 _cairo_quartz_font_face_scaled_font_create (void *abstract_face,
 					    const cairo_matrix_t *font_matrix,
@@ -293,7 +295,7 @@ FINISH:
     return status;
 }
 
-static const cairo_font_face_backend_t _cairo_quartz_font_face_backend = {
+const cairo_font_face_backend_t _cairo_quartz_font_face_backend = {
     CAIRO_FONT_TYPE_QUARTZ,
     _cairo_quartz_font_face_create_for_toy,
     _cairo_quartz_font_face_destroy,
@@ -723,7 +725,7 @@ _cairo_quartz_ucs4_to_index (void *abstract_font,
     return glyph;
 }
 
-const cairo_scaled_font_backend_t _cairo_quartz_scaled_font_backend = {
+static const cairo_scaled_font_backend_t _cairo_quartz_scaled_font_backend = {
     CAIRO_FONT_TYPE_QUARTZ,
     _cairo_quartz_scaled_font_fini,
     _cairo_quartz_scaled_glyph_init,