[cairo-commit] src/cairo-pdf-surface.c

[Carl Worth]

 src/cairo-pdf-surface.c |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

New commits:
diff-tree 05b1d2f9c5b827d52f3eb837c6c591c877dde419 (from d70ade00fb67c6f77d23653481079996ec1e1292)
Author: Carl Worth <cworth at cworth.org>
Date:   Tue May 16 01:04:16 2006 -0700

    PDF: Fix broken per-page sizes in PDF output.
    
    This was first broken in:
    
    	PDF: Fold (unused) cairo_pdf_document_t into cairo_pdf_surface_t
    	f500cef19f049a4a0ed296172618db2f26794932
    
    Thanks, git bisect!

diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
index a48182d..a37a540 100644
--- a/src/cairo-pdf-surface.c
+++ b/src/cairo-pdf-surface.c
@@ -1659,11 +1659,8 @@ _cairo_pdf_surface_write_pages (cairo_pd
     /* TODO: Figure out wich other defaults to be inherited by /Page
      * objects. */
     _cairo_output_stream_printf (surface->output,
-				 "   /MediaBox [ 0 0 %f %f ]\r\n"
 				 ">>\r\n"
-				 "endobj\r\n",
-				 surface->width,
-				 surface->height);
+				 "endobj\r\n");
 }
 
 static void
@@ -1999,14 +1996,10 @@ _cairo_pdf_surface_write_page (cairo_pdf
 				 page.id,
 				 surface->pages_resource.id);
 
-    if (surface->width != surface->width ||
-	surface->height != surface->height)
-    {
-	_cairo_output_stream_printf (surface->output,
-				     "   /MediaBox [ 0 0 %f %f ]\r\n",
-				     surface->width,
-				     surface->height);
-    }
+    _cairo_output_stream_printf (surface->output,
+				 "   /MediaBox [ 0 0 %f %f ]\r\n",
+				 surface->width,
+				 surface->height);
 
     _cairo_output_stream_printf (surface->output,
 				 "   /Contents [");