fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 19:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CFF: Fix Visual C++ compile problem

Browse source 
Don't use structure intitialization for assigning
structure values.

Add a new field to cff_charset_t to point to the sids
charset array instead of casting it into the data field.
This commit is contained in:
Adrian Johnson 2007-02-13 22:52:53 +10:30
parent ac01dcb5ad
commit 88f7ea4ad7
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/cairo-cff-subset.c
View file

@ -83,9 +83,10 @@ typedef struct _cff_dict_operator {
} cff_dict_operator_t;
typedef struct _cff_charset {
cairo_bool_t is_builtin;
cairo_bool_t is_builtin;
const uint16_t *sids;
const unsigned char *data;
int length;
int length;
} cff_charset_t;
typedef struct _cairo_cff_font {
@ -876,23 +877,27 @@ static const uint16_t ExpertSubset_charset[] = {
341, 342, 343, 344, 345, 346,
};
#define BUILTIN_CHARSET(name) ((cff_charset_t){TRUE, (const unsigned char *)&(name), sizeof(name)})
static cairo_int_status_t
cairo_cff_font_read_charset (cairo_cff_font_t *font)
{
switch (font->charset_offset) {
case 0:
/* ISOAdobe charset */
font->charset = BUILTIN_CHARSET(ISOAdobe_charset);
font->charset.is_builtin = TRUE;
font->charset.sids = ISOAdobe_charset;
font->charset.length = sizeof (ISOAdobe_charset);
return CAIRO_STATUS_SUCCESS;
case 1:
/* Expert charset */
font->charset = BUILTIN_CHARSET(Expert_charset);
font->charset.is_builtin = TRUE;
font->charset.sids = Expert_charset;
font->charset.length = sizeof (Expert_charset);
return CAIRO_STATUS_SUCCESS;
case 2:
/* ExpertSubset charset */;
font->charset = BUILTIN_CHARSET(ExpertSubset_charset);
font->charset.is_builtin = TRUE;
font->charset.sids = ExpertSubset_charset;
font->charset.length = sizeof (ExpertSubset_charset);
return CAIRO_STATUS_SUCCESS;
default:
break;
@ -1039,10 +1044,8 @@ cff_sid_from_gid (const cff_charset_t *charset, int gid)
int prev_glyph;
if (charset->is_builtin) {
sids = (const uint16_t *)charset->data;
if (gid - 1 < charset->length / 2)
return sids[gid - 1];
if (gid - 1 < charset->length / 2)
return charset->sids[gid - 1];
}
else {
/* no need to check sizes here, this was done during reading */