summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src/src/type42/t42objs.c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/type42/t42objs.c')
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/type42/t42objs.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/type42/t42objs.c b/Build/source/libs/freetype2/freetype-src/src/type42/t42objs.c
index 03955e945ba..6acfcdf4015 100644
--- a/Build/source/libs/freetype2/freetype-src/src/type42/t42objs.c
+++ b/Build/source/libs/freetype2/freetype-src/src/type42/t42objs.c
@@ -4,7 +4,7 @@
*
* Type 42 objects manager (body).
*
- * Copyright (C) 2002-2021 by
+ * Copyright (C) 2002-2020 by
* Roberto Alameda.
*
* This file is part of the FreeType project, and may only be used,
@@ -44,7 +44,7 @@
parser = &loader.parser;
- if ( FT_QALLOC( face->ttf_data, 12 ) )
+ if ( FT_ALLOC( face->ttf_data, 12 ) )
goto Exit;
/* while parsing the font we always update `face->ttf_size' so that */
@@ -510,8 +510,7 @@
error = FT_New_Size( t42face->ttf_face, &ttsize );
- if ( !error )
- t42size->ttsize = ttsize;
+ t42size->ttsize = ttsize;
FT_Activate_Size( ttsize );
@@ -583,7 +582,6 @@
FT_Face face = t42slot->face;
T42_Face t42face = (T42_Face)face;
FT_GlyphSlot ttslot;
- FT_Memory memory = face->memory;
FT_Error error = FT_Err_Ok;
@@ -595,15 +593,9 @@
else
{
error = FT_New_GlyphSlot( t42face->ttf_face, &ttslot );
- if ( !error )
- slot->ttslot = ttslot;
+ slot->ttslot = ttslot;
}
- /* share the loader so that the autohinter can see it */
- FT_GlyphLoader_Done( slot->ttslot->internal->loader );
- FT_FREE( slot->ttslot->internal );
- slot->ttslot->internal = t42slot->internal;
-
return error;
}
@@ -614,8 +606,6 @@
T42_GlyphSlot slot = (T42_GlyphSlot)t42slot;
- /* do not destroy the inherited internal structure just yet */
- slot->ttslot->internal = NULL;
FT_Done_GlyphSlot( slot->ttslot );
}