projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[CMAKE]
[reactos.git]
/
lib
/
3rdparty
/
freetype
/
src
/
type1
/
t1objs.c
diff --git
a/lib/3rdparty/freetype/src/type1/t1objs.c
b/lib/3rdparty/freetype/src/type1/t1objs.c
index
b1de687
..
5863210
100644
(file)
--- a/
lib/3rdparty/freetype/src/type1/t1objs.c
+++ b/
lib/3rdparty/freetype/src/type1/t1objs.c
@@
-494,14
+494,17
@@
charmap.face = root;
/* first of all, try to synthesize a Unicode charmap */
charmap.face = root;
/* first of all, try to synthesize a Unicode charmap */
- charmap.platform_id =
3
;
- charmap.encoding_id =
1
;
+ charmap.platform_id =
TT_PLATFORM_MICROSOFT
;
+ charmap.encoding_id =
TT_MS_ID_UNICODE_CS
;
charmap.encoding = FT_ENCODING_UNICODE;
charmap.encoding = FT_ENCODING_UNICODE;
- FT_CMap_New( cmap_classes->unicode, NULL, &charmap, NULL );
+ error = FT_CMap_New( cmap_classes->unicode, NULL, &charmap, NULL );
+ if ( error && FT_Err_No_Unicode_Glyph_Name != error )
+ goto Exit;
+ error = FT_Err_Ok;
/* now, generate an Adobe Standard encoding when appropriate */
/* now, generate an Adobe Standard encoding when appropriate */
- charmap.platform_id =
7
;
+ charmap.platform_id =
TT_PLATFORM_ADOBE
;
clazz = NULL;
switch ( type1->encoding_type )
clazz = NULL;
switch ( type1->encoding_type )
@@
-535,7
+538,7
@@
}
if ( clazz )
}
if ( clazz )
- FT_CMap_New( clazz, NULL, &charmap, NULL );
+
error =
FT_CMap_New( clazz, NULL, &charmap, NULL );
#if 0
/* Select default charmap */
#if 0
/* Select default charmap */