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/pcf/pcfdrivr.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/pcf/pcfdrivr.c')
| -rw-r--r-- | freetype/src/pcf/pcfdrivr.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/freetype/src/pcf/pcfdrivr.c b/freetype/src/pcf/pcfdrivr.c index 30acc7fb1..c24f8b33d 100644 --- a/freetype/src/pcf/pcfdrivr.c +++ b/freetype/src/pcf/pcfdrivr.c @@ -2,8 +2,7 @@ FreeType font driver for pcf files - Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, - 2010 by + Copyright (C) 2000-2004, 2006-2011 by Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy @@ -36,7 +35,7 @@ THE SOFTWARE. #include FT_BZIP2_H #include FT_ERRORS_H #include FT_BDF_H -#include FT_TRUETYPE_IDS_H +#include FT_TRUETYPE_IDS_H #include "pcf.h" #include "pcfdrivr.h" @@ -248,8 +247,6 @@ THE SOFTWARE. FT_FREE( face->charset_encoding ); FT_FREE( face->charset_registry ); - FT_TRACE4(( "PCF_Face_Done: done face\n" )); - /* close compressed stream if any */ if ( pcfface->stream == &face->comp_stream ) { @@ -274,6 +271,8 @@ THE SOFTWARE. FT_UNUSED( face_index ); + FT_TRACE2(( "PCF driver\n" )); + error = pcf_load_font( stream, face ); if ( error ) { @@ -405,7 +404,7 @@ THE SOFTWARE. return error; Fail: - FT_TRACE2(( "[not a valid PCF file]\n" )); + FT_TRACE2(( " not a PCF file\n" )); PCF_Face_Done( pcfface ); error = PCF_Err_Unknown_File_Format; /* error */ goto Exit; @@ -684,8 +683,8 @@ THE SOFTWARE. 0, - 0, - 0, + 0, /* FT_Module_Constructor */ + 0, /* FT_Module_Destructor */ pcf_driver_requester }, |