summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src/src/pshinter
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-10-11 03:30:45 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-10-11 03:30:45 +0000
commit818cc5aef331bbea8e3f51fde0d16930d3c7d61b (patch)
tree92e75c5790929645b7f7fe46531d08bd6da647fe /Build/source/libs/freetype2/freetype-src/src/pshinter
parentda07ca4d5d2822da52a86feffa09e8cf2b9484bd (diff)
freetype 2.10.3
git-svn-id: svn://tug.org/texlive/trunk@56628 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/pshinter')
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/pshinter/Jamfile34
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/pshinter/pshalgo.c7
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/pshinter/pshglob.c7
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/pshinter/pshglob.h4
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/pshinter/pshinter.c1
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/pshinter/pshmod.c4
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/pshinter/pshmod.h3
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/pshinter/pshnterr.h4
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/pshinter/pshrec.c11
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/pshinter/pshrec.h3
10 files changed, 19 insertions, 59 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/pshinter/Jamfile b/Build/source/libs/freetype2/freetype-src/src/pshinter/Jamfile
deleted file mode 100644
index 1442d9860c7..00000000000
--- a/Build/source/libs/freetype2/freetype-src/src/pshinter/Jamfile
+++ /dev/null
@@ -1,34 +0,0 @@
-# FreeType 2 src/pshinter Jamfile
-#
-# 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,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT. By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-SubDir FT2_TOP $(FT2_SRC_DIR) pshinter ;
-
-{
- local _sources ;
-
- if $(FT2_MULTI)
- {
- _sources = pshalgo
- pshglob
- pshmod
- pshpic
- pshrec
- ;
- }
- else
- {
- _sources = pshinter ;
- }
-
- Library $(FT2_LIB) : $(_sources).c ;
-}
-
-# end of src/pshinter Jamfile
diff --git a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshalgo.c b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshalgo.c
index 57dfa3da963..920b9a74b5f 100644
--- a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshalgo.c
+++ b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshalgo.c
@@ -16,10 +16,9 @@
*/
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DEBUG_H
-#include FT_INTERNAL_CALC_H
+#include <freetype/internal/ftobjs.h>
+#include <freetype/internal/ftdebug.h>
+#include <freetype/internal/ftcalc.h>
#include "pshalgo.h"
#include "pshnterr.h"
diff --git a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshglob.c b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshglob.c
index d9f835f99eb..cdc1c3af0e9 100644
--- a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshglob.c
+++ b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshglob.c
@@ -17,10 +17,9 @@
*/
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_CALC_H
+#include <freetype/freetype.h>
+#include <freetype/internal/ftobjs.h>
+#include <freetype/internal/ftcalc.h>
#include "pshglob.h"
#ifdef DEBUG_HINTER
diff --git a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshglob.h b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshglob.h
index cd2f3122f7c..8181324e5ee 100644
--- a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshglob.h
+++ b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshglob.h
@@ -20,8 +20,8 @@
#define PSHGLOB_H_
-#include FT_FREETYPE_H
-#include FT_INTERNAL_POSTSCRIPT_HINTS_H
+#include <freetype/freetype.h>
+#include <freetype/internal/pshints.h>
FT_BEGIN_HEADER
diff --git a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshinter.c b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshinter.c
index 6009db5187d..3cca0ad7c23 100644
--- a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshinter.c
+++ b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshinter.c
@@ -17,7 +17,6 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
#include "pshalgo.c"
#include "pshglob.c"
diff --git a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshmod.c b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshmod.c
index 686859b3ed5..e0abd386f9f 100644
--- a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshmod.c
+++ b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshmod.c
@@ -16,10 +16,10 @@
*/
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
+#include <freetype/internal/ftobjs.h>
#include "pshrec.h"
#include "pshalgo.h"
+#include "pshmod.h"
/* the Postscript Hinter module structure */
diff --git a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshmod.h b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshmod.h
index c44112e9d48..2a6eb1c4697 100644
--- a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshmod.h
+++ b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshmod.h
@@ -20,8 +20,7 @@
#define PSHMOD_H_
-#include <ft2build.h>
-#include FT_MODULE_H
+#include <freetype/ftmodapi.h>
FT_BEGIN_HEADER
diff --git a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshnterr.h b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshnterr.h
index c4e9f42d2ce..d67955c4102 100644
--- a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshnterr.h
+++ b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshnterr.h
@@ -25,7 +25,7 @@
#ifndef PSHNTERR_H_
#define PSHNTERR_H_
-#include FT_MODULE_ERRORS_H
+#include <freetype/ftmoderr.h>
#undef FTERRORS_H_
@@ -33,7 +33,7 @@
#define FT_ERR_PREFIX PSH_Err_
#define FT_ERR_BASE FT_Mod_Err_PShinter
-#include FT_ERRORS_H
+#include <freetype/fterrors.h>
#endif /* PSHNTERR_H_ */
diff --git a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshrec.c b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshrec.c
index a81c6f71232..bddccf2a6eb 100644
--- a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshrec.c
+++ b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshrec.c
@@ -16,11 +16,10 @@
*/
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DEBUG_H
-#include FT_INTERNAL_CALC_H
+#include <freetype/freetype.h>
+#include <freetype/internal/ftobjs.h>
+#include <freetype/internal/ftdebug.h>
+#include <freetype/internal/ftcalc.h>
#include "pshrec.h"
#include "pshalgo.h"
@@ -875,7 +874,7 @@
if ( error )
{
FT_ERROR(( "ps_hints_stem: could not add stem"
- " (%d,%d) to hints table\n", stems[0], stems[1] ));
+ " (%ld,%ld) to hints table\n", stems[0], stems[1] ));
hints->error = error;
return;
diff --git a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshrec.h b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshrec.h
index a8bc5aeecba..b13c7be13ce 100644
--- a/Build/source/libs/freetype2/freetype-src/src/pshinter/pshrec.h
+++ b/Build/source/libs/freetype2/freetype-src/src/pshinter/pshrec.h
@@ -32,8 +32,7 @@
#define PSHREC_H_
-#include <ft2build.h>
-#include FT_INTERNAL_POSTSCRIPT_HINTS_H
+#include <freetype/internal/pshints.h>
#include "pshglob.h"