X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fpdf%2Fev-poppler.cc;h=c4baa99f9956fe5803517a94a58e84ad2d67730e;hb=503b7cb80d5df43d7357e811261c395518d6a8b9;hp=13be06f496b7842ca58d5f634851b99019d9d25d;hpb=49172d645c265e3fd301ca15f75adb17c7337331;p=evince.git

diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 13be06f4..c4baa99f 100644
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -48,7 +48,7 @@
 #include "ev-attachment.h"
 #include "ev-image.h"
 
-#if defined (HAVE_CAIRO_PDF) || defined (HAVE_CAIRO_PS)
+#if (defined (HAVE_POPPLER_PAGE_RENDER) || defined (HAVE_POPPLER_PAGE_RENDER_FOR_PRINTING)) && (defined (HAVE_CAIRO_PDF) || defined (HAVE_CAIRO_PS))
 #define HAVE_CAIRO_PRINT
 #endif
 
@@ -1520,8 +1520,8 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
 {
 	PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
 	PdfPrintContext *ctx;
-	gdouble width, height;
 #ifdef HAVE_CAIRO_PRINT
+	gdouble width, height;
 	cairo_surface_t *surface = NULL;
 #endif
 	
@@ -1530,7 +1530,9 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
 	pdf_document->print_ctx = g_new0 (PdfPrintContext, 1);
 	ctx = pdf_document->print_ctx;
 	ctx->format = fc->format;
-	ctx->pages_per_sheet = fc->pages_per_sheet;
+	
+#ifdef HAVE_CAIRO_PRINT
+	ctx->pages_per_sheet = CLAMP (fc->pages_per_sheet, 1, 16);
 
 	ctx->paper_width = fc->paper_width;
 	ctx->paper_height = fc->paper_height;
@@ -1564,18 +1566,12 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
 	}
 
 	ctx->pages_printed = 0;
-
+	
 	switch (fc->format) {
 	        case EV_FILE_FORMAT_PS:
 #ifdef HAVE_CAIRO_PS
 			surface = cairo_ps_surface_create (fc->filename, fc->paper_width, fc->paper_height);
-#else
-			ctx->ps_file = poppler_ps_file_new (pdf_document->document,
-							    fc->filename, fc->first_page,
-							    fc->last_page - fc->first_page + 1);
-			poppler_ps_file_set_paper_size (ctx->ps_file, fc->paper_width, fc->paper_height);
-			poppler_ps_file_set_duplex (ctx->ps_file, fc->duplex);
-#endif /* HAVE_CAIRO_PS */
+#endif
 			break;
 	        case EV_FILE_FORMAT_PDF:
 #ifdef HAVE_CAIRO_PDF
@@ -1586,10 +1582,43 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
 			g_assert_not_reached ();
 	}
 
-#ifdef HAVE_CAIRO_PRINT
 	ctx->cr = cairo_create (surface);
 	cairo_surface_destroy (surface);
-#endif
+
+#else /* HAVE_CAIRO_PRINT */
+	if (ctx->format == EV_FILE_FORMAT_PS) {
+		ctx->ps_file = poppler_ps_file_new (pdf_document->document,
+						    fc->filename, fc->first_page,
+						    fc->last_page - fc->first_page + 1);
+		poppler_ps_file_set_paper_size (ctx->ps_file, fc->paper_width, fc->paper_height);
+		poppler_ps_file_set_duplex (ctx->ps_file, fc->duplex);
+	}
+#endif /* HAVE_CAIRO_PRINT */
+}
+
+static void
+pdf_document_file_exporter_begin_page (EvFileExporter *exporter)
+{
+	PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
+	PdfPrintContext *ctx = pdf_document->print_ctx;
+	
+	g_return_if_fail (pdf_document->print_ctx != NULL);
+
+	ctx->pages_printed = 0;
+	
+#ifdef HAVE_CAIRO_PRINT
+	if (ctx->paper_width > ctx->paper_height) {
+		if (ctx->format == EV_FILE_FORMAT_PS) {
+			cairo_ps_surface_set_size (cairo_get_target (ctx->cr),
+						   ctx->paper_height,
+						   ctx->paper_width);
+		} else if (ctx->format == EV_FILE_FORMAT_PDF) {
+			cairo_pdf_surface_set_size (cairo_get_target (ctx->cr),
+						    ctx->paper_height,
+						    ctx->paper_width);
+		}
+	}
+#endif /* HAVE_CAIRO_PRINT */
 }
 
 static void
