*/*: s/PSNames/psnames/.
Only tracing messages are affected.
This commit is contained in:
parent
475f6d25cb
commit
76a52465c1
|
@ -1,3 +1,9 @@
|
||||||
|
2018-09-03 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
*/*: s/PSNames/psnames/.
|
||||||
|
|
||||||
|
Only tracing messages are affected.
|
||||||
|
|
||||||
2018-09-03 Werner Lemberg <wl@gnu.org>
|
2018-09-03 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
[sfnt] Fix heap buffer overflow in CPAL handling.
|
[sfnt] Fix heap buffer overflow in CPAL handling.
|
||||||
|
|
|
@ -321,14 +321,14 @@ FT_BEGIN_HEADER
|
||||||
*
|
*
|
||||||
* Postscript Names to Unicode Values support
|
* Postscript Names to Unicode Values support
|
||||||
*
|
*
|
||||||
* By default, FreeType 2 is built with the 'PSNames' module compiled in.
|
* By default, FreeType 2 is built with the 'psnames' module compiled in.
|
||||||
* Among other things, the module is used to convert a glyph name into a
|
* Among other things, the module is used to convert a glyph name into a
|
||||||
* Unicode value. This is especially useful in order to synthesize on
|
* Unicode value. This is especially useful in order to synthesize on
|
||||||
* the fly a Unicode charmap from the CFF/Type 1 driver through a big
|
* the fly a Unicode charmap from the CFF/Type 1 driver through a big
|
||||||
* table named the 'Adobe Glyph List' (AGL).
|
* table named the 'Adobe Glyph List' (AGL).
|
||||||
*
|
*
|
||||||
* Undefine this macro if you do not want the Adobe Glyph List compiled
|
* Undefine this macro if you do not want the Adobe Glyph List compiled
|
||||||
* in your 'PSNames' module. The Type 1 driver will not be able to
|
* in your 'psnames' module. The Type 1 driver will not be able to
|
||||||
* synthesize a Unicode charmap out of the glyphs found in the fonts.
|
* synthesize a Unicode charmap out of the glyphs found in the fonts.
|
||||||
*/
|
*/
|
||||||
#define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
|
#define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
|
||||||
|
@ -538,11 +538,11 @@ FT_BEGIN_HEADER
|
||||||
* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to load
|
* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to load
|
||||||
* and enumerate the glyph Postscript names in a TrueType or OpenType file.
|
* and enumerate the glyph Postscript names in a TrueType or OpenType file.
|
||||||
*
|
*
|
||||||
* Note that when you do not compile the 'PSNames' module by undefining the
|
* Note that when you do not compile the 'psnames' module by undefining the
|
||||||
* above FT_CONFIG_OPTION_POSTSCRIPT_NAMES, the 'sfnt' module will contain
|
* above FT_CONFIG_OPTION_POSTSCRIPT_NAMES, the 'sfnt' module will contain
|
||||||
* additional code used to read the PS Names table from a font.
|
* additional code used to read the PS Names table from a font.
|
||||||
*
|
*
|
||||||
* (By default, the module uses 'PSNames' to extract glyph names.)
|
* (By default, the module uses 'psnames' to extract glyph names.)
|
||||||
*/
|
*/
|
||||||
#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
|
#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
|
||||||
|
|
||||||
|
|
|
@ -348,7 +348,7 @@
|
||||||
FT_ERROR(( "cff_get_glyph_name:"
|
FT_ERROR(( "cff_get_glyph_name:"
|
||||||
" cannot get glyph name from a CFF2 font\n"
|
" cannot get glyph name from a CFF2 font\n"
|
||||||
" "
|
" "
|
||||||
" without the `PSNames' module\n" ));
|
" without the `psnames' module\n" ));
|
||||||
error = FT_THROW( Missing_Module );
|
error = FT_THROW( Missing_Module );
|
||||||
goto Exit;
|
goto Exit;
|
||||||
}
|
}
|
||||||
|
@ -359,7 +359,7 @@
|
||||||
FT_ERROR(( "cff_get_glyph_name:"
|
FT_ERROR(( "cff_get_glyph_name:"
|
||||||
" cannot get glyph name from CFF & CEF fonts\n"
|
" cannot get glyph name from CFF & CEF fonts\n"
|
||||||
" "
|
" "
|
||||||
" without the `PSNames' module\n" ));
|
" without the `psnames' module\n" ));
|
||||||
error = FT_THROW( Missing_Module );
|
error = FT_THROW( Missing_Module );
|
||||||
goto Exit;
|
goto Exit;
|
||||||
}
|
}
|
||||||
|
@ -415,7 +415,7 @@
|
||||||
FT_ERROR(( "cff_get_name_index:"
|
FT_ERROR(( "cff_get_name_index:"
|
||||||
" cannot get glyph index from a CFF2 font\n"
|
" cannot get glyph index from a CFF2 font\n"
|
||||||
" "
|
" "
|
||||||
" without the `PSNames' module\n" ));
|
" without the `psnames' module\n" ));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -644,14 +644,14 @@
|
||||||
|
|
||||||
dict = &cff->top_font.font_dict;
|
dict = &cff->top_font.font_dict;
|
||||||
|
|
||||||
/* we need the `PSNames' module for CFF and CEF formats */
|
/* we need the `psnames' module for CFF and CEF formats */
|
||||||
/* which aren't CID-keyed */
|
/* which aren't CID-keyed */
|
||||||
if ( dict->cid_registry == 0xFFFFU && !psnames )
|
if ( dict->cid_registry == 0xFFFFU && !psnames )
|
||||||
{
|
{
|
||||||
FT_ERROR(( "cff_face_init:"
|
FT_ERROR(( "cff_face_init:"
|
||||||
" cannot open CFF & CEF fonts\n"
|
" cannot open CFF & CEF fonts\n"
|
||||||
" "
|
" "
|
||||||
" without the `PSNames' module\n" ));
|
" without the `psnames' module\n" ));
|
||||||
error = FT_THROW( Missing_Module );
|
error = FT_THROW( Missing_Module );
|
||||||
goto Exit;
|
goto Exit;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1957,7 +1957,7 @@
|
||||||
{
|
{
|
||||||
FT_ZERO( decoder );
|
FT_ZERO( decoder );
|
||||||
|
|
||||||
/* retrieve PSNames interface from list of current modules */
|
/* retrieve `psnames' interface from list of current modules */
|
||||||
{
|
{
|
||||||
FT_Service_PsCMaps psnames;
|
FT_Service_PsCMaps psnames;
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
*
|
*
|
||||||
* psmodule.c
|
* psmodule.c
|
||||||
*
|
*
|
||||||
* PSNames module implementation (body).
|
* psnames module implementation (body).
|
||||||
*
|
*
|
||||||
* Copyright 1996-2018 by
|
* Copyright 1996-2018 by
|
||||||
* David Turner, Robert Wilhelm, and Werner Lemberg.
|
* David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
*
|
*
|
||||||
* psmodule.h
|
* psmodule.h
|
||||||
*
|
*
|
||||||
* High-level PSNames module interface (specification).
|
* High-level psnames module interface (specification).
|
||||||
*
|
*
|
||||||
* Copyright 1996-2018 by
|
* Copyright 1996-2018 by
|
||||||
* David Turner, Robert Wilhelm, and Werner Lemberg.
|
* David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
*
|
*
|
||||||
* psnames.c
|
* psnames.c
|
||||||
*
|
*
|
||||||
* FreeType PSNames module component (body only).
|
* FreeType psnames module component (body only).
|
||||||
*
|
*
|
||||||
* Copyright 1996-2018 by
|
* Copyright 1996-2018 by
|
||||||
* David Turner, Robert Wilhelm, and Werner Lemberg.
|
* David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# FreeType 2 PSNames driver configuration rules
|
# FreeType 2 psnames driver configuration rules
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
# fully.
|
# fully.
|
||||||
|
|
||||||
|
|
||||||
# PSNames driver directory
|
# psnames driver directory
|
||||||
#
|
#
|
||||||
PSNAMES_DIR := $(SRC_DIR)/psnames
|
PSNAMES_DIR := $(SRC_DIR)/psnames
|
||||||
|
|
||||||
|
@ -26,19 +26,19 @@ PSNAMES_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
$(FT_CFLAGS)
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# PSNames driver sources (i.e., C files)
|
# psnames driver sources (i.e., C files)
|
||||||
#
|
#
|
||||||
PSNAMES_DRV_SRC := $(PSNAMES_DIR)/psmodule.c
|
PSNAMES_DRV_SRC := $(PSNAMES_DIR)/psmodule.c
|
||||||
|
|
||||||
|
|
||||||
# PSNames driver headers
|
# psnames driver headers
|
||||||
#
|
#
|
||||||
PSNAMES_DRV_H := $(PSNAMES_DRV_SRC:%.c=%.h) \
|
PSNAMES_DRV_H := $(PSNAMES_DRV_SRC:%.c=%.h) \
|
||||||
$(PSNAMES_DIR)/psnamerr.h \
|
$(PSNAMES_DIR)/psnamerr.h \
|
||||||
$(PSNAMES_DIR)/pstables.h
|
$(PSNAMES_DIR)/pstables.h
|
||||||
|
|
||||||
|
|
||||||
# PSNames driver object(s)
|
# psnames driver object(s)
|
||||||
#
|
#
|
||||||
# PSNAMES_DRV_OBJ_M is used during `multi' builds
|
# PSNAMES_DRV_OBJ_M is used during `multi' builds
|
||||||
# PSNAMES_DRV_OBJ_S is used during `single' builds
|
# PSNAMES_DRV_OBJ_S is used during `single' builds
|
||||||
|
@ -46,19 +46,19 @@ PSNAMES_DRV_H := $(PSNAMES_DRV_SRC:%.c=%.h) \
|
||||||
PSNAMES_DRV_OBJ_M := $(PSNAMES_DRV_SRC:$(PSNAMES_DIR)/%.c=$(OBJ_DIR)/%.$O)
|
PSNAMES_DRV_OBJ_M := $(PSNAMES_DRV_SRC:$(PSNAMES_DIR)/%.c=$(OBJ_DIR)/%.$O)
|
||||||
PSNAMES_DRV_OBJ_S := $(OBJ_DIR)/psnames.$O
|
PSNAMES_DRV_OBJ_S := $(OBJ_DIR)/psnames.$O
|
||||||
|
|
||||||
# PSNames driver source file for single build
|
# psnames driver source file for single build
|
||||||
#
|
#
|
||||||
PSNAMES_DRV_SRC_S := $(PSNAMES_DIR)/psnames.c
|
PSNAMES_DRV_SRC_S := $(PSNAMES_DIR)/psnames.c
|
||||||
|
|
||||||
|
|
||||||
# PSNames driver - single object
|
# psnames driver - single object
|
||||||
#
|
#
|
||||||
$(PSNAMES_DRV_OBJ_S): $(PSNAMES_DRV_SRC_S) $(PSNAMES_DRV_SRC) \
|
$(PSNAMES_DRV_OBJ_S): $(PSNAMES_DRV_SRC_S) $(PSNAMES_DRV_SRC) \
|
||||||
$(FREETYPE_H) $(PSNAMES_DRV_H)
|
$(FREETYPE_H) $(PSNAMES_DRV_H)
|
||||||
$(PSNAMES_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(PSNAMES_DRV_SRC_S))
|
$(PSNAMES_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(PSNAMES_DRV_SRC_S))
|
||||||
|
|
||||||
|
|
||||||
# PSNames driver - multiple objects
|
# psnames driver - multiple objects
|
||||||
#
|
#
|
||||||
$(OBJ_DIR)/%.$O: $(PSNAMES_DIR)/%.c $(FREETYPE_H) $(PSNAMES_DRV_H)
|
$(OBJ_DIR)/%.$O: $(PSNAMES_DIR)/%.c $(FREETYPE_H) $(PSNAMES_DRV_H)
|
||||||
$(PSNAMES_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
|
$(PSNAMES_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
#define FT_COMPONENT ttpost
|
#define FT_COMPONENT ttpost
|
||||||
|
|
||||||
|
|
||||||
/* If this configuration macro is defined, we rely on the `PSNames' */
|
/* If this configuration macro is defined, we rely on the `psnames' */
|
||||||
/* module to grab the glyph names. */
|
/* module to grab the glyph names. */
|
||||||
|
|
||||||
#ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
|
#ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
|
||||||
|
@ -62,9 +62,9 @@
|
||||||
#else /* FT_CONFIG_OPTION_POSTSCRIPT_NAMES */
|
#else /* FT_CONFIG_OPTION_POSTSCRIPT_NAMES */
|
||||||
|
|
||||||
|
|
||||||
/* Otherwise, we ignore the `PSNames' module, and provide our own */
|
/* Otherwise, we ignore the `psnames' module, and provide our own */
|
||||||
/* table of Mac names. Thus, it is possible to build a version of */
|
/* table of Mac names. Thus, it is possible to build a version of */
|
||||||
/* FreeType without the Type 1 driver & PSNames module. */
|
/* FreeType without the Type 1 driver & psnames module. */
|
||||||
|
|
||||||
#define MAC_NAME( x ) (FT_String*)tt_post_default_names[x]
|
#define MAC_NAME( x ) (FT_String*)tt_post_default_names[x]
|
||||||
|
|
||||||
|
|
|
@ -756,7 +756,7 @@ $ open/append out [.src.psnames]descrip.mms
|
||||||
$ copy sys$input: out
|
$ copy sys$input: out
|
||||||
$ deck
|
$ deck
|
||||||
#
|
#
|
||||||
# FreeType 2 PSNames driver compilation rules for VMS
|
# FreeType 2 psnames driver compilation rules for VMS
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue