summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src/include/freetype/config
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2022-04-05 21:27:03 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2022-04-05 21:27:03 +0000
commit37e731f0bd81249f8b43bada12adaa611b7a595b (patch)
tree99e477a2cd57a94782ae182b8c5e2c0024751356 /Build/source/libs/freetype2/freetype-src/include/freetype/config
parent7c200a413ce80d2d09a0dda338e9407bba0d3855 (diff)
freetype2 : revert
git-svn-id: svn://tug.org/texlive/trunk@62919 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/include/freetype/config')
-rw-r--r--Build/source/libs/freetype2/freetype-src/include/freetype/config/ftconfig.h2
-rw-r--r--Build/source/libs/freetype2/freetype-src/include/freetype/config/ftheader.h14
-rw-r--r--Build/source/libs/freetype2/freetype-src/include/freetype/config/ftmodule.h1
-rw-r--r--Build/source/libs/freetype2/freetype-src/include/freetype/config/ftoption.h22
-rw-r--r--Build/source/libs/freetype2/freetype-src/include/freetype/config/ftstdlib.h2
-rw-r--r--Build/source/libs/freetype2/freetype-src/include/freetype/config/integer-types.h7
-rw-r--r--Build/source/libs/freetype2/freetype-src/include/freetype/config/mac-support.h2
-rw-r--r--Build/source/libs/freetype2/freetype-src/include/freetype/config/public-macros.h2
8 files changed, 10 insertions, 42 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftconfig.h b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftconfig.h
index c696e900a67..65effcbe63e 100644
--- a/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftconfig.h
+++ b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftconfig.h
@@ -4,7 +4,7 @@
*
* ANSI-specific configuration file (specification only).
*
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 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/include/freetype/config/ftheader.h b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftheader.h
index a8c6833df77..e46d314e334 100644
--- a/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftheader.h
+++ b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftheader.h
@@ -4,7 +4,7 @@
*
* Build macros of the FreeType 2 library.
*
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
@@ -777,18 +777,6 @@
#define FT_COLOR_H <freetype/ftcolor.h>
- /**************************************************************************
- *
- * @macro:
- * FT_OTSVG_H
- *
- * @description:
- * A macro used in `#include` statements to name the file containing the
- * FreeType~2 API which handles the OpenType 'SVG~' glyphs.
- */
-#define FT_OTSVG_H <freetype/otsvg.h>
-
-
/* */
/* These header files don't need to be included by the user. */
diff --git a/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftmodule.h b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftmodule.h
index b315baba8ae..d4ba3f784d1 100644
--- a/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftmodule.h
+++ b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftmodule.h
@@ -28,6 +28,5 @@ FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
FT_USE_MODULE( FT_Renderer_Class, ft_sdf_renderer_class )
FT_USE_MODULE( FT_Renderer_Class, ft_bitmap_sdf_renderer_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_svg_renderer_class )
/* EOF */
diff --git a/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftoption.h b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftoption.h
index c5bde243b12..4227fd376e4 100644
--- a/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftoption.h
+++ b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftoption.h
@@ -4,7 +4,7 @@
*
* User-selectable configuration macros (specification only).
*
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
@@ -219,10 +219,6 @@ FT_BEGIN_HEADER
* If you use a build system like cmake or the `configure` script,
* options set by those programs have precedence, overwriting the value
* here with the configured one.
- *
- * If you use the GNU make build system directly (that is, without the
- * `configure` script) and you define this macro, you also have to pass
- * `SYSTEM_ZLIB=yes` as an argument to make.
*/
/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
@@ -529,20 +525,6 @@ FT_BEGIN_HEADER
/**************************************************************************
*
- * OpenType SVG Glyph Support
- *
- * Setting this macro enables support for OpenType SVG glyphs. By
- * default, FreeType can only fetch SVG documents. However, it can also
- * render them if external rendering hook functions are plugged in at
- * runtime.
- *
- * More details on the hooks can be found in file `otsvg.h`.
- */
-#define FT_CONFIG_OPTION_SVG
-
-
- /**************************************************************************
- *
* Error Strings
*
* If this macro is set, `FT_Error_String` will return meaningful
@@ -1020,9 +1002,9 @@ FT_BEGIN_HEADER
#error "Invalid CFF darkening parameters!"
#endif
-
FT_END_HEADER
+
#endif /* FTOPTION_H_ */
diff --git a/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftstdlib.h b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftstdlib.h
index 7958c2a5f75..6ee412a074f 100644
--- a/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftstdlib.h
+++ b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftstdlib.h
@@ -5,7 +5,7 @@
* ANSI-specific library and header configuration file (specification
* only).
*
- * Copyright (C) 2002-2022 by
+ * Copyright (C) 2002-2021 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/include/freetype/config/integer-types.h b/Build/source/libs/freetype2/freetype-src/include/freetype/config/integer-types.h
index d9d2638d1e6..5ef09f1978b 100644
--- a/Build/source/libs/freetype2/freetype-src/include/freetype/config/integer-types.h
+++ b/Build/source/libs/freetype2/freetype-src/include/freetype/config/integer-types.h
@@ -4,7 +4,7 @@
*
* FreeType integer types definitions.
*
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
@@ -221,10 +221,9 @@
#define FT_INT64 __int64
#define FT_UINT64 unsigned __int64
-#elif defined( __WATCOMC__ ) && __WATCOMC__ >= 1100 /* Watcom C++ */
+#elif defined( __WATCOMC__ ) /* Watcom C++ */
-#define FT_INT64 long long int
-#define FT_UINT64 unsigned long long int
+ /* Watcom doesn't provide 64-bit data types */
#elif defined( __MWERKS__ ) /* Metrowerks CodeWarrior */
diff --git a/Build/source/libs/freetype2/freetype-src/include/freetype/config/mac-support.h b/Build/source/libs/freetype2/freetype-src/include/freetype/config/mac-support.h
index e42c9fe410d..ef58d8b3f03 100644
--- a/Build/source/libs/freetype2/freetype-src/include/freetype/config/mac-support.h
+++ b/Build/source/libs/freetype2/freetype-src/include/freetype/config/mac-support.h
@@ -4,7 +4,7 @@
*
* Mac/OS X support configuration header.
*
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 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/include/freetype/config/public-macros.h b/Build/source/libs/freetype2/freetype-src/include/freetype/config/public-macros.h
index 0074134f1d1..9fbb3274a0e 100644
--- a/Build/source/libs/freetype2/freetype-src/include/freetype/config/public-macros.h
+++ b/Build/source/libs/freetype2/freetype-src/include/freetype/config/public-macros.h
@@ -4,7 +4,7 @@
*
* Define a set of compiler macros used in public FreeType headers.
*
- * Copyright (C) 2020-2022 by
+ * Copyright (C) 2020-2021 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,