diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-08-10 13:22:58 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-08-10 14:06:16 +0100 |
| commit | 69c1ec9f131936ca5fcdb48bd0f957b2c1f6d52c (patch) | |
| tree | fa4ce169b1820d144ac2b70cd433b9d5ff43d3ac | |
| parent | b13266ba0fcd275a5936f31f69405b7e25853ef6 (diff) | |
script: Compile fix
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/cairo-script-surface.c | 3 | ||||
| -rw-r--r-- | src/cairo-surface-wrapper.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c index e61b8a481..0f7252a27 100644 --- a/src/cairo-script-surface.c +++ b/src/cairo-script-surface.c @@ -50,6 +50,7 @@ #include "cairo-default-context-private.h" #include "cairo-device-private.h" #include "cairo-error-private.h" +#include "cairo-image-surface-private.h" #include "cairo-list-private.h" #include "cairo-recording-surface-private.h" #include "cairo-output-stream-private.h" @@ -2119,7 +2120,7 @@ _cairo_script_surface_clipper_intersect_clip_path (cairo_surface_clipper_t *clip } /* skip the trivial clip covering the surface extents */ - if (surface->width >=0 && surface->height >= 0 && + if (surface->width >= 0 && surface->height >= 0 && _cairo_path_fixed_is_box (path, &box)) { if (box.p1.x <= 0 && box.p1.y <= 0 && diff --git a/src/cairo-surface-wrapper.c b/src/cairo-surface-wrapper.c index 9ed562012..0ce80a50c 100644 --- a/src/cairo-surface-wrapper.c +++ b/src/cairo-surface-wrapper.c @@ -591,8 +591,11 @@ _cairo_surface_wrapper_init (cairo_surface_wrapper_t *wrapper, wrapper->has_extents = FALSE; wrapper->extents.x = wrapper->extents.y = 0; - wrapper->needs_transform = - ! _cairo_matrix_is_identity (&wrapper->target->device_transform); + wrapper->needs_transform = FALSE; + if (target) { + wrapper->needs_transform = + ! _cairo_matrix_is_identity (&target->device_transform); + } } void |