fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-01 10:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge in upstream 'ps-surface' changes

Browse source
This commit is contained in:
Carl Worth 2006-02-28 12:07:14 -08:00
commit e3017c3c8d
6 changed files with 144 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/cairo-analysis-surface.c
View file

@ -47,10 +47,19 @@ typedef struct {
cairo_bool_t fallback;
} cairo_analysis_surface_t;
static cairo_int_status_t
_cairo_analysis_surface_get_extents (void *abstract_surface,
cairo_rectangle_t *rectangle)
{
cairo_analysis_surface_t *surface = abstract_surface;
return _cairo_surface_get_extents (surface->target, rectangle);
}
static cairo_int_status_t
_cairo_analysis_surface_paint (void *abstract_surface,
cairo_operator_t op,
cairo_pattern_t *source)
cairo_operator_t op,
cairo_pattern_t *source)
{
cairo_analysis_surface_t *surface = abstract_surface;
cairo_status_t status;
@ -181,7 +190,7 @@ static const cairo_surface_backend_t cairo_analysis_surface_backend = {
NULL, /* show_page */
NULL, /* set_clip_region */
NULL, /* clip_path */
NULL, /* get_extents */
_cairo_analysis_surface_get_extents,
NULL, /* old_show_glyphs */
NULL, /* get_font_options */
NULL, /* flush */

11
src/cairo-paginated-surface.c
View file

@ -155,6 +155,15 @@ _cairo_paginated_surface_get_target (cairo_surface_t *surface)
return paginated_surface->target;
}
static cairo_surface_t *
_cairo_paginated_surface_create_similar (void *other,
cairo_content_t content,
int width,
int height)
{
return _cairo_meta_surface_create (content, width, height);
}
static cairo_status_t
_cairo_paginated_surface_finish (void *abstract_surface)
{
@ -412,7 +421,7 @@ _cairo_paginated_surface_snapshot (void *abstract_other)
}
const cairo_surface_backend_t cairo_paginated_surface_backend = {
NULL, /* create_similar */
_cairo_paginated_surface_create_similar,
_cairo_paginated_surface_finish,
_cairo_paginated_surface_acquire_source_image,
_cairo_paginated_surface_release_source_image,

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

@ -41,6 +41,7 @@
#include "cairo-ps.h"
#include "cairo-font-subset-private.h"
#include "cairo-paginated-surface-private.h"
#include "cairo-meta-surface-private.h"
#include "cairo-ft-private.h"
#include <time.h>
@ -623,9 +624,11 @@ operator_always_translucent (cairo_operator_t op)
static cairo_bool_t
pattern_surface_supported (const cairo_surface_pattern_t *pattern)
{
if (pattern->surface->backend->acquire_source_image == NULL)
return FALSE;
return TRUE;
if (_cairo_surface_is_meta (pattern->surface))
return TRUE;
if (pattern->surface->backend->acquire_source_image != NULL)
return TRUE;
return FALSE;
}
static cairo_bool_t
@ -675,7 +678,8 @@ compress_dup (const void *data, unsigned long data_size,
static cairo_status_t
emit_image (cairo_ps_surface_t *surface,
cairo_image_surface_t *image,
cairo_matrix_t *matrix)
cairo_matrix_t *matrix,
char *name)
{
cairo_status_t status;
unsigned char *rgb, *compressed;
@ -754,6 +758,25 @@ emit_image (cairo_ps_surface_t *surface,
cairo_matrix_init (&d2i, 1, 0, 0, 1, 0, 0);
cairo_matrix_multiply (&d2i, &d2i, matrix);
#if 1
/* Construct a string holding the entire image (!) */
_cairo_output_stream_printf (surface->stream, "/%sString %d string def\n",
name, (int) rgb_size);
_cairo_output_stream_printf (surface->stream,
"currentfile %sString readstring\n", name);
#else
/* Construct a reusable stream decoder holding the image */
_cairo_output_stream_printf (surface->stream, "/%sString <<\n", name);
/* intent = image data */
_cairo_output_stream_printf (surface->stream, "\t/Intent 0\n");
#endif
/* Compressed image data */
_cairo_output_stream_write (surface->stream, rgb, rgb_size);
_cairo_output_stream_printf (surface->stream,
"\n");
_cairo_output_stream_printf (surface->stream, "/%s {\n", name);
_cairo_output_stream_printf (surface->stream,
"/DeviceRGB setcolorspace\n"
"<<\n"
@ -762,23 +785,20 @@ emit_image (cairo_ps_surface_t *surface,
" /Height %d\n"
" /BitsPerComponent 8\n"
" /Decode [ 0 1 0 1 0 1 ]\n"
" /DataSource currentfile\n"
" /DataSource %sString\n"
" /ImageMatrix [ %f %f %f %f %f %f ]\n"
">>\n"
"image\n",
opaque_image->width,
opaque_image->height,
name,
d2i.xx, d2i.yx,
d2i.xy, d2i.yy,
d2i.x0, d2i.y0);
_cairo_output_stream_printf (surface->stream, "} bind def\n");
/* Compressed image data */
_cairo_output_stream_write (surface->stream, rgb, rgb_size);
status = CAIRO_STATUS_SUCCESS;
_cairo_output_stream_printf (surface->stream,
"\n");
free (compressed);
bail2:
free (rgb);
@ -809,15 +829,40 @@ static void
emit_surface_pattern (cairo_ps_surface_t *surface,
cairo_surface_pattern_t *pattern)
{
cairo_image_surface_t *image;
cairo_status_t status;
void *image_extra;
cairo_rectangle_t extents;
status = _cairo_surface_acquire_source_image (pattern->surface,
&image,
&image_extra);
assert (status == CAIRO_STATUS_SUCCESS);
emit_image (surface, image, &pattern->base.matrix);
if (_cairo_surface_is_meta (pattern->surface)) {
_cairo_output_stream_printf (surface->stream, "/MyPattern {\n");
_cairo_meta_surface_replay (pattern->surface, &surface->base);
extents.width = surface->width;
extents.height = surface->height;
_cairo_output_stream_printf (surface->stream, "} bind def\n");
} else {
cairo_image_surface_t *image;
void *image_extra;
cairo_status_t status;
status = _cairo_surface_acquire_source_image (pattern->surface,
&image,
&image_extra);
_cairo_surface_get_extents (&image->base, &extents);
assert (status == CAIRO_STATUS_SUCCESS);
emit_image (surface, image, &pattern->base.matrix, "MyPattern");
_cairo_surface_release_source_image (pattern->surface, image,
image_extra);
}
_cairo_output_stream_printf (surface->stream,
"<< /PatternType 1 /PaintType 1 /TilingType 1\n");
_cairo_output_stream_printf (surface->stream,
"/BBox [0 0 %d %d]\n",
extents.width, extents.height);
_cairo_output_stream_printf (surface->stream,
"/XStep %d /YStep %d\n",
extents.width, extents.height);
_cairo_output_stream_printf (surface->stream,
"/PaintProc { begin MyPattern\n");
_cairo_output_stream_printf (surface->stream,
" end } bind >> matrix makepattern setpattern\n");
}
static void
@ -1180,6 +1225,8 @@ _cairo_ps_surface_stroke (void *abstract_surface,
info.output_stream = stream;
info.has_current_point = FALSE;
_cairo_output_stream_printf (stream,
"gsave\n");
status = _cairo_path_fixed_interpret (path,
CAIRO_DIRECTION_FORWARD,
_cairo_ps_surface_path_move_to,
@ -1191,8 +1238,6 @@ _cairo_ps_surface_stroke (void *abstract_surface,
/*
* Switch to user space to set line parameters
*/
_cairo_output_stream_printf (stream,
"gsave\n");
_cairo_output_stream_printf (stream,
"[%f %f %f %f 0 0] concat\n",
ctm->xx, ctm->yx, ctm->xy, ctm->yy);
@ -1281,6 +1326,41 @@ _cairo_ps_surface_fill (void *abstract_surface,
return status;
}
static cairo_int_status_t
_cairo_ps_surface_show_glyphs (void *abstract_surface,
cairo_operator_t op,
cairo_pattern_t *source,
const cairo_glyph_t *glyphs,
int num_glyphs,
cairo_scaled_font_t *scaled_font)
{
cairo_ps_surface_t *surface = abstract_surface;
cairo_output_stream_t *stream = surface->stream;
cairo_int_status_t status;
cairo_path_fixed_t *path;
if (surface->mode == CAIRO_PAGINATED_MODE_ANALYZE) {
if (!pattern_operation_supported (op, source))
return CAIRO_INT_STATUS_UNSUPPORTED;
return CAIRO_STATUS_SUCCESS;
}
if (surface->need_start_page)
_cairo_ps_surface_start_page (surface);
_cairo_output_stream_printf (stream,
"%% _cairo_ps_surface_show_glyphs\n");
path = _cairo_path_fixed_create ();
_cairo_scaled_font_glyph_path (scaled_font, glyphs, num_glyphs, path);
status = _cairo_ps_surface_fill (abstract_surface, op, source,
path, CAIRO_FILL_RULE_WINDING,
0.1, scaled_font->options.antialias);
_cairo_path_fixed_destroy (path);
return CAIRO_STATUS_SUCCESS;
}
static const cairo_surface_backend_t cairo_ps_surface_backend = {
NULL, /* create_similar */
_cairo_ps_surface_finish,
@ -1314,7 +1394,8 @@ static const cairo_surface_backend_t cairo_ps_surface_backend = {
NULL, /* mask */
_cairo_ps_surface_stroke,
_cairo_ps_surface_fill,
NULL /* show_glyphs */
_cairo_ps_surface_show_glyphs,
NULL, /* snapshot */
};
static void

2
src/cairo-scaled-font.c
View file

@ -1008,7 +1008,7 @@ _scaled_glyph_path_close_path (void *abstract_closure)
cairo_status_t
_cairo_scaled_font_glyph_path (cairo_scaled_font_t *scaled_font,
cairo_glyph_t *glyphs,
const cairo_glyph_t *glyphs,
int num_glyphs,
cairo_path_fixed_t *path)
{

2
src/cairoint.h
View file

@ -1529,7 +1529,7 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t *scaled_font,
cairo_private cairo_status_t
_cairo_scaled_font_glyph_path (cairo_scaled_font_t *scaled_font,
cairo_glyph_t *glyphs,
const cairo_glyph_t *glyphs,
int num_glyphs,
cairo_path_fixed_t *path);

19
src/test-paginated-surface.c
View file

@ -51,6 +51,22 @@
#include "cairo-paginated-surface-private.h"
static void
_test_paginated_surface_set_paginated_mode (cairo_surface_t *target,
cairo_paginated_mode_t mode)
{
/* XXX: We don't do anything to save the paginated mode here. This
* means that all the rendering will hit the image surface
* twice. This will work (but less efficiently) for all tests that
* explicitly initialize all pixels. Tests that expect the
* background to initially be transparent and leave it that way in
* spots will likely fail.
*
* If we see this as worth fixing, it will just require shoving
* some set_paginated_mode support into cairo_image_surface_t.
*/
}
cairo_surface_t *
_test_paginated_surface_create_for_data (unsigned char *data,
cairo_content_t content,
@ -64,5 +80,6 @@ _test_paginated_surface_create_for_data (unsigned char *data,
width, height,
stride);
return _cairo_paginated_surface_create (target, content, width, height);
return _cairo_paginated_surface_create (target, content, width, height,
_test_paginated_surface_set_paginated_mode);
}