diff options
| author | Werner Lemberg <wl@gnu.org> | 2023-04-25 09:54:09 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2023-04-25 11:47:18 +0200 |
| commit | 0a3836c97d5e84d6721ac0fd2839e8ae1b7be8d9 (patch) | |
| tree | d3719271c235d791c03b0bbefc7103625b606c64 | |
| parent | 40676afc4ce15fbcb4f73e1b7016ebfb3e7b5390 (diff) | |
| download | freetype2-0a3836c97d5e84d6721ac0fd2839e8ae1b7be8d9.tar.gz | |
Improve/add source comments and documentation.
| -rw-r--r-- | include/freetype/freetype.h | 12 | ||||
| -rw-r--r-- | src/sfnt/sfdriver.c | 10 |
2 files changed, 12 insertions, 10 deletions
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index efff74fe3..e855e6cb6 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -1002,7 +1002,7 @@ FT_BEGIN_HEADER * Note that the bounding box might be off by (at least) one pixel for * hinted fonts. See @FT_Size_Metrics for further discussion. * - * Note that the bounding box does not vary in OpenType variable fonts + * Note that the bounding box does not vary in OpenType variation fonts * and should only be used in relation to the default instance. * * units_per_EM :: @@ -1090,9 +1090,9 @@ FT_BEGIN_HEADER FT_Generic generic; - /*# The following member variables (down to `underline_thickness`) */ - /*# are only relevant to scalable outlines; cf. @FT_Bitmap_Size */ - /*# for bitmap fonts. */ + /* The following member variables (down to `underline_thickness`) */ + /* are only relevant to scalable outlines; cf. @FT_Bitmap_Size */ + /* for bitmap fonts. */ FT_BBox bbox; FT_UShort units_per_EM; @@ -1110,7 +1110,7 @@ FT_BEGIN_HEADER FT_Size size; FT_CharMap charmap; - /*@private begin */ + /* private fields, internal to FreeType */ FT_Driver driver; FT_Memory memory; @@ -1123,8 +1123,6 @@ FT_BEGIN_HEADER FT_Face_Internal internal; - /*@private end */ - } FT_FaceRec; diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c index 1e573fb08..70c63417b 100644 --- a/src/sfnt/sfdriver.c +++ b/src/sfnt/sfdriver.c @@ -817,9 +817,9 @@ if ( !found ) { - /* as a last resort we try the family name; note that this is */ - /* not in the Adobe TechNote, but GX fonts (which predate the */ - /* TechNote) benefit from this behaviour */ + /* according to the 'name' documentation in the OpenType */ + /* specification the font family name is to be used if the */ + /* typographic family name is missing, so let's do that */ found = sfnt_get_name_id( face, TT_NAME_ID_FONT_FAMILY, &win, @@ -851,6 +851,10 @@ { FT_TRACE0(( "sfnt_get_var_ps_name:" " No valid PS name prefix for font instances found\n" )); + /* XXX It probably makes sense to never let this fail */ + /* since an arbitrary prefix should work, too. */ + /* On the other hand, it is very unlikely that */ + /* we ever reach this code at all. */ return NULL; } |