[cairo-commit] 2 commits - src/cairo-gl-private.h src/cairo-gl-surface.c util/cairo-trace

[Chris Wilson]

 src/cairo-gl-private.h   |    2 ++
 src/cairo-gl-surface.c   |    1 -
 util/cairo-trace/trace.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b7639a5f79eaecfbaf1710fc679c7be375638efd
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Aug 6 10:55:18 2009 +0100

    [trace] Close the dictionary before font
    
    font expects the dictionary to be constructed on the stack for its use, so
    close it. (I missed the closing '>>' when switching between dictionary
    constructors.)

diff --git a/util/cairo-trace/trace.c b/util/cairo-trace/trace.c
index fbcb3d7..c021d2d 100644
--- a/util/cairo-trace/trace.c
+++ b/util/cairo-trace/trace.c
@@ -3629,7 +3629,7 @@ cairo_ft_font_face_create_for_ft_face (FT_Face face, int load_flags)
 
 	_trace_printf ("<< /type 42 /source ");
 	_emit_data (data->data, data->size);
-	_trace_printf (" /index %lu /flags %d font\n",
+	_trace_printf (" /index %lu /flags %d >> font\n",
 		       data->index, load_flags);
 	_push_operand (FONT_FACE, ret);
 	_write_unlock ();
commit 19f54d872fcfa9801abee9c57e30c6b3fc7eef40
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Aug 6 10:40:32 2009 +0100

    [gl] Move hidden cairo_gl_surface_create() proto to header
    
    Make check-plt.sh happy

diff --git a/src/cairo-gl-private.h b/src/cairo-gl-private.h
index 110df34..8efab8f 100644
--- a/src/cairo-gl-private.h
+++ b/src/cairo-gl-private.h
@@ -212,4 +212,6 @@ _cairo_gl_y_flip (cairo_gl_surface_t *surface, int y)
 	return (surface->height - 1) - y;
 }
 
+slim_hidden_proto (cairo_gl_surface_create);
+
 #endif /* CAIRO_GL_PRIVATE_H */
diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
index 1668fbc..a8d02fe 100644
--- a/src/cairo-gl-surface.c
+++ b/src/cairo-gl-surface.c
@@ -41,7 +41,6 @@
 
 slim_hidden_proto (cairo_gl_context_reference);
 slim_hidden_proto (cairo_gl_context_destroy);
-slim_hidden_proto (cairo_gl_surface_create);
 
 #define ARRAY_SIZE(array) (sizeof (array) / sizeof (array[0]))