diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2011-04-20 15:21:34 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2011-04-25 15:35:40 +0200 |
| commit | ba7b188c4fd2825d59e90f01a2d8e66fdd1a8cd5 (patch) | |
| tree | e2bb7184670dbea1e21b7c7f69ab93ffc7100e1a /draw/draw_glyph.c | |
| parent | 3e168943f71418cc957290f1bf9569c0fe6c6519 (diff) | |
| download | mupdf-ba7b188c4fd2825d59e90f01a2d8e66fdd1a8cd5.tar.xz | |
Always call glyph index "gid"; not "cid" as in some places.
Diffstat (limited to 'draw/draw_glyph.c')
| -rw-r--r-- | draw/draw_glyph.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/draw/draw_glyph.c b/draw/draw_glyph.c index 2a6ae616..383c0d68 100644 --- a/draw/draw_glyph.c +++ b/draw/draw_glyph.c @@ -17,7 +17,7 @@ struct fz_glyph_key_s fz_font *font; int a, b; int c, d; - unsigned short cid; + unsigned short gid; unsigned char e, f; }; @@ -64,15 +64,15 @@ fz_free_glyph_cache(fz_glyph_cache *cache) } fz_pixmap * -fz_render_stroked_glyph(fz_glyph_cache *cache, fz_font *font, int cid, fz_matrix trm, fz_matrix ctm, fz_stroke_state *stroke) +fz_render_stroked_glyph(fz_glyph_cache *cache, fz_font *font, int gid, fz_matrix trm, fz_matrix ctm, fz_stroke_state *stroke) { if (font->ft_face) - return fz_render_ft_stroked_glyph(font, cid, trm, ctm, stroke); - return fz_render_glyph(cache, font, cid, trm); + return fz_render_ft_stroked_glyph(font, gid, trm, ctm, stroke); + return fz_render_glyph(cache, font, gid, trm); } fz_pixmap * -fz_render_glyph(fz_glyph_cache *cache, fz_font *font, int cid, fz_matrix ctm) +fz_render_glyph(fz_glyph_cache *cache, fz_font *font, int gid, fz_matrix ctm) { fz_glyph_key key; fz_pixmap *val; @@ -87,7 +87,7 @@ fz_render_glyph(fz_glyph_cache *cache, fz_font *font, int cid, fz_matrix ctm) memset(&key, 0, sizeof key); key.font = font; - key.cid = cid; + key.gid = gid; key.a = ctm.a * 65536; key.b = ctm.b * 65536; key.c = ctm.c * 65536; @@ -104,11 +104,11 @@ fz_render_glyph(fz_glyph_cache *cache, fz_font *font, int cid, fz_matrix ctm) if (font->ft_face) { - val = fz_render_ft_glyph(font, cid, ctm); + val = fz_render_ft_glyph(font, gid, ctm); } else if (font->t3procs) { - val = fz_render_t3_glyph(font, cid, ctm); + val = fz_render_t3_glyph(font, gid, ctm); } else { |