summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src/src/bdf
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/bdf')
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/bdf/bdfdrivr.c4
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/bdf/bdflib.c15
2 files changed, 5 insertions, 14 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/bdf/bdfdrivr.c b/Build/source/libs/freetype2/freetype-src/src/bdf/bdfdrivr.c
index e02a1609306..4b9d6347fa9 100644
--- a/Build/source/libs/freetype2/freetype-src/src/bdf/bdfdrivr.c
+++ b/Build/source/libs/freetype2/freetype-src/src/bdf/bdfdrivr.c
@@ -780,8 +780,8 @@ THE SOFTWARE.
FT_UInt glyph_index,
FT_Int32 load_flags )
{
- BDF_Face bdf = (BDF_Face)FT_SIZE_FACE( size );
- FT_Face face = FT_FACE( bdf );
+ FT_Face face = size->face;
+ BDF_Face bdf = (BDF_Face)face;
FT_Error error = FT_Err_Ok;
FT_Bitmap* bitmap = &slot->bitmap;
bdf_glyph_t glyph;
diff --git a/Build/source/libs/freetype2/freetype-src/src/bdf/bdflib.c b/Build/source/libs/freetype2/freetype-src/src/bdf/bdflib.c
index 0fa7e0a8c5f..813a4d839ca 100644
--- a/Build/source/libs/freetype2/freetype-src/src/bdf/bdflib.c
+++ b/Build/source/libs/freetype2/freetype-src/src/bdf/bdflib.c
@@ -864,15 +864,9 @@
p = font->user_props + font->nuser_props;
- n = ft_strlen( name ) + 1;
- if ( n > FT_LONG_MAX )
- return FT_THROW( Invalid_Argument );
-
- if ( FT_QALLOC( p->name, n ) )
+ if ( FT_STRDUP( p->name, name ) )
goto Exit;
- FT_MEM_COPY( (char *)p->name, name, n );
-
p->format = format;
p->builtin = 0;
p->value.atom = NULL; /* nothing is ever stored here */
@@ -1442,11 +1436,9 @@
goto Exit;
}
- if ( FT_QALLOC( p->glyph_name, slen + 1 ) )
+ if ( FT_DUP( p->glyph_name, s, slen + 1 ) )
goto Exit;
- FT_MEM_COPY( p->glyph_name, s, slen + 1 );
-
p->flags |= BDF_GLYPH_;
FT_TRACE4(( DBGMSG1, lineno, s ));
@@ -2051,9 +2043,8 @@
/* Allowing multiple `FONT' lines (which is invalid) doesn't hurt... */
FT_FREE( p->font->name );
- if ( FT_QALLOC( p->font->name, slen + 1 ) )
+ if ( FT_DUP( p->font->name, s, slen + 1 ) )
goto Exit;
- FT_MEM_COPY( p->font->name, s, slen + 1 );
/* If the font name is an XLFD name, set the spacing to the one in */
/* the font name. If there is no spacing fall back on the default. */