diff --git a/clutter/clutter/pango/clutter-pango-display-list.h b/clutter/clutter/pango/clutter-pango-display-list.h index 086ed4910..046a13589 100644 --- a/clutter/clutter/pango/clutter-pango-display-list.h +++ b/clutter/clutter/pango/clutter-pango-display-list.h @@ -38,52 +38,44 @@ G_BEGIN_DECLS typedef struct _ClutterPangoDisplayList ClutterPangoDisplayList; -ClutterPangoDisplayList * -clutter_pango_display_list_new (ClutterPangoPipelineCache *pipeline_cache); +ClutterPangoDisplayList * clutter_pango_display_list_new (ClutterPangoPipelineCache *pipeline_cache); -void -clutter_pango_display_list_set_color_override (ClutterPangoDisplayList *dl, - const CoglColor *color); +void clutter_pango_display_list_set_color_override (ClutterPangoDisplayList *dl, + const CoglColor *color); -void -clutter_pango_display_list_remove_color_override (ClutterPangoDisplayList *dl); +void clutter_pango_display_list_remove_color_override (ClutterPangoDisplayList *dl); -void -clutter_pango_display_list_add_texture (ClutterPangoDisplayList *dl, - CoglTexture *texture, - float x_1, - float y_1, - float x_2, - float y_2, - float tx_1, - float ty_1, - float tx_2, - float ty_2); +void clutter_pango_display_list_add_texture (ClutterPangoDisplayList *dl, + CoglTexture *texture, + float x_1, + float y_1, + float x_2, + float y_2, + float tx_1, + float ty_1, + float tx_2, + float ty_2); -void -clutter_pango_display_list_add_rectangle (ClutterPangoDisplayList *dl, - float x_1, - float y_1, - float x_2, - float y_2); +void clutter_pango_display_list_add_rectangle (ClutterPangoDisplayList *dl, + float x_1, + float y_1, + float x_2, + float y_2); -void -clutter_pango_display_list_add_trapezoid (ClutterPangoDisplayList *dl, - float y_1, - float x_11, - float x_21, - float y_2, - float x_12, - float x_22); +void clutter_pango_display_list_add_trapezoid (ClutterPangoDisplayList *dl, + float y_1, + float x_11, + float x_21, + float y_2, + float x_12, + float x_22); -void -clutter_pango_display_list_render (CoglFramebuffer *framebuffer, - ClutterPangoDisplayList *dl, - ClutterColorState *color_state, - ClutterColorState *target_color_state, - const CoglColor *color); +void clutter_pango_display_list_render (CoglFramebuffer *framebuffer, + ClutterPangoDisplayList *dl, + ClutterColorState *color_state, + ClutterColorState *target_color_state, + const CoglColor *color); -void -clutter_pango_display_list_free (ClutterPangoDisplayList *dl); +void clutter_pango_display_list_free (ClutterPangoDisplayList *dl); G_END_DECLS diff --git a/clutter/clutter/pango/clutter-pango-glyph-cache.h b/clutter/clutter/pango/clutter-pango-glyph-cache.h index d7c8d3d39..ddf212b0b 100644 --- a/clutter/clutter/pango/clutter-pango-glyph-cache.h +++ b/clutter/clutter/pango/clutter-pango-glyph-cache.h @@ -61,30 +61,24 @@ typedef struct guint has_color : 1; } PangoGlyphCacheValue; -ClutterPangoGlyphCache * -clutter_pango_glyph_cache_new (CoglContext *ctx); +ClutterPangoGlyphCache * clutter_pango_glyph_cache_new (CoglContext *ctx); -void -clutter_pango_glyph_cache_free (ClutterPangoGlyphCache *cache); +void clutter_pango_glyph_cache_free (ClutterPangoGlyphCache *cache); -PangoGlyphCacheValue * -clutter_pango_glyph_cache_lookup (ClutterPangoGlyphCache *cache, - CoglContext *context, - gboolean create, - PangoFont *font, - PangoGlyph glyph); +PangoGlyphCacheValue * clutter_pango_glyph_cache_lookup (ClutterPangoGlyphCache *cache, + CoglContext *context, + gboolean create, + PangoFont *font, + PangoGlyph glyph); -void -clutter_pango_glyph_cache_add_reorganize_callback (ClutterPangoGlyphCache *cache, - GHookFunc func, - void *user_data); +void clutter_pango_glyph_cache_add_reorganize_callback (ClutterPangoGlyphCache *cache, + GHookFunc func, + void *user_data); -void -clutter_pango_glyph_cache_remove_reorganize_callback (ClutterPangoGlyphCache *cache, - GHookFunc func, - void *user_data); +void clutter_pango_glyph_cache_remove_reorganize_callback (ClutterPangoGlyphCache *cache, + GHookFunc func, + void *user_data); -void -clutter_pango_glyph_cache_set_dirty_glyphs (ClutterPangoGlyphCache *cache); +void clutter_pango_glyph_cache_set_dirty_glyphs (ClutterPangoGlyphCache *cache); G_END_DECLS diff --git a/clutter/clutter/pango/clutter-pango-pipeline-cache.h b/clutter/clutter/pango/clutter-pango-pipeline-cache.h index 2133bd0d2..1007378b7 100644 --- a/clutter/clutter/pango/clutter-pango-pipeline-cache.h +++ b/clutter/clutter/pango/clutter-pango-pipeline-cache.h @@ -50,17 +50,14 @@ typedef struct } ClutterPangoPipelineCache; -ClutterPangoPipelineCache * -clutter_pango_pipeline_cache_new (CoglContext *ctx); +ClutterPangoPipelineCache * clutter_pango_pipeline_cache_new (CoglContext *ctx); /* Returns a pipeline that can be used to render glyphs in the given texture. The pipeline has a new reference so it is up to the caller to unref it */ -CoglPipeline * -clutter_pango_pipeline_cache_get (ClutterPangoPipelineCache *cache, - CoglTexture *texture); +CoglPipeline * clutter_pango_pipeline_cache_get (ClutterPangoPipelineCache *cache, + CoglTexture *texture); -void -clutter_pango_pipeline_cache_free (ClutterPangoPipelineCache *cache); +void clutter_pango_pipeline_cache_free (ClutterPangoPipelineCache *cache); G_END_DECLS diff --git a/clutter/clutter/pango/clutter-pango-private.h b/clutter/clutter/pango/clutter-pango-private.h index ff43a304d..e5b03b722 100644 --- a/clutter/clutter/pango/clutter-pango-private.h +++ b/clutter/clutter/pango/clutter-pango-private.h @@ -42,8 +42,7 @@ G_BEGIN_DECLS -PangoRenderer * -clutter_pango_renderer_new (CoglContext *context); +PangoRenderer * clutter_pango_renderer_new (CoglContext *context); /** * clutter_ensure_glyph_cache_for_layout: @@ -55,8 +54,7 @@ clutter_pango_renderer_new (CoglContext *context); * This api should be used to avoid mid-scene modifications of * glyph-cache textures which can lead to undefined rendering results. */ -void -clutter_ensure_glyph_cache_for_layout (PangoLayout *layout); +void clutter_ensure_glyph_cache_for_layout (PangoLayout *layout); /** * clutter_show_layout: (skip) @@ -69,14 +67,13 @@ clutter_ensure_glyph_cache_for_layout (PangoLayout *layout); * Draws a solidly coloured @layout on the given @framebuffer at (@x, * @y) within the `framebuffer`'s current model-view coordinate space. */ -void -clutter_show_layout (CoglFramebuffer *framebuffer, - PangoLayout *layout, - float x, - float y, - const CoglColor *color, - ClutterColorState *color_state, - ClutterColorState *target_color_state); +void clutter_show_layout (CoglFramebuffer *framebuffer, + PangoLayout *layout, + float x, + float y, + const CoglColor *color, + ClutterColorState *color_state, + ClutterColorState *target_color_state); G_DEFINE_AUTOPTR_CLEANUP_FUNC (PangoRenderer, g_object_unref)