[cairo-commit] Branch '1.10' - src/cairo-ps-surface.c

[Adrian Johnson]

 src/cairo-ps-surface.c |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

New commits:
commit 3f5aaf6baaac2766bef57367470777df62c60946
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Fri Nov 26 23:52:45 2010 +1030

    PS: Use tight bounding box
    
    Now that the page size is specified by %%DocumentMedia
    we can make %%BoundingBox compliant.

diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index 4ae1aee..5ca6a05 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -3779,17 +3779,10 @@ _cairo_ps_surface_set_bounding_box (void		*abstract_surface,
     cairo_bool_t has_page_media;
     const char *page_media;
 
-    if (surface->eps) {
-	x1 = floor (_cairo_fixed_to_double (bbox->p1.x));
-	y1 = floor (surface->height - _cairo_fixed_to_double (bbox->p2.y));
-	x2 = ceil (_cairo_fixed_to_double (bbox->p2.x));
-	y2 = ceil (surface->height - _cairo_fixed_to_double (bbox->p1.y));
-    } else {
-	x1 = 0;
-	y1 = 0;
-	x2 = ceil (surface->width);
-	y2 = ceil (surface->height);
-    }
+    x1 = floor (_cairo_fixed_to_double (bbox->p1.x));
+    y1 = floor (surface->height - _cairo_fixed_to_double (bbox->p2.y));
+    x2 = ceil (_cairo_fixed_to_double (bbox->p2.x));
+    y2 = ceil (surface->height - _cairo_fixed_to_double (bbox->p1.y));
 
     surface->page_bbox.x = x1;
     surface->page_bbox.y = y1;