freetype-commit
[Top][All Lists]
Advanced

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

[freetype2] master a0fb6db: [pcf, bdf, winfonts] s/FT_ALLOC/FT_QALLOC/ f


From: Werner Lemberg
Subject: [freetype2] master a0fb6db: [pcf, bdf, winfonts] s/FT_ALLOC/FT_QALLOC/ for initialized buffers.
Date: Fri, 23 Apr 2021 00:06:39 -0400 (EDT)

branch: master
commit a0fb6dbcd9ecac640fd34d97cf332c32df7465af
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    [pcf,bdf,winfonts] s/FT_ALLOC/FT_QALLOC/ for initialized buffers.
    
    * src/pcf/pcfread.c (pcf_interpret_style): Do not zero out the buffer.
    * src/bdf/bdfdrivr.c (bdf_interpret_style): Ditto.
    * src/winfonts/winfnt.c (FNT_Face_Init, FNT_Load_Glyph): Ditto.
---
 ChangeLog             | 8 ++++++++
 src/bdf/bdfdrivr.c    | 2 +-
 src/pcf/pcfread.c     | 2 +-
 src/winfonts/winfnt.c | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2cf4c53..a94e831 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-04-23  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+       [pcf,bdf,winfonts] s/FT_ALLOC/FT_QALLOC/ for initialized buffers.
+
+       * src/pcf/pcfread.c (pcf_interpret_style): Do not zero out the buffer.
+       * src/bdf/bdfdrivr.c (bdf_interpret_style): Ditto.
+       * src/winfonts/winfnt.c (FNT_Face_Init, FNT_Load_Glyph): Ditto.
+
 2021-04-22  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
        [cache] Optimize SBit copying.
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
index d29188b..f94ebbe 100644
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -276,7 +276,7 @@ THE SOFTWARE.
       char*  s;
 
 
-      if ( FT_ALLOC( face->style_name, len ) )
+      if ( FT_QALLOC( face->style_name, len ) )
         return error;
 
       s = face->style_name;
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index 2cad854..737fbce 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -1368,7 +1368,7 @@ THE SOFTWARE.
       char*  s;
 
 
-      if ( FT_ALLOC( face->style_name, len ) )
+      if ( FT_QALLOC( face->style_name, len ) )
         return error;
 
       s = face->style_name;
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 17b068f..1d52bb6 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -888,7 +888,7 @@
       /* NULL byte -- the frame is erroneously one byte too small.  */
       /* We thus allocate one more byte, setting it explicitly to   */
       /* zero.                                                      */
-      if ( FT_ALLOC( font->family_name, family_size + 1 ) )
+      if ( FT_QALLOC( font->family_name, family_size + 1 ) )
         goto Fail;
 
       FT_MEM_COPY( font->family_name,
@@ -1094,7 +1094,7 @@
 
       /* note: since glyphs are stored in columns and not in rows we */
       /*       can't use ft_glyphslot_set_bitmap                     */
-      if ( FT_ALLOC_MULT( bitmap->buffer, bitmap->rows, pitch ) )
+      if ( FT_QALLOC_MULT( bitmap->buffer, bitmap->rows, pitch ) )
         goto Exit;
 
       column = (FT_Byte*)bitmap->buffer;



reply via email to

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