mirror of
https://github.com/freetype/freetype.git
synced 2026-10-23 11:08:54 +03:00
[truetype] Remove TT_CONFIG_OPTION_NO_BORING_EXPANSION.
Despite its name, this option only gated 'avar' version 2 support. FreeType 2.15.0 includes the complete boring-expansion set of proposals, now released as ISO Open Font Format, fifth edition (ISO/IEC 14496-22:2026). Gating just avar2 no longer makes sense, especially since it has also been shipping on Apple platforms for four years. * include/freetype/config/ftoption.h, devel/ftoption.h (TT_CONFIG_OPTION_NO_BORING_EXPANSION): Remove. * src/truetype/ttgxvar.c (ft_var_load_avar): Remove configuration guards. * docs/CHANGES: Updated. All five Meson regression tests pass with the removed macro still defined. avar1 and avar2 coordinate mapping agrees with FontTools. Assisted-by: OpenAI Codex
This commit is contained in:
committed by
Werner Lemberg
parent
9d7790e2ee
commit
2b01fa2d67
@@ -757,24 +757,6 @@ FT_BEGIN_HEADER
|
||||
#define TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
||||
|
||||
|
||||
/**************************************************************************
|
||||
*
|
||||
* Define `TT_CONFIG_OPTION_NO_BORING_EXPANSION` if you want to exclude
|
||||
* support for 'boring' OpenType specification expansions.
|
||||
*
|
||||
* https://github.com/harfbuzz/boring-expansion-spec
|
||||
*
|
||||
* Right now, the following features are covered:
|
||||
*
|
||||
* - 'avar' version 2.0
|
||||
*
|
||||
* Most likely, this is a temporary configuration option to be removed in
|
||||
* the near future, since it is assumed that eventually those features are
|
||||
* added to the OpenType standard.
|
||||
*/
|
||||
/* #define TT_CONFIG_OPTION_NO_BORING_EXPANSION */
|
||||
|
||||
|
||||
/**************************************************************************
|
||||
*
|
||||
* Define `TT_CONFIG_OPTION_VARC` if you want to include support for
|
||||
|
||||
11
docs/CHANGES
11
docs/CHANGES
@@ -1,3 +1,14 @@
|
||||
CHANGES BETWEEN 2.15.0 and 2.15.1 (YYYY-MMM-DD)
|
||||
|
||||
I. MISCELLANEOUS
|
||||
|
||||
- The configuration option 'TT_CONFIG_OPTION_NO_BORING_EXPANSION'
|
||||
has been removed since FreeType now supports ISO Open Font Format,
|
||||
Edition 5.
|
||||
|
||||
|
||||
======================================================================
|
||||
|
||||
CHANGES BETWEEN 2.14.3 and 2.15.0 (2026-Oct-12)
|
||||
|
||||
I. IMPORTANT CHANGES
|
||||
|
||||
@@ -757,24 +757,6 @@ FT_BEGIN_HEADER
|
||||
#define TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
||||
|
||||
|
||||
/**************************************************************************
|
||||
*
|
||||
* Define `TT_CONFIG_OPTION_NO_BORING_EXPANSION` if you want to exclude
|
||||
* support for 'boring' OpenType specification expansions.
|
||||
*
|
||||
* https://github.com/harfbuzz/boring-expansion-spec
|
||||
*
|
||||
* Right now, the following features are covered:
|
||||
*
|
||||
* - 'avar' version 2.0
|
||||
*
|
||||
* Most likely, this is a temporary configuration option to be removed in
|
||||
* the near future, since it is assumed that eventually those features are
|
||||
* added to the OpenType standard.
|
||||
*/
|
||||
/* #define TT_CONFIG_OPTION_NO_BORING_EXPANSION */
|
||||
|
||||
|
||||
/**************************************************************************
|
||||
*
|
||||
* Define `TT_CONFIG_OPTION_VARC` if you want to include support for
|
||||
|
||||
@@ -373,12 +373,9 @@
|
||||
FT_Long version;
|
||||
FT_Long axisCount;
|
||||
FT_ULong table_len;
|
||||
|
||||
#ifndef TT_CONFIG_OPTION_NO_BORING_EXPANSION
|
||||
FT_ULong table_offset;
|
||||
FT_ULong store_offset;
|
||||
FT_ULong axisMap_offset;
|
||||
#endif
|
||||
|
||||
|
||||
FT_TRACE2(( "AVAR " ));
|
||||
@@ -391,9 +388,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
#ifndef TT_CONFIG_OPTION_NO_BORING_EXPANSION
|
||||
table_offset = FT_STREAM_POS();
|
||||
#endif
|
||||
|
||||
if ( FT_FRAME_ENTER( table_len ) )
|
||||
return;
|
||||
@@ -401,11 +396,8 @@
|
||||
version = FT_GET_LONG();
|
||||
axisCount = FT_GET_LONG();
|
||||
|
||||
if ( version != 0x00010000L
|
||||
#ifndef TT_CONFIG_OPTION_NO_BORING_EXPANSION
|
||||
&& version != 0x00020000L
|
||||
#endif
|
||||
)
|
||||
if ( version != 0x00010000L &&
|
||||
version != 0x00020000L )
|
||||
{
|
||||
FT_TRACE2(( "bad table version\n" ));
|
||||
goto Exit;
|
||||
@@ -462,7 +454,6 @@
|
||||
FT_TRACE5(( "\n" ));
|
||||
}
|
||||
|
||||
#ifndef TT_CONFIG_OPTION_NO_BORING_EXPANSION
|
||||
if ( version < 0x00020000L )
|
||||
goto Exit;
|
||||
|
||||
@@ -490,7 +481,6 @@
|
||||
if ( error )
|
||||
goto Exit;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Exit:
|
||||
|
||||
Reference in New Issue
Block a user