summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src/src/psaux/psobjs.c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/psaux/psobjs.c')
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/psaux/psobjs.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/psaux/psobjs.c b/Build/source/libs/freetype2/freetype-src/src/psaux/psobjs.c
index 30f501916a6..defc4d4fcee 100644
--- a/Build/source/libs/freetype2/freetype-src/src/psaux/psobjs.c
+++ b/Build/source/libs/freetype2/freetype-src/src/psaux/psobjs.c
@@ -4,7 +4,7 @@
*
* Auxiliary functions for PostScript fonts (body).
*
- * Copyright (C) 1996-2021 by
+ * Copyright (C) 1996-2020 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
@@ -251,7 +251,7 @@
if ( !old_base )
return;
- if ( FT_QALLOC( table->block, table->cursor ) )
+ if ( FT_ALLOC( table->block, table->cursor ) )
return;
FT_MEM_COPY( table->block, old_base, table->cursor );
shift_elements( table, old_base );
@@ -595,10 +595,10 @@
if ( cur < limit && cur == parser->cursor )
{
FT_ERROR(( "ps_parser_skip_PS_token:"
- " current token is `%c' which is self-delimiting\n",
+ " current token is `%c' which is self-delimiting\n"
+ " "
+ " but invalid at this point\n",
*cur ));
- FT_ERROR(( " "
- " but invalid at this point\n" ));
error = FT_THROW( Invalid_File_Format );
}
@@ -979,7 +979,7 @@
}
len = (FT_UInt)( cur - *cursor );
- if ( cur >= limit || FT_QALLOC( result, len + 1 ) )
+ if ( cur >= limit || FT_ALLOC( result, len + 1 ) )
return 0;
/* now copy the string */
@@ -1175,8 +1175,8 @@
else
{
FT_ERROR(( "ps_parser_load_field:"
- " expected a name or string\n" ));
- FT_ERROR(( " "
+ " expected a name or string\n"
+ " "
" but found token of type %d instead\n",
token.type ));
error = FT_THROW( Invalid_File_Format );
@@ -1193,7 +1193,7 @@
*(FT_String**)q = NULL;
}
- if ( FT_QALLOC( string, len + 1 ) )
+ if ( FT_ALLOC( string, len + 1 ) )
goto Exit;
FT_MEM_COPY( string, cur, len );
@@ -1248,7 +1248,7 @@
FT_UInt i;
- if ( FT_QNEW_ARRAY( temp, max_objects * 4 ) )
+ if ( FT_NEW_ARRAY( temp, max_objects * 4 ) )
goto Exit;
for ( i = 0; i < 4; i++ )
@@ -1258,14 +1258,14 @@
if ( result < 0 || (FT_UInt)result < max_objects )
{
FT_ERROR(( "ps_parser_load_field:"
- " expected %d integer%s in the %s subarray\n",
+ " expected %d integer%s in the %s subarray\n"
+ " "
+ " of /FontBBox in the /Blend dictionary\n",
max_objects, max_objects > 1 ? "s" : "",
i == 0 ? "first"
: ( i == 1 ? "second"
: ( i == 2 ? "third"
: "fourth" ) ) ));
- FT_ERROR(( " "
- " of /FontBBox in the /Blend dictionary\n" ));
error = FT_THROW( Invalid_File_Format );
FT_FREE( temp );