Remove unnecessary 'static' in type definition that causes a relocation.

2006-09-13  Behdad Esfahbod  <behdad@gnome.org>

        * pango/pango-engine.h: Remove unnecessary 'static' in type definition
        that causes a relocation.

        * pango/shape.c (pango_shape): Make sure last_cluster is invalid.

diff --git a/ChangeLog b/ChangeLog
index c48d1cd..31b33f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-09-13  Behdad Esfahbod  <behdad@gnome.org>
 
+       * pango/pango-engine.h: Remove unnecessary 'static' in type definition
+       that causes a relocation.
+
+       * pango/shape.c (pango_shape): Make sure last_cluster is invalid.
+
+2006-09-13  Behdad Esfahbod  <behdad@gnome.org>
+
        Part of Bug 355782 – Misaligned extents in pango
 
        * pango/pango-layout.c (cluster_width): Rewrite based on

diff --git a/pango/pango-engine.h b/pango/pango-engine.h
index 2bd80c9..44ae681 100644 (file)
--- a/pango/pango-engine.h
+++ b/pango/pango-engine.h
@@ -270,7 +270,7 @@ static GType prefix ## _type;                                                 \
 static void                                                              \
 prefix ## _register_type (GTypeModule *module)                           \
 {                                                                        \
-  static const GTypeInfo object_info =                                   \
+  const GTypeInfo object_info =                                                  \
     {                                                                    \
       sizeof (name ## Class),                                            \
       (GBaseInitFunc) NULL,                                              \

diff --git a/pango/shape.c b/pango/shape.c
index 96abd21..fc165fb 100644 (file)
--- a/pango/shape.c
+++ b/pango/shape.c
@@ -44,7 +44,7 @@ pango_shape (const gchar      *text,
              PangoGlyphString *glyphs)
 {
   int i;
-  int last_cluster = -1;
+  int last_cluster;
 
   if (G_LIKELY (PANGO_IS_ENGINE_SHAPE (analysis->shape_engine) && PANGO_IS_FONT (analysis->font)))
     {
@@ -109,6 +109,8 @@ pango_shape (const gchar      *text,
                                 text, length, analysis, glyphs);
     }
 
+  /* make sure last_cluster is invalid */
+  last_cluster = glyphs->log_clusters[0] - 1;
   for (i = 0; i < glyphs->num_glyphs; i++)
     {
      /* Set glyphs[i].attr.is_cluster_start based on log_clusters[]