2018-06-03 09:01:17 +02:00
|
|
|
/****************************************************************************
|
|
|
|
*
|
|
|
|
* t1cmap.c
|
|
|
|
*
|
|
|
|
* Type 1 character map support (body).
|
|
|
|
*
|
|
|
|
* Copyright 2002-2018 by
|
|
|
|
* David Turner, Robert Wilhelm, and Werner Lemberg.
|
|
|
|
*
|
|
|
|
* This file is part of the FreeType project, and may only be used,
|
|
|
|
* modified, and distributed under the terms of the FreeType project
|
|
|
|
* license, LICENSE.TXT. By continuing to use, modify, or distribute
|
|
|
|
* this file you indicate that you have read the license and
|
|
|
|
* understand and accept it fully.
|
|
|
|
*
|
|
|
|
*/
|
2002-03-31 13:18:15 +02:00
|
|
|
|
|
|
|
|
2002-02-27 22:25:47 +01:00
|
|
|
#include "t1cmap.h"
|
2002-03-21 16:02:54 +01:00
|
|
|
|
|
|
|
#include FT_INTERNAL_DEBUG_H
|
2002-02-27 22:25:47 +01:00
|
|
|
|
* src/winfonts/winfnt.c (FNT_Load_Glyph): Use first_char in
computation of glyph_index.
(FNT_Size_Set_Pixels): To find a strike, first check pixel_height
only, then try to find a better hit by comparing pixel_width also.
Without this fix it isn't possible to access all strikes.
Also compute metrics.max_advance to be in sync with other bitmap
drivers.
* src/base/ftobjs.c (FT_Set_Char_Size): Remove redundant code.
(FT_Set_Pixel_Size): Assign value to `metrics' after validation of
arguments.
Synchronize computation of height and width for bitmap strikes. The
`width' field in the FT_Bitmap_Size structure is now only useful to
enumerate different strikes. The `max_advance' field of the
FT_Size_Metrics structure should be used to get the (maximum) width
of a strike.
* src/bdf/bdfdrivr.c (BDF_Face_Init): Don't use AVERAGE_WIDTH for
computing `available_sizes->width' but make it always equal to
`available_sizes->height'.
* src/pcf/pcfread.c (pcf_load_font): Don't use RESOLUTION_X for
computing `available_sizes->width' but make it always equal to
`available_sizes->height'.
* src/truetype/ttdriver.c (Set_Pixel_Sizes): Pass only single
argument to function.
* src/psnames/psmodule.c (ps_unicode_value): Handle `.' after
`uniXXXX' and `uXXXX[X[X]]'.
* src/bdf/bdfdrivr.c: s/FT_Err_/BDF_Err/.
* src/cache/ftccache.c, src/cache/ftcsbits.c, src/cache/ftlru.c:
s/FT_Err_/FTC_Err_/.
* src/cff/cffcmap.c: s/FT_Err_/CFF_Err_/.
* src/pcf/pcfdrivr.c: s/FT_Err_/PCF_Err_/.
* src/psaux/t1cmap.c: Include psauxerr.h.
s/FT_Err_/PSaux_Err_/.
* src/pshinter/pshnterr.h: New file.
* src/pshinter/rules.mk: Updated.
* src/pshinter/pshalgo.c, src/pshinter/pshrec.c: Include pshnterr.h.
s/FT_Err_/PSH_Err_/.
* src/pfr/pfrdrivr.c, src/pfr/pfrobjs.c, src/pfr/pfrsbit.c:
s/FT_Err_/PFR_Err_/.
* src/sfnt/sfdriver.c, src/sfnt/sfobjs.c, src/sfnt/ttcmap0.c,
src/sfnt/ttload.c: s/FT_Err_/SFNT_Err_/.
* src/truetype/ttgload.c: s/FT_Err_/TT_Err_/.
* src/gzip/ftgzip.c: Load FT_MODULE_ERRORS_H and define
FT_ERR_PREFIX and FT_ERR_BASE.
s/FT_Err_/Gzip_Err_/.
2003-06-22 17:33:53 +02:00
|
|
|
#include "psauxerr.h"
|
|
|
|
|
2002-03-31 13:18:15 +02:00
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** TYPE1 STANDARD (AND EXPERT) ENCODING CMAPS *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
2002-02-27 22:25:47 +01:00
|
|
|
|
2002-03-21 16:02:54 +01:00
|
|
|
static void
|
2002-03-28 09:07:16 +01:00
|
|
|
t1_cmap_std_init( T1_CMapStd cmap,
|
|
|
|
FT_Int is_expert )
|
2002-02-27 22:25:47 +01:00
|
|
|
{
|
2003-09-29 22:33:37 +02:00
|
|
|
T1_Face face = (T1_Face)FT_CMAP_FACE( cmap );
|
* include/freetype/internal/bdftypes.h: removed obsolete header
* include/freetype/internal/cfftypes.h, src/cff/cfftypes.h,
src/cff/cffload.h, src/cff/cffobjs.h, src/cff/cffparse.h,
include/freetype/internal/services/svbdf.h: moving "cfftypes.h" from
'include/freetype/internal' to 'src/cff' since no other modules needs
to known about these types
* include/freetype/internal/t42types.h,
include/freetype/internal/internal.h, src/type42/t42objs.h,
src/type42/t42drivr.c, src/type42/t42types.h: moving "t42types.h" from
'include/freetype/internal' to 'src/type42' since no other modules needs
to known about these types
* src/gzip/infblock.c: removing compiler warning
* include/freetype/internal/services/svpsinfo.h,
include/freetype/internal/ftserv.h, src/cff/cffdrivr.c,
src/cid/ciddrivr.c, src/type1/t1driver.c, src/type42/t42drivr.c,
src/base/fttype1.c: migrating to FT_SERVICE_ID_POSTSCRIPT_INFO defined
in "svpsinfo.h", removing some sad hacks.
2003-10-29 22:43:52 +01:00
|
|
|
FT_Service_PsCMaps psnames = (FT_Service_PsCMaps)face->psnames;
|
2002-02-27 22:25:47 +01:00
|
|
|
|
2002-03-31 13:18:15 +02:00
|
|
|
|
2015-02-25 11:20:20 +01:00
|
|
|
cmap->num_glyphs = (FT_UInt)face->type1.num_glyphs;
|
2002-03-25 18:02:26 +01:00
|
|
|
cmap->glyph_names = (const char* const*)face->type1.glyph_names;
|
2002-03-21 16:02:54 +01:00
|
|
|
cmap->sid_to_string = psnames->adobe_std_strings;
|
|
|
|
cmap->code_to_sid = is_expert ? psnames->adobe_expert_encoding
|
|
|
|
: psnames->adobe_std_encoding;
|
2002-02-27 22:25:47 +01:00
|
|
|
|
2016-12-26 17:08:17 +01:00
|
|
|
FT_ASSERT( cmap->code_to_sid );
|
2002-02-27 22:25:47 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_DEF( void )
|
|
|
|
t1_cmap_std_done( T1_CMapStd cmap )
|
|
|
|
{
|
2002-03-21 16:02:54 +01:00
|
|
|
cmap->num_glyphs = 0;
|
|
|
|
cmap->glyph_names = NULL;
|
|
|
|
cmap->sid_to_string = NULL;
|
|
|
|
cmap->code_to_sid = NULL;
|
2002-02-27 22:25:47 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_DEF( FT_UInt )
|
2002-03-31 13:18:15 +02:00
|
|
|
t1_cmap_std_char_index( T1_CMapStd cmap,
|
|
|
|
FT_UInt32 char_code )
|
2002-02-27 22:25:47 +01:00
|
|
|
{
|
|
|
|
FT_UInt result = 0;
|
|
|
|
|
2002-03-31 13:18:15 +02:00
|
|
|
|
2002-02-27 22:25:47 +01:00
|
|
|
if ( char_code < 256 )
|
|
|
|
{
|
2002-03-21 16:02:54 +01:00
|
|
|
FT_UInt code, n;
|
2002-02-27 22:25:47 +01:00
|
|
|
const char* glyph_name;
|
|
|
|
|
2002-03-31 13:18:15 +02:00
|
|
|
|
|
|
|
/* convert character code to Adobe SID string */
|
|
|
|
code = cmap->code_to_sid[char_code];
|
2002-03-21 16:02:54 +01:00
|
|
|
glyph_name = cmap->sid_to_string( code );
|
2002-02-27 22:25:47 +01:00
|
|
|
|
|
|
|
/* look for the corresponding glyph name */
|
|
|
|
for ( n = 0; n < cmap->num_glyphs; n++ )
|
|
|
|
{
|
|
|
|
const char* gname = cmap->glyph_names[n];
|
|
|
|
|
2002-03-31 13:18:15 +02:00
|
|
|
|
2002-04-14 02:54:32 +02:00
|
|
|
if ( gname && gname[0] == glyph_name[0] &&
|
|
|
|
ft_strcmp( gname, glyph_name ) == 0 )
|
2002-02-27 22:25:47 +01:00
|
|
|
{
|
|
|
|
result = n;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2002-03-31 13:18:15 +02:00
|
|
|
|
2002-02-27 22:25:47 +01:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-07-31 17:32:09 +02:00
|
|
|
FT_CALLBACK_DEF( FT_UInt32 )
|
2002-02-27 22:25:47 +01:00
|
|
|
t1_cmap_std_char_next( T1_CMapStd cmap,
|
|
|
|
FT_UInt32 *pchar_code )
|
|
|
|
{
|
2002-03-31 13:18:15 +02:00
|
|
|
FT_UInt result = 0;
|
|
|
|
FT_UInt32 char_code = *pchar_code + 1;
|
|
|
|
|
2002-02-27 22:25:47 +01:00
|
|
|
|
|
|
|
while ( char_code < 256 )
|
|
|
|
{
|
2002-03-21 16:02:54 +01:00
|
|
|
result = t1_cmap_std_char_index( cmap, char_code );
|
2002-02-27 22:25:47 +01:00
|
|
|
if ( result != 0 )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
char_code++;
|
|
|
|
}
|
|
|
|
char_code = 0;
|
|
|
|
|
|
|
|
Exit:
|
|
|
|
*pchar_code = char_code;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_DEF( FT_Error )
|
[cff, pfr, psaux, winfonts] Fix Savannah bug #43676.
Don't cast cmap init function pointers to an incompatible type.
Without this patch, the number of parameters between declaration and
the real signature differs. Calling such a function results in
undefined behavior.
ISO/IEC 9899:TC3 (Committee Draft September 7, 2007)
6.5.2.2 Function calls
9 If the function is defined with a type that is not
compatible with the type (of the expression) pointed to by
the expression that denotes the called function, the
behavior is undefined.
On certain platforms (c -> js with emscripten) this causes
termination of execution or invalid calls because in the emscripten
implementation, function pointers of different types are stored in
different pointer arrays. Incorrect pointer type here results in
indexing of an incorrect array.
* src/cff/cffcmap.c (cff_cmap_encoding_init, cff_cmap_unicode_init),
src/pfr/pfrcmap.c (pfr_cmap_init), src/psaux/t1cmap.c
t1_cmap_standard_init, t1_cmap_expert_init, t1_cmap_custom_init,
t1_cmap_unicode_init), src/winfonts/winfnt.c (fnt_cmap_init): Fix
signature.
2014-11-24 09:53:07 +01:00
|
|
|
t1_cmap_standard_init( T1_CMapStd cmap,
|
|
|
|
FT_Pointer pointer )
|
2002-02-27 22:25:47 +01:00
|
|
|
{
|
[cff, pfr, psaux, winfonts] Fix Savannah bug #43676.
Don't cast cmap init function pointers to an incompatible type.
Without this patch, the number of parameters between declaration and
the real signature differs. Calling such a function results in
undefined behavior.
ISO/IEC 9899:TC3 (Committee Draft September 7, 2007)
6.5.2.2 Function calls
9 If the function is defined with a type that is not
compatible with the type (of the expression) pointed to by
the expression that denotes the called function, the
behavior is undefined.
On certain platforms (c -> js with emscripten) this causes
termination of execution or invalid calls because in the emscripten
implementation, function pointers of different types are stored in
different pointer arrays. Incorrect pointer type here results in
indexing of an incorrect array.
* src/cff/cffcmap.c (cff_cmap_encoding_init, cff_cmap_unicode_init),
src/pfr/pfrcmap.c (pfr_cmap_init), src/psaux/t1cmap.c
t1_cmap_standard_init, t1_cmap_expert_init, t1_cmap_custom_init,
t1_cmap_unicode_init), src/winfonts/winfnt.c (fnt_cmap_init): Fix
signature.
2014-11-24 09:53:07 +01:00
|
|
|
FT_UNUSED( pointer );
|
|
|
|
|
|
|
|
|
2002-02-27 22:25:47 +01:00
|
|
|
t1_cmap_std_init( cmap, 0 );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-03-28 09:07:16 +01:00
|
|
|
FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
|
2002-02-27 22:25:47 +01:00
|
|
|
t1_cmap_standard_class_rec =
|
|
|
|
{
|
2002-03-31 13:18:15 +02:00
|
|
|
sizeof ( T1_CMapStdRec ),
|
2002-02-27 22:25:47 +01:00
|
|
|
|
2016-09-17 17:12:50 +02:00
|
|
|
(FT_CMap_InitFunc) t1_cmap_standard_init, /* init */
|
|
|
|
(FT_CMap_DoneFunc) t1_cmap_std_done, /* done */
|
|
|
|
(FT_CMap_CharIndexFunc)t1_cmap_std_char_index, /* char_index */
|
|
|
|
(FT_CMap_CharNextFunc) t1_cmap_std_char_next, /* char_next */
|
|
|
|
|
|
|
|
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
|
|
|
|
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
|
|
|
|
(FT_CMap_VariantListFunc) NULL, /* variant_list */
|
|
|
|
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
|
|
|
|
(FT_CMap_VariantCharListFunc) NULL /* variantchar_list */
|
2002-02-27 22:25:47 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2002-03-21 16:02:54 +01:00
|
|
|
FT_CALLBACK_DEF( FT_Error )
|
[cff, pfr, psaux, winfonts] Fix Savannah bug #43676.
Don't cast cmap init function pointers to an incompatible type.
Without this patch, the number of parameters between declaration and
the real signature differs. Calling such a function results in
undefined behavior.
ISO/IEC 9899:TC3 (Committee Draft September 7, 2007)
6.5.2.2 Function calls
9 If the function is defined with a type that is not
compatible with the type (of the expression) pointed to by
the expression that denotes the called function, the
behavior is undefined.
On certain platforms (c -> js with emscripten) this causes
termination of execution or invalid calls because in the emscripten
implementation, function pointers of different types are stored in
different pointer arrays. Incorrect pointer type here results in
indexing of an incorrect array.
* src/cff/cffcmap.c (cff_cmap_encoding_init, cff_cmap_unicode_init),
src/pfr/pfrcmap.c (pfr_cmap_init), src/psaux/t1cmap.c
t1_cmap_standard_init, t1_cmap_expert_init, t1_cmap_custom_init,
t1_cmap_unicode_init), src/winfonts/winfnt.c (fnt_cmap_init): Fix
signature.
2014-11-24 09:53:07 +01:00
|
|
|
t1_cmap_expert_init( T1_CMapStd cmap,
|
|
|
|
FT_Pointer pointer )
|
2002-02-27 22:25:47 +01:00
|
|
|
{
|
[cff, pfr, psaux, winfonts] Fix Savannah bug #43676.
Don't cast cmap init function pointers to an incompatible type.
Without this patch, the number of parameters between declaration and
the real signature differs. Calling such a function results in
undefined behavior.
ISO/IEC 9899:TC3 (Committee Draft September 7, 2007)
6.5.2.2 Function calls
9 If the function is defined with a type that is not
compatible with the type (of the expression) pointed to by
the expression that denotes the called function, the
behavior is undefined.
On certain platforms (c -> js with emscripten) this causes
termination of execution or invalid calls because in the emscripten
implementation, function pointers of different types are stored in
different pointer arrays. Incorrect pointer type here results in
indexing of an incorrect array.
* src/cff/cffcmap.c (cff_cmap_encoding_init, cff_cmap_unicode_init),
src/pfr/pfrcmap.c (pfr_cmap_init), src/psaux/t1cmap.c
t1_cmap_standard_init, t1_cmap_expert_init, t1_cmap_custom_init,
t1_cmap_unicode_init), src/winfonts/winfnt.c (fnt_cmap_init): Fix
signature.
2014-11-24 09:53:07 +01:00
|
|
|
FT_UNUSED( pointer );
|
|
|
|
|
|
|
|
|
2002-02-27 22:25:47 +01:00
|
|
|
t1_cmap_std_init( cmap, 1 );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-03-28 09:07:16 +01:00
|
|
|
FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
|
2002-02-27 22:25:47 +01:00
|
|
|
t1_cmap_expert_class_rec =
|
|
|
|
{
|
2002-03-31 13:18:15 +02:00
|
|
|
sizeof ( T1_CMapStdRec ),
|
2002-02-27 22:25:47 +01:00
|
|
|
|
2016-09-17 17:12:50 +02:00
|
|
|
(FT_CMap_InitFunc) t1_cmap_expert_init, /* init */
|
|
|
|
(FT_CMap_DoneFunc) t1_cmap_std_done, /* done */
|
|
|
|
(FT_CMap_CharIndexFunc)t1_cmap_std_char_index, /* char_index */
|
|
|
|
(FT_CMap_CharNextFunc) t1_cmap_std_char_next, /* char_next */
|
Add support for cmap type 14.
* devel/ftoption.h, include/freetype/config/ftoption.h
(TT_CONFIG_CMAP_FORMAT_14): New macro.
* include/freetype/internal/ftobjs.h (FT_CMap_CharVarIndexFunc,
FT_CMap_CharVarIsDefaultFunc, FT_CMap_VariantListFunc,
FT_CMap_CharVariantListFunc, FT_CMap_VariantCharListFunc): New
support function prototypes.
(FT_CMap_ClassRec): Add them.
Update all users.
* include/freetype/ttnameid.h (TT_APPLE_ID_VARIANT_SELECTOR): New
macro.
* include/freetype/freetype.h (FT_Get_Char_Variant_Index,
FT_Get_Char_Variant_IsDefault, FT_Get_Variant_Selectors,
FT_Get_Variants_Of_Char, FT_Get_Chars_Of_Variant): New API
functions.
* src/base/ftobjs.c (find_variant_selector_charmap): New auxiliary
function.
(FT_Set_Charmap): Disallow cmaps of type 14.
(FT_Get_Char_Variant_Index, FT_Get_Char_Variant_IsDefault,
FT_Get_Variant_Selectors, FT_Get_Variants_Of_Char,
FT_Get_Chars_Of_Variant): New API functions.
* src/sfnt/ttcmap.c (TT_PEEK_UINT24, TT_NEXT_UINT24): New macros.
(TT_CMap14Rec, tt_cmap14_init, tt_cmap14_validate,
tt_cmap14_char_index, tt_cmap14_char_next, tt_cmap14_get_info,
tt_cmap14_char_map_def_binary, tt_cmap14_char_map_nondef_binary,
tt_cmap14_find_variant, tt_cmap14_char_var_index,
tt_cmap14_char_var_isdefault, tt_cmap14_variants,
tt_cmap14_char_variants, tt_cmap14_def_char_count,
tt_cmap14_get_def_chars, tt_cmap14_get_nondef_chars,
tt_cmap14_variant_chars, tt_cmap14_class_rec): New functions and
structures for cmap 14 support.
(tt_cmap_classes): Register tt_cmap14_class_rec.
(tt_face_build_cmaps): One more error message.
* docs/CHANGES: Mention cmap 14 support.
2007-10-15 19:21:32 +02:00
|
|
|
|
2016-09-17 17:12:50 +02:00
|
|
|
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
|
|
|
|
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
|
|
|
|
(FT_CMap_VariantListFunc) NULL, /* variant_list */
|
|
|
|
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
|
|
|
|
(FT_CMap_VariantCharListFunc) NULL /* variantchar_list */
|
2002-02-27 22:25:47 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2002-03-31 13:18:15 +02:00
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** TYPE1 CUSTOM ENCODING CMAP *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
2002-02-27 22:25:47 +01:00
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_DEF( FT_Error )
|
[cff, pfr, psaux, winfonts] Fix Savannah bug #43676.
Don't cast cmap init function pointers to an incompatible type.
Without this patch, the number of parameters between declaration and
the real signature differs. Calling such a function results in
undefined behavior.
ISO/IEC 9899:TC3 (Committee Draft September 7, 2007)
6.5.2.2 Function calls
9 If the function is defined with a type that is not
compatible with the type (of the expression) pointed to by
the expression that denotes the called function, the
behavior is undefined.
On certain platforms (c -> js with emscripten) this causes
termination of execution or invalid calls because in the emscripten
implementation, function pointers of different types are stored in
different pointer arrays. Incorrect pointer type here results in
indexing of an incorrect array.
* src/cff/cffcmap.c (cff_cmap_encoding_init, cff_cmap_unicode_init),
src/pfr/pfrcmap.c (pfr_cmap_init), src/psaux/t1cmap.c
t1_cmap_standard_init, t1_cmap_expert_init, t1_cmap_custom_init,
t1_cmap_unicode_init), src/winfonts/winfnt.c (fnt_cmap_init): Fix
signature.
2014-11-24 09:53:07 +01:00
|
|
|
t1_cmap_custom_init( T1_CMapCustom cmap,
|
|
|
|
FT_Pointer pointer )
|
2002-02-27 22:25:47 +01:00
|
|
|
{
|
2002-03-31 13:18:15 +02:00
|
|
|
T1_Face face = (T1_Face)FT_CMAP_FACE( cmap );
|
2002-03-21 16:02:54 +01:00
|
|
|
T1_Encoding encoding = &face->type1.encoding;
|
2002-02-27 22:25:47 +01:00
|
|
|
|
[cff, pfr, psaux, winfonts] Fix Savannah bug #43676.
Don't cast cmap init function pointers to an incompatible type.
Without this patch, the number of parameters between declaration and
the real signature differs. Calling such a function results in
undefined behavior.
ISO/IEC 9899:TC3 (Committee Draft September 7, 2007)
6.5.2.2 Function calls
9 If the function is defined with a type that is not
compatible with the type (of the expression) pointed to by
the expression that denotes the called function, the
behavior is undefined.
On certain platforms (c -> js with emscripten) this causes
termination of execution or invalid calls because in the emscripten
implementation, function pointers of different types are stored in
different pointer arrays. Incorrect pointer type here results in
indexing of an incorrect array.
* src/cff/cffcmap.c (cff_cmap_encoding_init, cff_cmap_unicode_init),
src/pfr/pfrcmap.c (pfr_cmap_init), src/psaux/t1cmap.c
t1_cmap_standard_init, t1_cmap_expert_init, t1_cmap_custom_init,
t1_cmap_unicode_init), src/winfonts/winfnt.c (fnt_cmap_init): Fix
signature.
2014-11-24 09:53:07 +01:00
|
|
|
FT_UNUSED( pointer );
|
|
|
|
|
2002-03-31 13:18:15 +02:00
|
|
|
|
2015-02-25 11:20:20 +01:00
|
|
|
cmap->first = (FT_UInt)encoding->code_first;
|
|
|
|
cmap->count = (FT_UInt)encoding->code_last - cmap->first;
|
2002-02-27 22:25:47 +01:00
|
|
|
cmap->indices = encoding->char_index;
|
|
|
|
|
2016-12-26 17:08:17 +01:00
|
|
|
FT_ASSERT( cmap->indices );
|
2002-02-27 22:25:47 +01:00
|
|
|
FT_ASSERT( encoding->code_first <= encoding->code_last );
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_DEF( void )
|
|
|
|
t1_cmap_custom_done( T1_CMapCustom cmap )
|
|
|
|
{
|
|
|
|
cmap->indices = NULL;
|
|
|
|
cmap->first = 0;
|
|
|
|
cmap->count = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_DEF( FT_UInt )
|
|
|
|
t1_cmap_custom_char_index( T1_CMapCustom cmap,
|
|
|
|
FT_UInt32 char_code )
|
|
|
|
{
|
|
|
|
FT_UInt result = 0;
|
2002-03-31 13:18:15 +02:00
|
|
|
|
2002-02-27 22:25:47 +01:00
|
|
|
|
2002-06-19 17:57:55 +02:00
|
|
|
if ( ( char_code >= cmap->first ) &&
|
|
|
|
( char_code < ( cmap->first + cmap->count ) ) )
|
|
|
|
result = cmap->indices[char_code];
|
2002-02-27 22:25:47 +01:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-07-31 17:32:09 +02:00
|
|
|
FT_CALLBACK_DEF( FT_UInt32 )
|
2002-03-21 16:02:54 +01:00
|
|
|
t1_cmap_custom_char_next( T1_CMapCustom cmap,
|
|
|
|
FT_UInt32 *pchar_code )
|
2002-02-27 22:25:47 +01:00
|
|
|
{
|
2002-03-31 13:18:15 +02:00
|
|
|
FT_UInt result = 0;
|
|
|
|
FT_UInt32 char_code = *pchar_code;
|
|
|
|
|
2002-02-27 22:25:47 +01:00
|
|
|
|
2016-12-26 23:57:45 +01:00
|
|
|
char_code++;
|
2002-02-27 22:25:47 +01:00
|
|
|
|
|
|
|
if ( char_code < cmap->first )
|
|
|
|
char_code = cmap->first;
|
|
|
|
|
2002-06-19 17:57:55 +02:00
|
|
|
for ( ; char_code < ( cmap->first + cmap->count ); char_code++ )
|
2002-02-27 22:25:47 +01:00
|
|
|
{
|
2002-06-19 17:57:55 +02:00
|
|
|
result = cmap->indices[char_code];
|
2002-02-27 22:25:47 +01:00
|
|
|
if ( result != 0 )
|
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
char_code = 0;
|
|
|
|
|
|
|
|
Exit:
|
|
|
|
*pchar_code = char_code;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-03-28 09:07:16 +01:00
|
|
|
FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
|
2002-02-27 22:25:47 +01:00
|
|
|
t1_cmap_custom_class_rec =
|
|
|
|
{
|
2002-03-31 13:18:15 +02:00
|
|
|
sizeof ( T1_CMapCustomRec ),
|
2002-02-27 22:25:47 +01:00
|
|
|
|
2016-09-17 17:12:50 +02:00
|
|
|
(FT_CMap_InitFunc) t1_cmap_custom_init, /* init */
|
|
|
|
(FT_CMap_DoneFunc) t1_cmap_custom_done, /* done */
|
|
|
|
(FT_CMap_CharIndexFunc)t1_cmap_custom_char_index, /* char_index */
|
|
|
|
(FT_CMap_CharNextFunc) t1_cmap_custom_char_next, /* char_next */
|
Add support for cmap type 14.
* devel/ftoption.h, include/freetype/config/ftoption.h
(TT_CONFIG_CMAP_FORMAT_14): New macro.
* include/freetype/internal/ftobjs.h (FT_CMap_CharVarIndexFunc,
FT_CMap_CharVarIsDefaultFunc, FT_CMap_VariantListFunc,
FT_CMap_CharVariantListFunc, FT_CMap_VariantCharListFunc): New
support function prototypes.
(FT_CMap_ClassRec): Add them.
Update all users.
* include/freetype/ttnameid.h (TT_APPLE_ID_VARIANT_SELECTOR): New
macro.
* include/freetype/freetype.h (FT_Get_Char_Variant_Index,
FT_Get_Char_Variant_IsDefault, FT_Get_Variant_Selectors,
FT_Get_Variants_Of_Char, FT_Get_Chars_Of_Variant): New API
functions.
* src/base/ftobjs.c (find_variant_selector_charmap): New auxiliary
function.
(FT_Set_Charmap): Disallow cmaps of type 14.
(FT_Get_Char_Variant_Index, FT_Get_Char_Variant_IsDefault,
FT_Get_Variant_Selectors, FT_Get_Variants_Of_Char,
FT_Get_Chars_Of_Variant): New API functions.
* src/sfnt/ttcmap.c (TT_PEEK_UINT24, TT_NEXT_UINT24): New macros.
(TT_CMap14Rec, tt_cmap14_init, tt_cmap14_validate,
tt_cmap14_char_index, tt_cmap14_char_next, tt_cmap14_get_info,
tt_cmap14_char_map_def_binary, tt_cmap14_char_map_nondef_binary,
tt_cmap14_find_variant, tt_cmap14_char_var_index,
tt_cmap14_char_var_isdefault, tt_cmap14_variants,
tt_cmap14_char_variants, tt_cmap14_def_char_count,
tt_cmap14_get_def_chars, tt_cmap14_get_nondef_chars,
tt_cmap14_variant_chars, tt_cmap14_class_rec): New functions and
structures for cmap 14 support.
(tt_cmap_classes): Register tt_cmap14_class_rec.
(tt_face_build_cmaps): One more error message.
* docs/CHANGES: Mention cmap 14 support.
2007-10-15 19:21:32 +02:00
|
|
|
|
2016-09-17 17:12:50 +02:00
|
|
|
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
|
|
|
|
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
|
|
|
|
(FT_CMap_VariantListFunc) NULL, /* variant_list */
|
|
|
|
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
|
|
|
|
(FT_CMap_VariantCharListFunc) NULL /* variantchar_list */
|
2002-03-31 13:18:15 +02:00
|
|
|
};
|
2002-02-27 22:25:47 +01:00
|
|
|
|
|
|
|
|
2002-03-31 13:18:15 +02:00
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** TYPE1 SYNTHETIC UNICODE ENCODING CMAP *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
2002-02-27 22:25:47 +01:00
|
|
|
|
* builds/unix/ftsystem.c, include/freetype/config/ftheader.h,
include/freetype/internal/services/svotval.h,
include/freetype/internal/services/svpfr.h,
src/base/ftsystem.c, src/bdf/bdfdrivr.c, src/cache/ftcbasic.c,
src/cff/cffcmap.c, src/gzip/ftgzip.c, src/lzw/ftlzw.c,
src/lzw/ftlzw2.c, src/psaux/t1cmap.c, src/sfnt/ttbdf.c,
src/smooth/ftgrays.c:
solved -Wmissing-prototypes warnings with GCC
2006-02-25 15:53:02 +01:00
|
|
|
FT_CALLBACK_DEF( const char * )
|
2012-02-24 12:26:25 +01:00
|
|
|
psaux_get_glyph_name( T1_Face face,
|
|
|
|
FT_UInt idx )
|
2006-01-12 09:12:27 +01:00
|
|
|
{
|
|
|
|
return face->type1.glyph_names[idx];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-02-27 22:25:47 +01:00
|
|
|
FT_CALLBACK_DEF( FT_Error )
|
[cff, pfr, psaux, winfonts] Fix Savannah bug #43676.
Don't cast cmap init function pointers to an incompatible type.
Without this patch, the number of parameters between declaration and
the real signature differs. Calling such a function results in
undefined behavior.
ISO/IEC 9899:TC3 (Committee Draft September 7, 2007)
6.5.2.2 Function calls
9 If the function is defined with a type that is not
compatible with the type (of the expression) pointed to by
the expression that denotes the called function, the
behavior is undefined.
On certain platforms (c -> js with emscripten) this causes
termination of execution or invalid calls because in the emscripten
implementation, function pointers of different types are stored in
different pointer arrays. Incorrect pointer type here results in
indexing of an incorrect array.
* src/cff/cffcmap.c (cff_cmap_encoding_init, cff_cmap_unicode_init),
src/pfr/pfrcmap.c (pfr_cmap_init), src/psaux/t1cmap.c
t1_cmap_standard_init, t1_cmap_expert_init, t1_cmap_custom_init,
t1_cmap_unicode_init), src/winfonts/winfnt.c (fnt_cmap_init): Fix
signature.
2014-11-24 09:53:07 +01:00
|
|
|
t1_cmap_unicode_init( PS_Unicodes unicodes,
|
|
|
|
FT_Pointer pointer )
|
2002-02-27 22:25:47 +01:00
|
|
|
{
|
2006-01-12 09:12:27 +01:00
|
|
|
T1_Face face = (T1_Face)FT_CMAP_FACE( unicodes );
|
2003-09-29 22:33:37 +02:00
|
|
|
FT_Memory memory = FT_FACE_MEMORY( face );
|
* include/freetype/internal/bdftypes.h: removed obsolete header
* include/freetype/internal/cfftypes.h, src/cff/cfftypes.h,
src/cff/cffload.h, src/cff/cffobjs.h, src/cff/cffparse.h,
include/freetype/internal/services/svbdf.h: moving "cfftypes.h" from
'include/freetype/internal' to 'src/cff' since no other modules needs
to known about these types
* include/freetype/internal/t42types.h,
include/freetype/internal/internal.h, src/type42/t42objs.h,
src/type42/t42drivr.c, src/type42/t42types.h: moving "t42types.h" from
'include/freetype/internal' to 'src/type42' since no other modules needs
to known about these types
* src/gzip/infblock.c: removing compiler warning
* include/freetype/internal/services/svpsinfo.h,
include/freetype/internal/ftserv.h, src/cff/cffdrivr.c,
src/cid/ciddrivr.c, src/type1/t1driver.c, src/type42/t42drivr.c,
src/base/fttype1.c: migrating to FT_SERVICE_ID_POSTSCRIPT_INFO defined
in "svpsinfo.h", removing some sad hacks.
2003-10-29 22:43:52 +01:00
|
|
|
FT_Service_PsCMaps psnames = (FT_Service_PsCMaps)face->psnames;
|
2002-03-28 09:07:16 +01:00
|
|
|
|
[cff, pfr, psaux, winfonts] Fix Savannah bug #43676.
Don't cast cmap init function pointers to an incompatible type.
Without this patch, the number of parameters between declaration and
the real signature differs. Calling such a function results in
undefined behavior.
ISO/IEC 9899:TC3 (Committee Draft September 7, 2007)
6.5.2.2 Function calls
9 If the function is defined with a type that is not
compatible with the type (of the expression) pointed to by
the expression that denotes the called function, the
behavior is undefined.
On certain platforms (c -> js with emscripten) this causes
termination of execution or invalid calls because in the emscripten
implementation, function pointers of different types are stored in
different pointer arrays. Incorrect pointer type here results in
indexing of an incorrect array.
* src/cff/cffcmap.c (cff_cmap_encoding_init, cff_cmap_unicode_init),
src/pfr/pfrcmap.c (pfr_cmap_init), src/psaux/t1cmap.c
t1_cmap_standard_init, t1_cmap_expert_init, t1_cmap_custom_init,
t1_cmap_unicode_init), src/winfonts/winfnt.c (fnt_cmap_init): Fix
signature.
2014-11-24 09:53:07 +01:00
|
|
|
FT_UNUSED( pointer );
|
|
|
|
|
2002-02-27 22:25:47 +01:00
|
|
|
|
2006-01-11 11:08:49 +01:00
|
|
|
return psnames->unicodes_init( memory,
|
2006-01-12 09:12:27 +01:00
|
|
|
unicodes,
|
2015-02-25 11:20:20 +01:00
|
|
|
(FT_UInt)face->type1.num_glyphs,
|
2012-02-24 12:26:25 +01:00
|
|
|
(PS_GetGlyphNameFunc)&psaux_get_glyph_name,
|
2006-06-06 14:54:08 +02:00
|
|
|
(PS_FreeGlyphNameFunc)NULL,
|
2006-01-12 09:12:27 +01:00
|
|
|
(FT_Pointer)face );
|
2002-02-27 22:25:47 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_DEF( void )
|
2006-01-12 09:12:27 +01:00
|
|
|
t1_cmap_unicode_done( PS_Unicodes unicodes )
|
2002-02-27 22:25:47 +01:00
|
|
|
{
|
2006-01-12 09:12:27 +01:00
|
|
|
FT_Face face = FT_CMAP_FACE( unicodes );
|
2006-01-11 11:08:49 +01:00
|
|
|
FT_Memory memory = FT_FACE_MEMORY( face );
|
2002-03-01 03:26:22 +01:00
|
|
|
|
2006-01-11 11:08:49 +01:00
|
|
|
|
2006-01-12 09:12:27 +01:00
|
|
|
FT_FREE( unicodes->maps );
|
|
|
|
unicodes->num_maps = 0;
|
2002-02-27 22:25:47 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_DEF( FT_UInt )
|
2006-01-12 09:12:27 +01:00
|
|
|
t1_cmap_unicode_char_index( PS_Unicodes unicodes,
|
|
|
|
FT_UInt32 char_code )
|
2002-02-27 22:25:47 +01:00
|
|
|
{
|
2006-01-12 09:12:27 +01:00
|
|
|
T1_Face face = (T1_Face)FT_CMAP_FACE( unicodes );
|
2006-01-11 11:08:49 +01:00
|
|
|
FT_Service_PsCMaps psnames = (FT_Service_PsCMaps)face->psnames;
|
2002-03-01 03:26:22 +01:00
|
|
|
|
|
|
|
|
2006-01-12 09:12:27 +01:00
|
|
|
return psnames->unicodes_char_index( unicodes, char_code );
|
2002-02-27 22:25:47 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-07-31 17:32:09 +02:00
|
|
|
FT_CALLBACK_DEF( FT_UInt32 )
|
2006-01-12 09:12:27 +01:00
|
|
|
t1_cmap_unicode_char_next( PS_Unicodes unicodes,
|
|
|
|
FT_UInt32 *pchar_code )
|
2002-02-27 22:25:47 +01:00
|
|
|
{
|
2006-01-12 09:12:27 +01:00
|
|
|
T1_Face face = (T1_Face)FT_CMAP_FACE( unicodes );
|
2006-01-11 11:08:49 +01:00
|
|
|
FT_Service_PsCMaps psnames = (FT_Service_PsCMaps)face->psnames;
|
2002-03-01 03:26:22 +01:00
|
|
|
|
2002-02-27 22:25:47 +01:00
|
|
|
|
2006-01-12 09:12:27 +01:00
|
|
|
return psnames->unicodes_char_next( unicodes, pchar_code );
|
2002-02-27 22:25:47 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-03-28 09:07:16 +01:00
|
|
|
FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
|
2002-02-27 22:25:47 +01:00
|
|
|
t1_cmap_unicode_class_rec =
|
|
|
|
{
|
2006-01-12 09:12:27 +01:00
|
|
|
sizeof ( PS_UnicodesRec ),
|
2002-03-21 16:02:54 +01:00
|
|
|
|
2016-09-17 17:12:50 +02:00
|
|
|
(FT_CMap_InitFunc) t1_cmap_unicode_init, /* init */
|
|
|
|
(FT_CMap_DoneFunc) t1_cmap_unicode_done, /* done */
|
|
|
|
(FT_CMap_CharIndexFunc)t1_cmap_unicode_char_index, /* char_index */
|
|
|
|
(FT_CMap_CharNextFunc) t1_cmap_unicode_char_next, /* char_next */
|
Add support for cmap type 14.
* devel/ftoption.h, include/freetype/config/ftoption.h
(TT_CONFIG_CMAP_FORMAT_14): New macro.
* include/freetype/internal/ftobjs.h (FT_CMap_CharVarIndexFunc,
FT_CMap_CharVarIsDefaultFunc, FT_CMap_VariantListFunc,
FT_CMap_CharVariantListFunc, FT_CMap_VariantCharListFunc): New
support function prototypes.
(FT_CMap_ClassRec): Add them.
Update all users.
* include/freetype/ttnameid.h (TT_APPLE_ID_VARIANT_SELECTOR): New
macro.
* include/freetype/freetype.h (FT_Get_Char_Variant_Index,
FT_Get_Char_Variant_IsDefault, FT_Get_Variant_Selectors,
FT_Get_Variants_Of_Char, FT_Get_Chars_Of_Variant): New API
functions.
* src/base/ftobjs.c (find_variant_selector_charmap): New auxiliary
function.
(FT_Set_Charmap): Disallow cmaps of type 14.
(FT_Get_Char_Variant_Index, FT_Get_Char_Variant_IsDefault,
FT_Get_Variant_Selectors, FT_Get_Variants_Of_Char,
FT_Get_Chars_Of_Variant): New API functions.
* src/sfnt/ttcmap.c (TT_PEEK_UINT24, TT_NEXT_UINT24): New macros.
(TT_CMap14Rec, tt_cmap14_init, tt_cmap14_validate,
tt_cmap14_char_index, tt_cmap14_char_next, tt_cmap14_get_info,
tt_cmap14_char_map_def_binary, tt_cmap14_char_map_nondef_binary,
tt_cmap14_find_variant, tt_cmap14_char_var_index,
tt_cmap14_char_var_isdefault, tt_cmap14_variants,
tt_cmap14_char_variants, tt_cmap14_def_char_count,
tt_cmap14_get_def_chars, tt_cmap14_get_nondef_chars,
tt_cmap14_variant_chars, tt_cmap14_class_rec): New functions and
structures for cmap 14 support.
(tt_cmap_classes): Register tt_cmap14_class_rec.
(tt_face_build_cmaps): One more error message.
* docs/CHANGES: Mention cmap 14 support.
2007-10-15 19:21:32 +02:00
|
|
|
|
2016-09-17 17:12:50 +02:00
|
|
|
(FT_CMap_CharVarIndexFunc) NULL, /* char_var_index */
|
|
|
|
(FT_CMap_CharVarIsDefaultFunc)NULL, /* char_var_default */
|
|
|
|
(FT_CMap_VariantListFunc) NULL, /* variant_list */
|
|
|
|
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
|
|
|
|
(FT_CMap_VariantCharListFunc) NULL /* variantchar_list */
|
2002-03-31 13:18:15 +02:00
|
|
|
};
|
2002-03-21 16:02:54 +01:00
|
|
|
|
|
|
|
|
2002-03-31 13:18:15 +02:00
|
|
|
/* END */
|