diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2020-05-10 06:48:17 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2020-05-10 06:48:17 +0000 |
commit | 1ebd3ac2252d05a85495dbed4d2131b9dcc068e9 (patch) | |
tree | ff4d9c3b0635402e0df6ae75b4ce66364dfc7171 /Build/source/libs/freetype2/freetype-src/src/winfonts | |
parent | 3fa60b71f26b9166920881009ec8a0dffbda13c3 (diff) |
freetype2 2.10.2
git-svn-id: svn://tug.org/texlive/trunk@55087 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/winfonts')
6 files changed, 11 insertions, 7 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/winfonts/Jamfile b/Build/source/libs/freetype2/freetype-src/src/winfonts/Jamfile index 4b922261590..4b7ce0715bb 100644 --- a/Build/source/libs/freetype2/freetype-src/src/winfonts/Jamfile +++ b/Build/source/libs/freetype2/freetype-src/src/winfonts/Jamfile @@ -1,6 +1,6 @@ # FreeType 2 src/winfonts Jamfile # -# Copyright (C) 2001-2019 by +# Copyright (C) 2001-2020 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/Build/source/libs/freetype2/freetype-src/src/winfonts/fnterrs.h b/Build/source/libs/freetype2/freetype-src/src/winfonts/fnterrs.h index af29307c75c..f98e68435be 100644 --- a/Build/source/libs/freetype2/freetype-src/src/winfonts/fnterrs.h +++ b/Build/source/libs/freetype2/freetype-src/src/winfonts/fnterrs.h @@ -4,7 +4,7 @@ * * Win FNT/FON error codes (specification only). * - * Copyright (C) 2001-2019 by + * Copyright (C) 2001-2020 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/src/winfonts/module.mk b/Build/source/libs/freetype2/freetype-src/src/winfonts/module.mk index 82fb0151f87..4614c55fd0b 100644 --- a/Build/source/libs/freetype2/freetype-src/src/winfonts/module.mk +++ b/Build/source/libs/freetype2/freetype-src/src/winfonts/module.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2019 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, modified, diff --git a/Build/source/libs/freetype2/freetype-src/src/winfonts/rules.mk b/Build/source/libs/freetype2/freetype-src/src/winfonts/rules.mk index 998d49bc9f2..e73ef5ea998 100644 --- a/Build/source/libs/freetype2/freetype-src/src/winfonts/rules.mk +++ b/Build/source/libs/freetype2/freetype-src/src/winfonts/rules.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2019 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, modified, diff --git a/Build/source/libs/freetype2/freetype-src/src/winfonts/winfnt.c b/Build/source/libs/freetype2/freetype-src/src/winfonts/winfnt.c index 2d771be2ccb..9b466e8f288 100644 --- a/Build/source/libs/freetype2/freetype-src/src/winfonts/winfnt.c +++ b/Build/source/libs/freetype2/freetype-src/src/winfonts/winfnt.c @@ -4,7 +4,7 @@ * * FreeType font driver for Windows FNT/FON files * - * Copyright (C) 1996-2019 by + * Copyright (C) 1996-2020 by * David Turner, Robert Wilhelm, and Werner Lemberg. * Copyright 2003 Huw D M Davies for Codeweavers * Copyright 2007 Dmitry Timoshkov for Codeweavers @@ -331,7 +331,7 @@ { FT_TRACE2(( "invalid alignment shift count for resource data\n" )); error = FT_THROW( Invalid_File_Format ); - goto Exit; + goto Exit1; } @@ -597,6 +597,10 @@ Exit: return error; + + Exit1: + FT_FRAME_EXIT(); + goto Exit; } diff --git a/Build/source/libs/freetype2/freetype-src/src/winfonts/winfnt.h b/Build/source/libs/freetype2/freetype-src/src/winfonts/winfnt.h index b628ad4c425..391f4448a75 100644 --- a/Build/source/libs/freetype2/freetype-src/src/winfonts/winfnt.h +++ b/Build/source/libs/freetype2/freetype-src/src/winfonts/winfnt.h @@ -4,7 +4,7 @@ * * FreeType font driver for Windows FNT/FON files * - * Copyright (C) 1996-2019 by + * Copyright (C) 1996-2020 by * David Turner, Robert Wilhelm, and Werner Lemberg. * Copyright 2007 Dmitry Timoshkov for Codeweavers * |