minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

Minor changes. 

Comment fixes, typos, removing of unnecessary parentheses.
This commit is contained in:
Werner Lemberg 2023-01-28 17:04:38 +01:00
parent bacc48e616
commit e97544a739
5 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/unix/freetype2.m4
View File

@ -15,7 +15,7 @@
# generated by Autoconf, under the same distribution terms as the rest of
# that program.
#
# serial 6
# serial 7
# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.

5
docs/CHANGES
View File

@ -7,6 +7,8 @@ CHANGES BETWEEN 2.12.1 and 2.13
graphical FreeType demo programs into a single application based
on the Qt framework. This was Charlie Jiang's GSoC 2022 project.
- The 'COLR' v1 API is now considered as stable.
III. MISCELLANEOUS
@ -18,7 +20,8 @@ CHANGES BETWEEN 2.12.1 and 2.13
https://github.com/harfbuzz/boring-expansion-spec/blob/main/avar2.md
for the specification.
for the specification. To deactivate it, define the configuration
macro 'TT_CONFIG_OPTION_NO_BORING_EXPANSION'.
- A new API `FT_GlyphSlot_Slant` to slant a glyph by a given angle
has been added. Note that this function is part of `ftsynth.h`,

1
src/base/ftsynth.c
View File

@ -46,6 +46,7 @@
FT_EXPORT_DEF( void )
FT_GlyphSlot_Oblique( FT_GlyphSlot slot )
{
/* Value '0x0366A' corresponds to a shear angle of about 12 degrees. */
FT_GlyphSlot_Slant( slot, 0x0366A );
}

2
src/pfr/pfrobjs.c
View File

@ -490,7 +490,7 @@
glyph1--;
glyph2--;
/* check the array bounds, .notdef is automacally out */
/* check the array bounds, .notdef is automatically out */
if ( glyph1 >= phy_font->num_chars ||
glyph2 >= phy_font->num_chars )
goto Exit;

38
src/sfnt/ttcolr.c
View File

@ -1025,14 +1025,14 @@
/* Base values set, now handle variations. */
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
if ( ( (FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE ||
(FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_CENTER ||
(FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM ||
(FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM_CENTER ) )
if ( (FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE ||
(FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_CENTER ||
(FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM ||
(FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM_CENTER )
{
ENSURE_READ_BYTES( 4 );
var_index_base = FT_NEXT_ULONG( p );
@ -1124,10 +1124,10 @@
}
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
if ( ( (FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE ||
(FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE_CENTER ) )
if ( (FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE ||
(FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE_CENTER )
{
FT_UInt num_deltas = 0;
@ -1197,10 +1197,10 @@
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
if ( ( (FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW ||
(FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW_CENTER ) )
if ( (FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW ||
(FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW_CENTER )
{
ENSURE_READ_BYTES( 4 );
var_index_base = FT_NEXT_ULONG( p );
@ -1452,7 +1452,7 @@
FT_ItemVarDelta item_deltas[4] = { 0, 0, 0, 0 };
/* Check whether we can extract a 32-bit VarIdxBase now. */
/* Check whether we can extract a 32-bit varIndexBase now. */
if ( p1 > limit - 4 )
return 0;
@ -1559,8 +1559,8 @@
* Before reading, ensure that `p` is within 'COLR' v1 and we can read a
* 4-byte ULONG.
*/
if ( p < colr->layers_v1 ||
p > ( (FT_Byte*)colr->table + colr->table_size - 4 ) )
if ( p < colr->layers_v1 ||
p > (FT_Byte*)colr->table + colr->table_size - 4 )
return 0;
paint_offset =