gimp r25998 - in branches/soc-2008-text: . app/text
- From: danedde svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r25998 - in branches/soc-2008-text: . app/text
- Date: Fri, 27 Jun 2008 22:54:38 +0000 (UTC)
Author: danedde
Date: Fri Jun 27 22:54:38 2008
New Revision: 25998
URL: http://svn.gnome.org/viewvc/gimp?rev=25998&view=rev
Log:
2008-06-28 Daniel Eddeland <danedde svn gnome org>
* app/text/gimptext-bitmap.c
* app/text/gimptext-private.h
* app/text/gimptext-bitmap.h
* app/text/gimptextlayer.c
* app/text/gimptextlayout.c
* app/text/gimptextlayout-render.c
* app/text/gimptext-vectors.c: minor beauty changes (spacing).
Modified:
branches/soc-2008-text/ChangeLog
branches/soc-2008-text/app/text/gimptext-bitmap.c
branches/soc-2008-text/app/text/gimptext-bitmap.h
branches/soc-2008-text/app/text/gimptext-private.h
branches/soc-2008-text/app/text/gimptext-vectors.c
branches/soc-2008-text/app/text/gimptextlayer.c
branches/soc-2008-text/app/text/gimptextlayout-render.c
branches/soc-2008-text/app/text/gimptextlayout.c
Modified: branches/soc-2008-text/app/text/gimptext-bitmap.c
==============================================================================
--- branches/soc-2008-text/app/text/gimptext-bitmap.c (original)
+++ branches/soc-2008-text/app/text/gimptext-bitmap.c Fri Jun 27 22:54:38 2008
@@ -38,17 +38,17 @@
#endif
void
-gimp_text_render_bitmap (PangoFont *font,
- PangoGlyph glyph,
+gimp_text_render_bitmap (PangoFont *font,
+ PangoGlyph glyph,
cairo_font_options_t *options,
- cairo_matrix_t *trafo,
- gint x,
- gint y,
- cairo_t *cr)
+ cairo_matrix_t *trafo,
+ gint x,
+ gint y,
+ cairo_t *cr)
{
cairo_scaled_font_t *cfont;
- cairo_glyph_t cglyph;
+ cairo_glyph_t cglyph;
cfont = pango_cairo_font_get_scaled_font ( (PangoCairoFont*) font);
Modified: branches/soc-2008-text/app/text/gimptext-bitmap.h
==============================================================================
--- branches/soc-2008-text/app/text/gimptext-bitmap.h (original)
+++ branches/soc-2008-text/app/text/gimptext-bitmap.h Fri Jun 27 22:54:38 2008
@@ -23,13 +23,13 @@
#define __GIMP_TEXT_BITMAP_H__
-void gimp_text_render_bitmap (PangoFont *font,
- PangoGlyph glyph,
+void gimp_text_render_bitmap (PangoFont *font,
+ PangoGlyph glyph,
cairo_font_options_t *options,
- cairo_matrix_t *trafo,
- gint x,
- gint y,
- cairo_t *cr);
+ cairo_matrix_t *trafo,
+ gint x,
+ gint y,
+ cairo_t *cr);
#endif /* __GIMP_TEXT_BITMAP_H__ */
Modified: branches/soc-2008-text/app/text/gimptext-private.h
==============================================================================
--- branches/soc-2008-text/app/text/gimptext-private.h (original)
+++ branches/soc-2008-text/app/text/gimptext-private.h Fri Jun 27 22:54:38 2008
@@ -44,13 +44,13 @@
};
-typedef void (* GimpTextRenderFunc) (PangoFont *font,
- PangoGlyph glyph,
+typedef void (* GimpTextRenderFunc) (PangoFont *font,
+ PangoGlyph glyph,
cairo_font_options_t *options,
- cairo_matrix_t *tranform,
- gint x,
- gint y,
- gpointer render_data);
+ cairo_matrix_t *tranform,
+ gint x,
+ gint y,
+ gpointer render_data);
#endif /* __GIMP_TEXT_LAYOUT_PRIVATE_H__ */
Modified: branches/soc-2008-text/app/text/gimptext-vectors.c
==============================================================================
--- branches/soc-2008-text/app/text/gimptext-vectors.c (original)
+++ branches/soc-2008-text/app/text/gimptext-vectors.c Fri Jun 27 22:54:38 2008
@@ -63,13 +63,13 @@
};
-static void gimp_text_render_vectors (PangoFont *font,
- PangoGlyph glyph,
+static void gimp_text_render_vectors (PangoFont *font,
+ PangoGlyph glyph,
cairo_font_options_t *options,
- cairo_matrix_t *cmatrix,
- gint x,
- gint y,
- RenderContext *context);
+ cairo_matrix_t *cmatrix,
+ gint x,
+ gint y,
+ RenderContext *context);
GimpVectors *
@@ -218,13 +218,13 @@
static void
-gimp_text_render_vectors (PangoFont *font,
- PangoGlyph pango_glyph,
+gimp_text_render_vectors (PangoFont *font,
+ PangoGlyph pango_glyph,
cairo_font_options_t *options,
- cairo_matrix_t *matrix,
- gint x,
- gint y,
- RenderContext *context)
+ cairo_matrix_t *matrix,
+ gint x,
+ gint y,
+ RenderContext *context)
{
const FT_Outline_Funcs outline_funcs =
{
@@ -238,9 +238,7 @@
FT_Face face;
FT_Glyph glyph;
-
- FT_Int32 flags;
-
+ FT_Int32 flags;
/*
* Since gimp is partly ported to pangocairo (but not fully) the flags are generated from a cairo_font_options_t like this.
@@ -269,7 +267,6 @@
context->offset_x = (gdouble) x / PANGO_SCALE;
context->offset_y = (gdouble) y / PANGO_SCALE;
-
FT_Outline_Decompose (&outline_glyph->outline, &outline_funcs, context);
}
Modified: branches/soc-2008-text/app/text/gimptextlayer.c
==============================================================================
--- branches/soc-2008-text/app/text/gimptextlayer.c (original)
+++ branches/soc-2008-text/app/text/gimptextlayer.c Fri Jun 27 22:54:38 2008
@@ -591,15 +591,15 @@
gimp_text_layer_render_layout (GimpTextLayer *layer,
GimpTextLayout *layout)
{
- GimpDrawable *drawable = GIMP_DRAWABLE (layer);
- GimpItem *item = GIMP_ITEM (layer);
- TileManager *mask;
- cairo_t *cr;
+ GimpDrawable *drawable = GIMP_DRAWABLE (layer);
+ GimpItem *item = GIMP_ITEM (layer);
+ TileManager *mask;
+ cairo_t *cr;
cairo_surface_t *surface;
- PixelRegion textPR;
- PixelRegion maskPR;
- gint i;
- gint width, height;
+ PixelRegion textPR;
+ PixelRegion maskPR;
+ gint i;
+ gint width, height;
gimp_drawable_fill (drawable, &layer->text->color, NULL);
Modified: branches/soc-2008-text/app/text/gimptextlayout-render.c
==============================================================================
--- branches/soc-2008-text/app/text/gimptextlayout-render.c (original)
+++ branches/soc-2008-text/app/text/gimptextlayout-render.c Fri Jun 27 22:54:38 2008
@@ -62,9 +62,9 @@
gint x,
gint y,
gpointer render_data);
-static cairo_font_options_t *gimp_text_layout_render_flags (GimpTextLayout *layout);
-static void gimp_text_layout_render_trafo (GimpTextLayout *layout,
- cairo_matrix_t *trafo);
+static cairo_font_options_t *gimp_text_layout_render_flags (GimpTextLayout *layout);
+static void gimp_text_layout_render_trafo (GimpTextLayout *layout,
+ cairo_matrix_t *trafo);
@@ -145,13 +145,13 @@
gint y,
gpointer render_data)
{
- PangoGlyphInfo *gi;
+ PangoGlyphInfo *gi;
cairo_font_options_t *flags;
- cairo_matrix_t trafo;
- double pos_x;
- double pos_y;
- gint i;
- gint x_position = 0;
+ cairo_matrix_t trafo;
+ double pos_x;
+ double pos_y;
+ gint i;
+ gint x_position = 0;
flags = gimp_text_layout_render_flags (layout);
gimp_text_layout_render_trafo (layout, &trafo);
@@ -178,7 +178,7 @@
static cairo_font_options_t *
gimp_text_layout_render_flags (GimpTextLayout *layout)
{
- GimpText *text = layout->text;
+ GimpText *text = layout->text;
cairo_font_options_t *flags;
flags = cairo_font_options_create ();
@@ -188,7 +188,7 @@
else
cairo_font_options_set_antialias (flags, CAIRO_ANTIALIAS_NONE);
/*
- * commented because there's no real autohint support in cairo as in ft2
+ * commented because there's no real autohint support in cairo like there is in ft2
if (text->autohint)
cairo_font_options_set_hint_style (flags, CAIRO_HINT_STYLE_DEFAULT);
*/
Modified: branches/soc-2008-text/app/text/gimptextlayout.c
==============================================================================
--- branches/soc-2008-text/app/text/gimptextlayout.c (original)
+++ branches/soc-2008-text/app/text/gimptextlayout.c Fri Jun 27 22:54:38 2008
@@ -308,7 +308,7 @@
gdouble xres,
gdouble yres)
{
- PangoContext *context;
+ PangoContext *context;
PangoCairoFontMap *fontmap;
fontmap = PANGO_CAIRO_FONT_MAP (pango_cairo_font_map_new ());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
