summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2005-07-22 18:03:58 +0000
committerOwen Taylor <otaylor@src.gnome.org>2005-07-22 18:03:58 +0000
commit987e1804f4b3b4bed7bd6a06f00a85bc9844ee64 (patch)
treed9ddbd409773091e3fdbff21eb1609182c2b3c45
parent254e90a4e6d88a49f652a58608228e8ae9606960 (diff)
downloadpango-987e1804f4b3b4bed7bd6a06f00a85bc9844ee64.tar.gz
Remove an unecessary set of block2.
2005-07-22 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftglue.c (ftglue_realloc): Remove an unecessary set of block2.
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--pango/opentype/ftglue.c1
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b1a971d..124dec1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-07-22 Owen Taylor <otaylor@redhat.com>
+ * pango/opentype/ftglue.c (ftglue_realloc): Remove
+ an unecessary set of block2.
+
+2005-07-22 Owen Taylor <otaylor@redhat.com>
+
Patch from David Turner. Review and testing by Behdad Esfahbod
* pango/opentype/ftglue.[ch] Makefile.am: Glue layer that provides
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 8b1a971d..124dec1f 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,5 +1,10 @@
2005-07-22 Owen Taylor <otaylor@redhat.com>
+ * pango/opentype/ftglue.c (ftglue_realloc): Remove
+ an unecessary set of block2.
+
+2005-07-22 Owen Taylor <otaylor@redhat.com>
+
Patch from David Turner. Review and testing by Behdad Esfahbod
* pango/opentype/ftglue.[ch] Makefile.am: Glue layer that provides
diff --git a/pango/opentype/ftglue.c b/pango/opentype/ftglue.c
index 3ffedeb9..ebddfa74 100644
--- a/pango/opentype/ftglue.c
+++ b/pango/opentype/ftglue.c
@@ -91,7 +91,6 @@ ftglue_realloc( FT_Memory memory,
else if ( new_size == 0 )
{
ftglue_free( memory, block );
- block2 = NULL;
}
else
{