Some more cleanup.

2007-10-11  Behdad Esfahbod  <behdad@gnome.org>

        * pango/opentype/harfbuzz-buffer.c: Some more cleanup.

svn path=/trunk/; revision=2437

diff --git a/ChangeLog b/ChangeLog
index c7a42d3..68513fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-10-11  Behdad Esfahbod  <behdad@gnome.org>
 
+       * pango/opentype/harfbuzz-buffer.c: Some more cleanup.
+
+2007-10-11  Behdad Esfahbod  <behdad@gnome.org>
+
        * pango/opentype/harfbuzz-buffer.c: Move some code around.
 
 2007-10-11  Behdad Esfahbod  <behdad@gnome.org>

diff --git a/pango/opentype/harfbuzz-buffer.c b/pango/opentype/harfbuzz-buffer.c
index bca5002..382d6b5 100644 (file)
--- a/pango/opentype/harfbuzz-buffer.c
+++ b/pango/opentype/harfbuzz-buffer.c
@@ -111,20 +111,12 @@ hb_buffer_new( HB_Buffer *pbuffer )
   if ( ALLOC( buffer, sizeof( HB_BufferRec ) ) )
     return error;
 
-  /* not these ones */
   buffer->allocated = 0;
   buffer->in_string = NULL;
   buffer->alt_string = NULL;
   buffer->positions = NULL;
 
-  /* these should be reset when reusing buffer */
-  buffer->in_length = 0;
-  buffer->out_length = 0;
-  buffer->in_pos = 0;
-  buffer->out_pos = 0;
-  buffer->separate_out = FALSE;
-  buffer->out_string = buffer->in_string;
-  buffer->max_ligID = 0;
+  hb_buffer_clear( buffer );
 
   *pbuffer = buffer;
 
@@ -150,6 +142,7 @@ hb_buffer_clear( HB_Buffer buffer )
   buffer->out_pos = 0;
   buffer->out_string = buffer->in_string;
   buffer->separate_out = FALSE;
+  buffer->max_ligID = 0;
 }
 
 void