Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8285686: Upgrade to FreeType 2.12.0
Reviewed-by: serb, jdv
  • Loading branch information
prrace committed Apr 29, 2022
1 parent 64225e1 commit 67dd8a8
Show file tree
Hide file tree
Showing 293 changed files with 8,787 additions and 4,126 deletions.
2 changes: 1 addition & 1 deletion src/java.desktop/share/legal/freetype.md
@@ -1,4 +1,4 @@
## The FreeType Project: Freetype v2.10.4
## The FreeType Project: Freetype v2.12.0


### FreeType Notice
Expand Down
2 changes: 1 addition & 1 deletion src/java.desktop/share/native/libfreetype/UPDATING.txt
Expand Up @@ -30,6 +30,6 @@ src/java.desktop/share/legal/freetype.md

When updating specify --with-freetype=bundled to test builds to
expose build issues.
This is important because presently on Linux and Solaris the build
This is important because presently on Linux the build
defaults to linking against the system library and does not attempt
to compile the sources.
Expand Up @@ -4,7 +4,7 @@
*
* ANSI-specific configuration file (specification only).
*
* Copyright (C) 1996-2020 by
* Copyright (C) 1996-2022 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
Expand Down
Expand Up @@ -4,7 +4,7 @@
*
* Build macros of the FreeType 2 library.
*
* Copyright (C) 1996-2020 by
* Copyright (C) 1996-2022 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
Expand Down Expand Up @@ -777,6 +777,18 @@
#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. */
Expand Down
Expand Up @@ -19,12 +19,15 @@ FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
// FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
// FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
// FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
// FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
FT_USE_MODULE( FT_Module_Class, psaux_module_class )
FT_USE_MODULE( FT_Module_Class, psnames_module_class )
FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
// FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_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 */
Expand Up @@ -4,7 +4,7 @@
*
* User-selectable configuration macros (specification only).
*
* Copyright (C) 1996-2020 by
* Copyright (C) 1996-2022 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
Expand Down Expand Up @@ -105,8 +105,7 @@ FT_BEGIN_HEADER
*
* ```
* FREETYPE_PROPERTIES=truetype:interpreter-version=35 \
* cff:no-stem-darkening=1 \
* autofitter:warping=1
* cff:no-stem-darkening=1
* ```
*
*/
Expand Down Expand Up @@ -220,6 +219,10 @@ 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 */

Expand Down Expand Up @@ -431,6 +434,23 @@ FT_BEGIN_HEADER
/* #define FT_DEBUG_LEVEL_TRACE */


/**************************************************************************
*
* Logging
*
* Compiling FreeType in debug or trace mode makes FreeType write error
* and trace log messages to `stderr`. Enabling this macro
* automatically forces the `FT_DEBUG_LEVEL_ERROR` and
* `FT_DEBUG_LEVEL_TRACE` macros and allows FreeType to write error and
* trace log messages to a file instead of `stderr`. For writing logs
* to a file, FreeType uses an the external `dlg` library (the source
* code is in `src/dlg`).
*
* This option needs a C99 compiler.
*/
/* #define FT_DEBUG_LOGGING */


/**************************************************************************
*
* Autofitter debugging
Expand Down