diff options
Diffstat (limited to 'modules/freetype2/src/winfonts')
| -rw-r--r-- | modules/freetype2/src/winfonts/Jamfile | 2 | ||||
| -rw-r--r-- | modules/freetype2/src/winfonts/fnterrs.h | 2 | ||||
| -rw-r--r-- | modules/freetype2/src/winfonts/module.mk | 2 | ||||
| -rw-r--r-- | modules/freetype2/src/winfonts/rules.mk | 2 | ||||
| -rw-r--r-- | modules/freetype2/src/winfonts/winfnt.c | 10 | ||||
| -rw-r--r-- | modules/freetype2/src/winfonts/winfnt.h | 2 |
6 files changed, 8 insertions, 12 deletions
diff --git a/modules/freetype2/src/winfonts/Jamfile b/modules/freetype2/src/winfonts/Jamfile index d81165e92..4385e3b39 100644 --- a/modules/freetype2/src/winfonts/Jamfile +++ b/modules/freetype2/src/winfonts/Jamfile @@ -1,6 +1,6 @@ # FreeType 2 src/winfonts Jamfile # -# Copyright 2001-2016 by +# Copyright 2001-2018 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/modules/freetype2/src/winfonts/fnterrs.h b/modules/freetype2/src/winfonts/fnterrs.h index 6835d3e64..3a86af5aa 100644 --- a/modules/freetype2/src/winfonts/fnterrs.h +++ b/modules/freetype2/src/winfonts/fnterrs.h @@ -4,7 +4,7 @@ /* */ /* Win FNT/FON error codes (specification only). */ /* */ -/* Copyright 2001-2016 by */ +/* Copyright 2001-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/modules/freetype2/src/winfonts/module.mk b/modules/freetype2/src/winfonts/module.mk index 83da5732f..13f9077cf 100644 --- a/modules/freetype2/src/winfonts/module.mk +++ b/modules/freetype2/src/winfonts/module.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2016 by +# Copyright 1996-2018 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/modules/freetype2/src/winfonts/rules.mk b/modules/freetype2/src/winfonts/rules.mk index 2fd7b822a..d694d1a77 100644 --- a/modules/freetype2/src/winfonts/rules.mk +++ b/modules/freetype2/src/winfonts/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2016 by +# Copyright 1996-2018 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/modules/freetype2/src/winfonts/winfnt.c b/modules/freetype2/src/winfonts/winfnt.c index 99cc96617..36bd3148d 100644 --- a/modules/freetype2/src/winfonts/winfnt.c +++ b/modules/freetype2/src/winfonts/winfnt.c @@ -4,7 +4,7 @@ /* */ /* FreeType font driver for Windows FNT/FON files */ /* */ -/* Copyright 1996-2016 by */ +/* Copyright 1996-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* Copyright 2003 Huw D M Davies for Codeweavers */ /* Copyright 2007 Dmitry Timoshkov for Codeweavers */ @@ -561,7 +561,7 @@ error = fnt_font_load( face->font, stream ); if ( error ) { - FT_TRACE2(( "font #%lu load error %d\n", + FT_TRACE2(( "font #%lu load error 0x%x\n", dir_entry2.name, error )); goto Fail; } @@ -859,10 +859,6 @@ NULL ); if ( error ) goto Fail; - - /* Select default charmap */ - if ( root->num_charmaps ) - root->charmap = root->charmaps[0]; } /* set up remaining flags */ @@ -1095,7 +1091,7 @@ /* note: since glyphs are stored in columns and not in rows we */ /* can't use ft_glyphslot_set_bitmap */ - if ( FT_ALLOC_MULT( bitmap->buffer, pitch, bitmap->rows ) ) + if ( FT_ALLOC_MULT( bitmap->buffer, bitmap->rows, pitch ) ) goto Exit; column = (FT_Byte*)bitmap->buffer; diff --git a/modules/freetype2/src/winfonts/winfnt.h b/modules/freetype2/src/winfonts/winfnt.h index 9a4f32d5b..4885c9d74 100644 --- a/modules/freetype2/src/winfonts/winfnt.h +++ b/modules/freetype2/src/winfonts/winfnt.h @@ -4,7 +4,7 @@ /* */ /* FreeType font driver for Windows FNT/FON files */ /* */ -/* Copyright 1996-2016 by */ +/* Copyright 1996-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* Copyright 2007 Dmitry Timoshkov for Codeweavers */ /* */ |