diff options
| author | Adrian Johnson <ajohnson@redneon.com> | 2010-10-01 19:18:28 +0930 |
|---|---|---|
| committer | Adrian Johnson <ajohnson@redneon.com> | 2010-10-01 19:18:28 +0930 |
| commit | 165a14b5646d582781d119874f549ec9a02d7f53 (patch) | |
| tree | c77e8605a664a1514cc7f04921624011b44a007f /src/cairo-pdf-operators.c | |
| parent | af3b550bc186361a0b6a779df0fc57799c3f163d (diff) | |
pdf-operators: fix bug that was causing unnecessary repositioning of text
This optimizes the output to increase the maximum amount of text that
is emitted with a single Tj operator.
Diffstat (limited to 'src/cairo-pdf-operators.c')
| -rw-r--r-- | src/cairo-pdf-operators.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/cairo-pdf-operators.c b/src/cairo-pdf-operators.c index 2d718edc..21592b54 100644 --- a/src/cairo-pdf-operators.c +++ b/src/cairo-pdf-operators.c @@ -1016,6 +1016,7 @@ _cairo_pdf_operators_flush_glyphs (cairo_pdf_operators_t *pdf_operators) } pdf_operators->num_glyphs = 0; + pdf_operators->glyph_buf_x_pos = pdf_operators->cur_x; status2 = _cairo_output_stream_destroy (word_wrap_stream); if (status == CAIRO_STATUS_SUCCESS) status = status2; @@ -1038,6 +1039,7 @@ _cairo_pdf_operators_add_glyph (cairo_pdf_operators_t *pdf_operators pdf_operators->glyphs[pdf_operators->num_glyphs].x_position = x_position; pdf_operators->glyphs[pdf_operators->num_glyphs].glyph_index = glyph->subset_glyph_index; pdf_operators->glyphs[pdf_operators->num_glyphs].x_advance = x; + pdf_operators->glyph_buf_x_pos += x; pdf_operators->num_glyphs++; if (pdf_operators->num_glyphs == PDF_GLYPH_BUFFER_SIZE) return _cairo_pdf_operators_flush_glyphs (pdf_operators); @@ -1062,6 +1064,7 @@ _cairo_pdf_operators_set_text_matrix (cairo_pdf_operators_t *pdf_operators, pdf_operators->text_matrix = *matrix; pdf_operators->cur_x = 0; pdf_operators->cur_y = 0; + pdf_operators->glyph_buf_x_pos = 0; _cairo_output_stream_printf (pdf_operators->stream, "%f %f %f %f %f %f Tm\n", pdf_operators->text_matrix.xx, @@ -1117,6 +1120,7 @@ _cairo_pdf_operators_set_text_position (cairo_pdf_operators_t *pdf_operators, translate.y0); pdf_operators->cur_x = 0; pdf_operators->cur_y = 0; + pdf_operators->glyph_buf_x_pos = 0; pdf_operators->cairo_to_pdftext = pdf_operators->text_matrix; status = cairo_matrix_invert (&pdf_operators->cairo_to_pdftext); @@ -1167,6 +1171,7 @@ _cairo_pdf_operators_begin_text (cairo_pdf_operators_t *pdf_operators) pdf_operators->in_text_object = TRUE; pdf_operators->num_glyphs = 0; + pdf_operators->glyph_buf_x_pos = 0; return _cairo_output_stream_get_status (pdf_operators->stream); } @@ -1271,7 +1276,7 @@ _cairo_pdf_operators_emit_glyph (cairo_pdf_operators_t *pdf_operator * PDF consumers that do not handle very large position * adjustments in TJ. */ - if (fabs(x - pdf_operators->cur_x) > 10 || + if (fabs(x - pdf_operators->glyph_buf_x_pos) > 10 || fabs(y - pdf_operators->cur_y) > GLYPH_POSITION_TOLERANCE) { status = _cairo_pdf_operators_flush_glyphs (pdf_operators); |