@@ -1630,9 +1659,6 @@ pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
 		width = ctx->paper_height;
 		height = ctx->paper_width;
 		rotate = !rotate;
-
-		cairo_ps_surface_set_size (cairo_get_target (ctx->cr),
-					   width, height);
 	} else {
 		width = ctx->paper_width;
 		height = ctx->paper_height;
@@ -1653,7 +1679,6 @@ pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
 		tmp2 = page_width;
 		page_width = page_height;
 		page_height = tmp2;
-
 	}
 
 	pwidth = width / ctx->pages_x;
@@ -1703,9 +1728,6 @@ pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
 
 	ctx->pages_printed++;
 			
-	if (ctx->pages_printed % ctx->pages_per_sheet == 0) {
-		cairo_show_page (ctx->cr);
-	}
 	cairo_restore (ctx->cr);
 #else /* HAVE_CAIRO_PRINT */
 	if (ctx->format == EV_FILE_FORMAT_PS)
@@ -1715,6 +1737,19 @@ pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
 	g_object_unref (poppler_page);
 }
 
+static void
+pdf_document_file_exporter_end_page (EvFileExporter *exporter)
+{
+	PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
+	PdfPrintContext *ctx = pdf_document->print_ctx;
+	
+	g_return_if_fail (pdf_document->print_ctx != NULL);
+
+#ifdef HAVE_CAIRO_PRINT
+	cairo_show_page (ctx->cr);
+#endif
+}
+
 static void
 pdf_document_file_exporter_end (EvFileExporter *exporter)
 {
@@ -1753,7 +1788,9 @@ static void
 pdf_document_file_exporter_iface_init (EvFileExporterIface *iface)
 {
         iface->begin = pdf_document_file_exporter_begin;
+	iface->begin_page = pdf_document_file_exporter_begin_page;
         iface->do_page = pdf_document_file_exporter_do_page;
+	iface->end_page = pdf_document_file_exporter_end_page;
         iface->end = pdf_document_file_exporter_end;
 	iface->get_capabilities = pdf_document_file_exporter_get_capabilities;
 }
@@ -2053,7 +2090,7 @@ ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
 			ev_field = ev_form_field_signature_new (id);
 			break;
 	        case POPPLER_FORM_FIELD_UNKNOWN:
-			break;
+			return NULL;
 	}
 
 	ev_field->font_size = font_size;
@@ -2072,7 +2109,6 @@ pdf_document_forms_get_form_fields (EvDocumentForms *document,
  	GList *fields;
  	GList *list;
  	double height;
-	
 
  	pdf_document = PDF_DOCUMENT (document);
  	poppler_page = poppler_document_get_page (pdf_document->document, page);
@@ -2082,19 +2118,25 @@ pdf_document_forms_get_form_fields (EvDocumentForms *document,
  	for (list = fields; list; list = list->next) {
  		PopplerFormFieldMapping *mapping;
  		EvFormFieldMapping *field_mapping;
-		
+		EvFormField *ev_field;
+
  		mapping = (PopplerFormFieldMapping *)list->data;
 
+		ev_field = ev_form_field_from_poppler_field (mapping->field);
+		if (!ev_field)
+			continue;
+
  		field_mapping = g_new0 (EvFormFieldMapping, 1);
 		field_mapping->x1 = mapping->area.x1;
 		field_mapping->x2 = mapping->area.x2;
 		field_mapping->y1 = height - mapping->area.y2;
 		field_mapping->y2 = height - mapping->area.y1;
-		field_mapping->field = ev_form_field_from_poppler_field (mapping->field);
+		field_mapping->field = ev_field;
 		field_mapping->field->page = page;
 		
 		retval = g_list_prepend (retval, field_mapping);
 	}
+	
 	poppler_page_free_form_field_mapping (fields);
 	g_object_unref (poppler_page);