fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2025-12-27 14:00:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ps: use Reusable streams for forms in Level 3

Browse source 
to avoid emitting image data as strings
This commit is contained in:
Adrian Johnson 2017-11-09 20:52:36 +10:30
parent b1c7a087b5
commit 7d3ba77b6c
2 changed files with 50 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/cairo-ps-surface.c
View file

@ -3400,6 +3400,10 @@ _cairo_ps_surface_emit_form (cairo_ps_surface_t *surface,
if (test || status)
return status;
/* _cairo_ps_form_emit will use Level 3 if permitted by ps_level */
if (surface->ps_level == CAIRO_PS_LEVEL_3)
surface->ps_level_used = CAIRO_PS_LEVEL_3;
_cairo_output_stream_printf (surface->stream,
"/cairoform-%d /Form findresource execform\n",
ps_form->id);
@ -3523,6 +3527,11 @@ _cairo_ps_surface_emit_surface (cairo_ps_surface_t *surface,
return status;
}
/* The '|' character is not used in PS (including ASCII85) so we can
* use it as a /SubFileDecode EOD marker and assume EODCount will be 0.
*/
#define SUBFILE_FILTER_EOD "|EOD|"
static void
_cairo_ps_form_emit (void *entry, void *closure)
{
@ -3536,7 +3545,6 @@ _cairo_ps_form_emit (void *entry, void *closure)
params.src_op_extents = &form->required_extents;
params.filter = form->filter;
params.stencil_mask = FALSE;
params.paint_proc = TRUE;
params.is_image = form->is_image;
params.approx_size = 0;
cairo_output_stream_t *old_stream;
@ -3546,9 +3554,24 @@ _cairo_ps_form_emit (void *entry, void *closure)
form->id);
_cairo_output_stream_printf (surface->final_stream,
"/cairo_paint_form-%d {\n"
"5 dict begin\n",
"/cairo_paint_form-%d",
form->id);
if (surface->ps_level == CAIRO_PS_LEVEL_3) {
params.paint_proc = FALSE;
_cairo_output_stream_printf (surface->final_stream,
"\n"
"currentfile\n"
"<< /Filter /SubFileDecode\n"
" /DecodeParms << /EODString (%s) /EODCount 0 >>\n"
">> /ReusableStreamDecode filter\n",
SUBFILE_FILTER_EOD);
} else {
params.paint_proc = TRUE;
_cairo_output_stream_printf (surface->final_stream,
" {\n");
}
_cairo_output_stream_printf (surface->final_stream,
"5 dict begin\n");
old_stream = surface->stream;
surface->stream = surface->final_stream;
@ -3561,8 +3584,19 @@ _cairo_ps_form_emit (void *entry, void *closure)
_cairo_pdf_operators_set_stream (&surface->pdf_operators, surface->stream);
_cairo_output_stream_printf (surface->final_stream,
"end\n"
"} bind def\n"
"end\n");
if (surface->ps_level == CAIRO_PS_LEVEL_3) {
_cairo_output_stream_printf (surface->final_stream,
"%s\n"
"def\n",
SUBFILE_FILTER_EOD);
} else {
_cairo_output_stream_printf (surface->final_stream,
"} bind def\n");
}
_cairo_output_stream_printf (surface->final_stream,
"\n"
"/cairoform-%d\n"
"<<\n"
" /FormType 1\n",
@ -3582,11 +3616,18 @@ _cairo_ps_form_emit (void *entry, void *closure)
_cairo_output_stream_printf (surface->final_stream,
" /Matrix [ 1 0 0 1 0 0 ]\n"
" /PaintProc { pop cairo_paint_form-%d } bind\n"
">>\n"
"/Form defineresource pop\n",
" /PaintProc { pop cairo_paint_form-%d",
form->id);
if (surface->ps_level == CAIRO_PS_LEVEL_3) {
_cairo_output_stream_printf (surface->final_stream,
" dup 0 setfileposition cvx exec");
}
_cairo_output_stream_printf (surface->final_stream,
" } bind\n"
">>\n"
"/Form defineresource pop\n");
_cairo_output_stream_printf (surface->final_stream,
"%%%%EndResource\n");
if (status)

2
test/mime-unique-id.c
View file

@ -80,7 +80,7 @@
* surfaces are still embedded only once, update the expected sizes.
*/
#define PS2_EXPECTED_SIZE 417510
#define PS3_EXPECTED_SIZE 380912
#define PS3_EXPECTED_SIZE 381554
#define PDF_EXPECTED_SIZE 347182
#define SIZE_TOLERANCE 5000