From bbda1cc717797ba68eb2eda0dd18205ea4413009 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Tue, 20 Jun 2017 01:56:21 +0000 Subject: freetype2 2.8.0 git-svn-id: svn://tug.org/texlive/trunk@44650 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/freetype2/freetype-src/src/psnames/Jamfile | 2 +- Build/source/libs/freetype2/freetype-src/src/psnames/module.mk | 2 +- Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.c | 3 ++- Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.h | 2 +- Build/source/libs/freetype2/freetype-src/src/psnames/psnamerr.h | 2 +- Build/source/libs/freetype2/freetype-src/src/psnames/psnames.c | 6 +++--- Build/source/libs/freetype2/freetype-src/src/psnames/pspic.c | 2 +- Build/source/libs/freetype2/freetype-src/src/psnames/pspic.h | 2 +- Build/source/libs/freetype2/freetype-src/src/psnames/pstables.h | 4 +++- Build/source/libs/freetype2/freetype-src/src/psnames/rules.mk | 2 +- 10 files changed, 15 insertions(+), 12 deletions(-) (limited to 'Build/source/libs/freetype2/freetype-src/src/psnames') diff --git a/Build/source/libs/freetype2/freetype-src/src/psnames/Jamfile b/Build/source/libs/freetype2/freetype-src/src/psnames/Jamfile index 35b8a99c8fb..5a6e2c0bd21 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/Jamfile +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/Jamfile @@ -1,6 +1,6 @@ # FreeType 2 src/psnames Jamfile # -# Copyright 2001-2016 by +# Copyright 2001-2017 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/psnames/module.mk b/Build/source/libs/freetype2/freetype-src/src/psnames/module.mk index ba29af813c0..ddd22960c1a 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/module.mk +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/module.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2016 by +# Copyright 1996-2017 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/psnames/psmodule.c b/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.c index 01b85c3c8e5..3ff8cb911b7 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.c +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.c @@ -4,7 +4,7 @@ /* */ /* PSNames module implementation (body). */ /* */ -/* Copyright 1996-2016 by */ +/* Copyright 1996-2017 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -23,6 +23,7 @@ #include "psmodule.h" +#include "pstables.h" #define DEFINE_PS_TABLES #include "pstables.h" diff --git a/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.h b/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.h index ee3c6cb631a..6983b792347 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.h +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.h @@ -4,7 +4,7 @@ /* */ /* High-level PSNames module interface (specification). */ /* */ -/* Copyright 1996-2016 by */ +/* Copyright 1996-2017 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/psnames/psnamerr.h b/Build/source/libs/freetype2/freetype-src/src/psnames/psnamerr.h index 3a9f65323b8..f90bf5ea430 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/psnamerr.h +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/psnamerr.h @@ -4,7 +4,7 @@ /* */ /* PS names module error codes (specification only). */ /* */ -/* Copyright 2001-2016 by */ +/* Copyright 2001-2017 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/psnames/psnames.c b/Build/source/libs/freetype2/freetype-src/src/psnames/psnames.c index e7b2c0b5ef8..22466d62308 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/psnames.c +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/psnames.c @@ -4,7 +4,7 @@ /* */ /* FreeType PSNames module component (body only). */ /* */ -/* Copyright 1996-2016 by */ +/* Copyright 1996-2017 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,10 +17,10 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT - #include -#include "pspic.c" + #include "psmodule.c" +#include "pspic.c" /* END */ diff --git a/Build/source/libs/freetype2/freetype-src/src/psnames/pspic.c b/Build/source/libs/freetype2/freetype-src/src/psnames/pspic.c index a78ec5aa81e..8b9003439b3 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/pspic.c +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/pspic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for psnames module. */ /* */ -/* Copyright 2009-2016 by */ +/* Copyright 2009-2017 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/Build/source/libs/freetype2/freetype-src/src/psnames/pspic.h b/Build/source/libs/freetype2/freetype-src/src/psnames/pspic.h index 48348765cf0..14497e73fa4 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/pspic.h +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/pspic.h @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for psnames module. */ /* */ -/* Copyright 2009-2016 by */ +/* Copyright 2009-2017 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/Build/source/libs/freetype2/freetype-src/src/psnames/pstables.h b/Build/source/libs/freetype2/freetype-src/src/psnames/pstables.h index 309f16bd3f7..e0f5e308049 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/pstables.h +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/pstables.h @@ -4,7 +4,7 @@ /* */ /* PostScript glyph names. */ /* */ -/* Copyright 2005-2016 by */ +/* Copyright 2005-2017 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -4135,6 +4135,7 @@ ; +#ifdef DEFINE_PS_TABLES /* * This function searches the compressed table efficiently. */ @@ -4229,6 +4230,7 @@ NotFound: return 0; } +#endif /* DEFINE_PS_TABLES */ #endif /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST */ diff --git a/Build/source/libs/freetype2/freetype-src/src/psnames/rules.mk b/Build/source/libs/freetype2/freetype-src/src/psnames/rules.mk index 9849f4053a5..69fa7322009 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/rules.mk +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2016 by +# Copyright 1996-2017 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, -- cgit v1.2.3