ReFuel/freetype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* include/freetype/internal/tttypes.h (TT_Face): s/isCFF2/is_cff2/.

Browse Source 
For orthogonality with other structure field names.

Update all users.
This commit is contained in:
Werner Lemberg 2017-02-23 08:23:39 +01:00
parent 761d9e418b
commit f0cee1a22c
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2017-02-23 Werner Lemberg <wl@gnu.org>
* include/freetype/internal/tttypes.h (TT_Face): s/isCFF2/is_cff2/.
For orthogonality with other structure field names.
Update all users.
2017-02-22 Alexei Podtelezhnikov <apodtele@gmail.com>
* src/smooth/ftgrays.c (gray_hline): Improve code.

4
include/freetype/internal/tttypes.h
View File

@ -1290,6 +1290,8 @@ FT_BEGIN_HEADER
/* */
/* glyf_offset :: The file offset of the `glyf' table. */
/* */
/* is_cff2 :: Set if the font format is CFF2. */
/* */
/* doblend :: A boolean which is set if the font should */
/* be blended (this is for GX var). */
/* */
@ -1492,7 +1494,7 @@ FT_BEGIN_HEADER
FT_ULong glyf_len;
FT_ULong glyf_offset; /* since 2.7.1 */
FT_Bool isCFF2; /* since 2.7.1 */
FT_Bool is_cff2; /* since 2.7.1 */
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
FT_Bool doblend;

2
src/cff/cf2ft.c
View File

@ -373,7 +373,7 @@
&scaled );
/* copy isCFF2 boolean from TT_Face to CF2_Font */
font->isCFF2 = builder->face->isCFF2;
font->isCFF2 = builder->face->is_cff2;
font->renderingFlags = 0;
if ( hinted )

4
src/cff/cffobjs.c
View File

@ -560,8 +560,8 @@
error = face->goto_table( face, TTAG_CFF2, stream, 0 );
if ( !error )
{
cff2 = 1;
face->isCFF2 = cff2;
cff2 = 1;
face->is_cff2 = cff2;
}
if ( FT_ERR_EQ( error, Table_Missing ) )

2
src/truetype/ttgxvar.c
View File

@ -2083,7 +2083,7 @@
FT_TRACE5(( "\n" ));
if ( !face->isCFF2 && !blend->glyphoffsets )
if ( !face->is_cff2 && !blend->glyphoffsets )
if ( FT_SET_ERROR( ft_var_load_gvar( face ) ) )
goto Exit;

2
src/truetype/ttobjs.c
View File

@ -1215,7 +1215,7 @@
face = (TT_Face)size->root.face;
/* nothing to do for CFF2 */
if ( face->isCFF2 )
if ( face->is_cff2 )
return FT_Err_Ok;
size->ttmetrics.valid = FALSE;