* include/freetype/ttnameid.h (TT_ADOBE_ID_LATIN_1): New macro.
* src/type1/t1objs.c (T1_Face_Init): Use TT_ADOBE_ID* values.
This commit is contained in:
parent
a9cd856ee2
commit
8f963be41c
|
@ -1,3 +1,8 @@
|
|||
2003-12-18 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
* include/freetype/ttnameid.h (TT_ADOBE_ID_LATIN_1): New macro.
|
||||
* src/type1/t1objs.c (T1_Face_Init): Use TT_ADOBE_ID* values.
|
||||
|
||||
2003-12-18 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
* src/cff/cfftypes.h (CFF_FontRecDictRec): Change type of
|
||||
|
|
|
@ -291,6 +291,7 @@ FT_BEGIN_HEADER
|
|||
#define TT_ADOBE_ID_STANDARD 0
|
||||
#define TT_ADOBE_ID_EXPERT 1
|
||||
#define TT_ADOBE_ID_CUSTOM 2
|
||||
#define TT_ADOBE_ID_LATIN_1 3
|
||||
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include <ft2build.h>
|
||||
#include FT_INTERNAL_DEBUG_H
|
||||
#include FT_INTERNAL_STREAM_H
|
||||
#include FT_TRUETYPE_IDS_H
|
||||
|
||||
#include "t1gload.h"
|
||||
#include "t1load.h"
|
||||
|
@ -467,25 +468,25 @@
|
|||
{
|
||||
case T1_ENCODING_TYPE_STANDARD:
|
||||
charmap.encoding = FT_ENCODING_ADOBE_STANDARD;
|
||||
charmap.encoding_id = 0;
|
||||
charmap.encoding_id = TT_ADOBE_ID_STANDARD;
|
||||
clazz = cmap_classes->standard;
|
||||
break;
|
||||
|
||||
case T1_ENCODING_TYPE_EXPERT:
|
||||
charmap.encoding = FT_ENCODING_ADOBE_EXPERT;
|
||||
charmap.encoding_id = 1;
|
||||
charmap.encoding_id = TT_ADOBE_ID_EXPERT;
|
||||
clazz = cmap_classes->expert;
|
||||
break;
|
||||
|
||||
case T1_ENCODING_TYPE_ARRAY:
|
||||
charmap.encoding = FT_ENCODING_ADOBE_CUSTOM;
|
||||
charmap.encoding_id = 2;
|
||||
charmap.encoding_id = TT_ADOBE_ID_CUSTOM;
|
||||
clazz = cmap_classes->custom;
|
||||
break;
|
||||
|
||||
case T1_ENCODING_TYPE_ISOLATIN1:
|
||||
charmap.encoding = FT_ENCODING_ADOBE_LATIN_1;
|
||||
charmap.encoding_id = 3;
|
||||
charmap.encoding_id = TT_ADOBE_ID_LATIN_1;
|
||||
clazz = cmap_classes->unicode;
|
||||
break;
|
||||
|
||||
|
|
Loading…
Reference in New Issue