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

PDF: Use Td where possible instead of Tm for positioning glyphs

Browse source 
This avoids emitting the font matrix for every single glyph.
This commit is contained in:
Adrian Johnson 2006-09-24 00:48:36 +09:30 • committed by Carl Worth
parent 5c2136ea7c
commit b3440e8530
1 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/cairo-pdf-surface.c
View file

@ -2726,6 +2726,7 @@ _cairo_pdf_surface_show_glyphs (void *abstract_surface,
cairo_pdf_surface_t *surface = abstract_surface; cairo_pdf_surface_t *surface = abstract_surface;
unsigned int current_subset_id = (unsigned int)-1; unsigned int current_subset_id = (unsigned int)-1;
unsigned int font_id, subset_id, subset_glyph_index; unsigned int font_id, subset_id, subset_glyph_index;
cairo_bool_t diagonal;
cairo_status_t status; cairo_status_t status;
int i; int i;
@ -2741,6 +2742,12 @@ _cairo_pdf_surface_show_glyphs (void *abstract_surface,
_cairo_output_stream_printf (surface->output, _cairo_output_stream_printf (surface->output,
"BT\r\n"); "BT\r\n");
if (scaled_font->scale.xy == 0.0 &&
scaled_font->scale.yx == 0.0)
diagonal = TRUE;
else
diagonal = FALSE;
for (i = 0; i < num_glyphs; i++) { for (i = 0; i < num_glyphs; i++) {
status = _cairo_scaled_font_subsets_map_glyph (surface->font_subsets, status = _cairo_scaled_font_subsets_map_glyph (surface->font_subsets,
scaled_font, glyphs[i].index, scaled_font, glyphs[i].index,
@ -2748,22 +2755,29 @@ _cairo_pdf_surface_show_glyphs (void *abstract_surface,
if (status) if (status)
return status; return status;
if (subset_id != current_subset_id) { if (subset_id != current_subset_id)
_cairo_output_stream_printf (surface->output, _cairo_output_stream_printf (surface->output,
"/CairoFont-%d-%d 1 Tf\r\n", "/CairoFont-%d-%d 1 Tf\r\n",
font_id, subset_id); font_id, subset_id);
current_subset_id = subset_id;
}
_cairo_output_stream_printf (surface->output, if (subset_id != current_subset_id || !diagonal) {
"%f %f %f %f %f %f Tm <%02x> Tj\r\n", _cairo_output_stream_printf (surface->output,
scaled_font->scale.xx, "%f %f %f %f %f %f Tm <%02x> Tj\r\n",
scaled_font->scale.yx, scaled_font->scale.xx,
-scaled_font->scale.xy, scaled_font->scale.yx,
-scaled_font->scale.yy, -scaled_font->scale.xy,
glyphs[i].x, -scaled_font->scale.yy,
glyphs[i].y, glyphs[i].x,
subset_glyph_index); glyphs[i].y,
subset_glyph_index);
current_subset_id = subset_id;
} else {
_cairo_output_stream_printf (surface->output,
"%f %f Td <%02x> Tj\r\n",
(glyphs[i].x - glyphs[i-1].x)/scaled_font->scale.xx,
(glyphs[i].y - glyphs[i-1].y)/scaled_font->scale.yy,
subset_glyph_index);
}
} }
_cairo_output_stream_printf (surface->output, _cairo_output_stream_printf (surface->output,