diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 10:48:52 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 10:48:52 +0100 |
| commit | 485b633824020c557eb60258e1d36975c8c44770 (patch) | |
| tree | f48baf73d5a7ae814aae825e7b1405189eab9f0a /freetype/src/cid/cidload.c | |
| parent | c84235ee0d9940e6a779ec306e615603b58a79f2 (diff) | |
| parent | 41bd254198b8b879a562a85f7dc868c3c0f7fbc1 (diff) | |
| download | vcxsrv-485b633824020c557eb60258e1d36975c8c44770.tar.gz vcxsrv-485b633824020c557eb60258e1d36975c8c44770.tar.bz2 vcxsrv-485b633824020c557eb60258e1d36975c8c44770.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftrfork.c
freetype/src/cff/cffpic.c
freetype/src/pfr/pfrobjs.c
freetype/src/winfonts/winfnt.c
Diffstat (limited to 'freetype/src/cid/cidload.c')
| -rw-r--r-- | freetype/src/cid/cidload.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/freetype/src/cid/cidload.c b/freetype/src/cid/cidload.c index def90ea8f..748b1d126 100644 --- a/freetype/src/cid/cidload.c +++ b/freetype/src/cid/cidload.c @@ -4,7 +4,7 @@ /* */ /* CID-keyed Type1 font loader (body). */ /* */ -/* Copyright 1996-2006, 2009, 2011 by */ +/* Copyright 1996-2006, 2009, 2011-2012 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -147,8 +147,8 @@ FT_CALLBACK_DEF( FT_Error ) - parse_font_matrix( CID_Face face, - CID_Parser* parser ) + cid_parse_font_matrix( CID_Face face, + CID_Parser* parser ) { FT_Matrix* matrix; FT_Vector* offset; @@ -268,7 +268,7 @@ #include "cidtoken.h" T1_FIELD_CALLBACK( "FDArray", parse_fd_array, 0 ) - T1_FIELD_CALLBACK( "FontMatrix", parse_font_matrix, 0 ) + T1_FIELD_CALLBACK( "FontMatrix", cid_parse_font_matrix, 0 ) T1_FIELD_CALLBACK( "ExpansionFactor", parse_expansion_factor, 0 ) { 0, T1_FIELD_LOCATION_CID_INFO, T1_FIELD_TYPE_NONE, 0, 0, 0, 0, 0, 0 } @@ -513,8 +513,8 @@ static void - t1_init_loader( CID_Loader* loader, - CID_Face face ) + cid_init_loader( CID_Loader* loader, + CID_Face face ) { FT_UNUSED( face ); @@ -522,8 +522,8 @@ } - static void - t1_done_loader( CID_Loader* loader ) + static void + cid_done_loader( CID_Loader* loader ) { CID_Parser* parser = &loader->parser; @@ -641,7 +641,7 @@ FT_Error error; - t1_init_loader( &loader, face ); + cid_init_loader( &loader, face ); parser = &loader.parser; error = cid_parser_new( parser, face->root.stream, face->root.memory, @@ -682,7 +682,7 @@ error = cid_read_subrs( face ); Exit: - t1_done_loader( &loader ); + cid_done_loader( &loader ); return error; } |