diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
| commit | 008a8d8051786badb83e455bd9281103ba9a6470 (patch) | |
| tree | f99ea672d105271cb60a726fac8022ce47ea2866 /freetype/include/t1tables.h | |
| parent | 912e881bec8b16f2331225960645c3bdf5a8ba2d (diff) | |
| parent | e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f (diff) | |
| download | vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.gz vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.bz2 vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftfntfmt.c
freetype/src/cache/ftcimage.c
freetype/src/cid/cidriver.c
freetype/src/truetype/ttdriver.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
openssl/Makefile
Diffstat (limited to 'freetype/include/t1tables.h')
| -rw-r--r-- | freetype/include/t1tables.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/freetype/include/t1tables.h b/freetype/include/t1tables.h index b1e05f03e..9aa2795a5 100644 --- a/freetype/include/t1tables.h +++ b/freetype/include/t1tables.h @@ -5,7 +5,7 @@ /* Basic Type 1/Type 2 tables definitions and interface (specification */ /* only). */ /* */ -/* Copyright 1996-2004, 2006, 2008, 2009, 2011, 2014 by */ +/* Copyright 1996-2015 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -492,8 +492,9 @@ FT_BEGIN_HEADER * FreeType error code. 0~means success. * * @note: - * The string pointers within the font info structure are owned by - * the face and don't need to be freed by the caller. + * String pointers within the @PS_FontInfoRec structure are owned by + * the face and don't need to be freed by the caller. Missing entries + * in the font's FontInfo dictionary are represented by NULL pointers. * * If the font's format is not PostScript-based, this function will * return the `FT_Err_Invalid_Argument' error code. |