freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master ac2ea86: [bdf] Remove unused overflow storage.


From: Alexei Podtelezhnikov
Subject: [freetype2] master ac2ea86: [bdf] Remove unused overflow storage.
Date: Mon, 13 Aug 2018 21:33:39 -0400 (EDT)

branch: master
commit ac2ea865f3e019321f77f5c6b286ba1ddc6f6159
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    [bdf] Remove unused overflow storage.
    
    * src/bdf/bdf.h (bdf_glyphlist_t): Remove this type.
    (bdf_font_t): Remove `overflow' field.
    * src/bdf/bdflib.c (bdf_free_font): Remove `overflow' freeing.
---
 ChangeLog        |  8 ++++++++
 src/bdf/bdf.h    | 16 ----------------
 src/bdf/bdflib.c | 10 ----------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 227e94e..dddbe2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-08-14  Alexei Podtelezhnikov  <address@hidden>
+
+       [bdf] Remove unused overflow storage.
+
+       * src/bdf/bdf.h (bdf_glyphlist_t): Remove this type.
+       (bdf_font_t): Remove `overflow' field.
+       * src/bdf/bdflib.c (bdf_free_font): Remove `overflow' freeing.
+
 2018-08-14  Werner Lemberg  <address@hidden>
 
        [cff] Fix segv.
diff --git a/src/bdf/bdf.h b/src/bdf/bdf.h
index 45953ed..f27d2a5 100644
--- a/src/bdf/bdf.h
+++ b/src/bdf/bdf.h
@@ -158,20 +158,6 @@ FT_BEGIN_HEADER
   } bdf_glyph_t;
 
 
-  typedef struct  bdf_glyphlist_t_
-  {
-    unsigned short  pad;          /* Pad to 4-byte boundary.              */
-    unsigned short  bpp;          /* Bits per pixel.                      */
-    long            start;        /* Beginning encoding value of glyphs.  */
-    long            end;          /* Ending encoding value of glyphs.     */
-    bdf_glyph_t*    glyphs;       /* Glyphs themselves.                   */
-    unsigned long   glyphs_size;  /* Glyph structures allocated.          */
-    unsigned long   glyphs_used;  /* Glyph structures used.               */
-    bdf_bbx_t       bbx;          /* Overall bounding box of glyphs.      */
-
-  } bdf_glyphlist_t;
-
-
   typedef struct  bdf_font_t_
   {
     char*            name;           /* Name of the font.                   */
@@ -205,8 +191,6 @@ FT_BEGIN_HEADER
     char*            comments;       /* Font comments.                      */
     unsigned long    comments_len;   /* Length of comment string.           */
 
-    bdf_glyphlist_t  overflow;       /* Storage used for glyph insertion.   */
-
     void*            internal;       /* Internal data for the font.         */
 
     /* The size of the next two arrays must be in sync with the */
diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index d659c13..484739b 100644
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -2409,16 +2409,6 @@
     FT_FREE( font->glyphs );
     FT_FREE( font->unencoded );
 
-    /* Free up the overflow storage if it was used. */
-    for ( i = 0, glyphs = font->overflow.glyphs;
-          i < font->overflow.glyphs_used; i++, glyphs++ )
-    {
-      FT_FREE( glyphs->name );
-      FT_FREE( glyphs->bitmap );
-    }
-
-    FT_FREE( font->overflow.glyphs );
-
     /* bdf_cleanup */
     ft_hash_str_free( &(font->proptbl), memory );
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]