ReFuel/freetype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check error value by `FT_CMap_New'.

Browse Source 
* src/cff/cffobjs.c (cff_face_init): Check error value by
`FT_CMap_New'.
* src/pfr/pfrobjs.c (pfr_face_init): Ditto.
* src/type1/t1jobjs.c (T1_Face_Init): Ditto.
* src/type42/t42jobjs.c (T42_Face_Init): Ditto.
This commit is contained in:
suzuki toshiya 2010-07-04 12:08:41 +09:00
parent e017639710
commit a874c7ecca
5 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2010-07-04 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Check error value by `FT_CMap_New'.
* src/cff/cffobjs.c (cff_face_init): Check error value by
`FT_CMap_New'.
* src/pfr/pfrobjs.c (pfr_face_init): Ditto.
* src/type1/t1jobjs.c (T1_Face_Init): Ditto.
* src/type42/t42jobjs.c (T42_Face_Init): Ditto.
2010-07-03 Werner Lemberg <wl@gnu.org>
Make ftgrays.c compile stand-alone again.

7
src/cff/cffobjs.c
View File

@ -887,7 +887,10 @@
nn = (FT_UInt)cffface->num_charmaps;
FT_CMap_New( &FT_CFF_CMAP_UNICODE_CLASS_REC_GET, NULL, &cmaprec, NULL );
error = FT_CMap_New( &FT_CFF_CMAP_UNICODE_CLASS_REC_GET, NULL,
&cmaprec, NULL );
if ( error )
goto Exit;
/* if no Unicode charmap was previously selected, select this one */
if ( cffface->charmap == NULL && nn != (FT_UInt)cffface->num_charmaps )
@ -921,7 +924,7 @@
clazz = &FT_CFF_CMAP_ENCODING_CLASS_REC_GET;
}
FT_CMap_New( clazz, NULL, &cmaprec, NULL );
error = FT_CMap_New( clazz, NULL, &cmaprec, NULL );
}
}
}

2
src/pfr/pfrobjs.c
View File

@ -256,7 +256,7 @@
charmap.encoding_id = 1;
charmap.encoding = FT_ENCODING_UNICODE;
FT_CMap_New( &pfr_cmap_class_rec, NULL, &charmap, NULL );
error = FT_CMap_New( &pfr_cmap_class_rec, NULL, &charmap, NULL );
#if 0
/* Select default charmap */

6
src/type1/t1objs.c
View File

@ -498,7 +498,9 @@
charmap.encoding_id = 1;
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 )
goto Exit;
/* now, generate an Adobe Standard encoding when appropriate */
charmap.platform_id = 7;
@ -535,7 +537,7 @@
}
if ( clazz )
FT_CMap_New( clazz, NULL, &charmap, NULL );
error = FT_CMap_New( clazz, NULL, &charmap, NULL );
#if 0
/* Select default charmap */

6
src/type42/t42objs.c
View File

@ -334,7 +334,9 @@
charmap.encoding_id = 1;
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 )
goto Exit;
/* now, generate an Adobe Standard encoding when appropriate */
charmap.platform_id = 7;
@ -371,7 +373,7 @@
}
if ( clazz )
FT_CMap_New( clazz, NULL, &charmap, NULL );
error = FT_CMap_New( clazz, NULL, &charmap, NULL );
#if 0
/* Select default charmap */