Switch GlyphStrings to have a single array of PangoGlyphInfo instead of

Sat Jan 15 03:17:35 2000  Owen Taylor  <otaylor@redhat.com>

	* pango/glyphstring.c pango/mapping.c pango/pangox.c
	  modules/basic.c examples/viewer.c:

	  Switch GlyphStrings to have a single array of
	  PangoGlyphInfo instead of multiple arrays. Rename
	  PangoGlyphIndex to PangoGlyph.

1 files changed, 1 insertions, 7 deletions

diff --git a/pango/glyphstring.c b/pango/glyphstring.c
index 82d7d440..a7cc9cea 100644
--- a/pango/glyphstring.c
+++ b/pango/glyphstring.c
@@ -37,8 +37,6 @@ pango_glyph_string_new (void)
   string->num_glyphs = 0;
   string->space = 0;
   string->glyphs = NULL;
-  string->geometry = NULL;
-  string->attrs = NULL;
   string->log_clusters = NULL;
 
   return string;
@@ -67,9 +65,7 @@ pango_glyph_string_set_size (PangoGlyphString *string, gint new_len)
 	string->space = G_MAXINT;
     }
   
-  string->glyphs = g_realloc (string->glyphs, string->space * sizeof (PangoGlyph));
-  string->geometry = g_realloc (string->geometry, string->space * sizeof (PangoGlyphGeometry));
-  string->attrs = g_realloc (string->attrs, string->space * sizeof (PangoGlyphVisAttr));
+  string->glyphs = g_realloc (string->glyphs, string->space * sizeof (PangoGlyphInfo));
   string->log_clusters = g_realloc (string->log_clusters, string->space * sizeof (gint));
   string->num_glyphs = new_len;
 }
@@ -84,8 +80,6 @@ void
 pango_glyph_string_free (PangoGlyphString *string)
 {
   g_free (string->glyphs);
-  g_free (string->geometry);
-  g_free (string->attrs);
   g_free (string->log_clusters);
   g_free (string);
 }