X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pdf%2Fev-poppler.cc;h=9989d827674d6d9e17fb55f7ef34cb8930653d79;hb=79986dda7231d1ef1c530909bde8e18a507a2a2a;hp=8d555affd66d56f27d53c7a364fd5059942ce17a;hpb=cbdeaed3897f8fdd01995a356c1e3a829fffbf7e;p=evince.git

diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc
index 8d555aff..9989d827 100644
--- a/pdf/ev-poppler.cc
+++ b/pdf/ev-poppler.cc
@@ -56,6 +56,12 @@ struct _PdfDocument
 	PopplerPSFile *ps_file;
 	gchar *password;
 
+	PopplerOrientation orientation;
+
+	PopplerFontInfo *font_info;
+	PopplerFontsIter *fonts_iter;
+	int fonts_scanned_pages;
+
 	PdfDocumentSearch *search;
 };
 
@@ -100,6 +106,14 @@ pdf_document_dispose (GObject *object)
 	if (pdf_document->document) {
 		g_object_unref (pdf_document->document);
 	}
+
+	if (pdf_document->font_info) { 
+		poppler_font_info_free (pdf_document->font_info);
+	}
+
+	if (pdf_document->fonts_iter) {
+		poppler_fonts_iter_free (pdf_document->fonts_iter);
+	}
 }
 
 static void
@@ -192,11 +206,11 @@ pdf_document_get_page_size (EvDocument   *document,
 			    double       *width,
 			    double       *height)
 {
+	PdfDocument *pdf_document = PDF_DOCUMENT (document);
 	PopplerPage *poppler_page;
 
-	poppler_page = poppler_document_get_page (PDF_DOCUMENT (document)->document,
-						  page);
-
+	poppler_page = poppler_document_get_page (pdf_document->document, page);
+	poppler_page_set_orientation (poppler_page, pdf_document->orientation);
 	poppler_page_get_size (poppler_page, width, height);
 }
 
@@ -270,6 +284,7 @@ pdf_document_render_pixbuf (EvDocument   *document,
 	pdf_document = PDF_DOCUMENT (document);
 	poppler_page = poppler_document_get_page (pdf_document->document,
 						  page);
+	poppler_page_set_orientation (poppler_page, pdf_document->orientation);
 
 	poppler_page_get_size (poppler_page, &width_points, &height_points);
 	width = (int) ((width_points * scale) + 0.5);
@@ -473,6 +488,33 @@ pdf_document_get_text (EvDocument *document, int page, EvRectangle *rect)
 	return poppler_page_get_text (poppler_page, &r);
 }
 
+static void
+pdf_document_set_orientation (EvDocument *document, EvOrientation orientation)
+{
+	PdfDocument *pdf_document = PDF_DOCUMENT (document);
+	PopplerOrientation poppler_orientation;
+
+	switch (orientation) {
+		case EV_ORIENTATION_DOCUMENT:
+			poppler_orientation = POPPLER_ORIENTATION_DOCUMENT;
+			break;
+		case EV_ORIENTATION_PORTRAIT:
+			poppler_orientation = POPPLER_ORIENTATION_PORTRAIT;
+			break;
+		case EV_ORIENTATION_LANDSCAPE:
+			poppler_orientation = POPPLER_ORIENTATION_LANDSCAPE;
+			break;
+		case EV_ORIENTATION_UPSIDEDOWN:
+			poppler_orientation = POPPLER_ORIENTATION_UPSIDEDOWN;
+			break;
+		case EV_ORIENTATION_SEASCAPE:
+			poppler_orientation = POPPLER_ORIENTATION_SEASCAPE;
+			break;
+	}
+
+	pdf_document->orientation = poppler_orientation;
+}
+
 static void
 pdf_document_document_iface_init (EvDocumentIface *iface)
 {
@@ -486,6 +528,7 @@ pdf_document_document_iface_init (EvDocumentIface *iface)
 	iface->get_text = pdf_document_get_text;
 	iface->can_get_text = pdf_document_can_get_text;
 	iface->get_info = pdf_document_get_info;
+	iface->set_orientation = pdf_document_set_orientation;
 };
 
 static void
@@ -495,28 +538,55 @@ pdf_document_security_iface_init (EvDocumentSecurityIface *iface)
 	iface->set_password = pdf_document_set_password;
 }
 
+static gdouble
+pdf_document_fonts_get_progress (EvDocumentFonts *document_fonts)
+{
+	PdfDocument *pdf_document = PDF_DOCUMENT (document_fonts);
+	int n_pages;
+
+        n_pages = pdf_document_get_n_pages (EV_DOCUMENT (pdf_document));
+
+	return (double)pdf_document->fonts_scanned_pages / (double)n_pages;
+}
+
 static gboolean
-pdf_document_fonts_fill_model (EvDocumentFonts *document_fonts,
-			       GtkTreeModel    *model,
-			       int              n_pages)
+pdf_document_fonts_scan (EvDocumentFonts *document_fonts,
+			 int              n_pages)
 {
-#ifdef POPPLER_FONT_INFO
 	PdfDocument *pdf_document = PDF_DOCUMENT (document_fonts);
-	PopplerFontInfo *info;
-	PopplerFontsIter *iter;
 	gboolean result;
 
 	g_return_val_if_fail (PDF_IS_DOCUMENT (document_fonts), FALSE);
 
-	info = (PopplerFontInfo *)g_object_get_data (G_OBJECT (model), "font_info");
-	if (info == NULL) {
-		info = poppler_font_info_new (pdf_document->document);
-		g_object_set_data_full (G_OBJECT (model), "font_info",
-					(PopplerFontInfo *)info,
-					(GDestroyNotify)poppler_font_info_free);
+	if (pdf_document->font_info == NULL) { 
+		pdf_document->font_info = poppler_font_info_new (pdf_document->document);
+	}
+
+	if (pdf_document->fonts_iter) {
+		poppler_fonts_iter_free (pdf_document->fonts_iter);
+	}
+
+	pdf_document->fonts_scanned_pages += n_pages;
+
+	result = poppler_font_info_scan (pdf_document->font_info, n_pages,
+				         &pdf_document->fonts_iter);
+	if (!result) {
+		pdf_document->fonts_scanned_pages = 0;
+		poppler_font_info_free (pdf_document->font_info);
+		pdf_document->font_info = NULL;	
 	}
 
-	result = poppler_font_info_scan (info, n_pages, &iter);
+	return result;
+}
+
+static void
+pdf_document_fonts_fill_model (EvDocumentFonts *document_fonts,
+			       GtkTreeModel    *model)
+{
+	PdfDocument *pdf_document = PDF_DOCUMENT (document_fonts);
+	PopplerFontsIter *iter = pdf_document->fonts_iter;
+
+	g_return_if_fail (PDF_IS_DOCUMENT (document_fonts));
 
 	if (iter) {
 		do {
@@ -530,19 +600,15 @@ pdf_document_fonts_fill_model (EvDocumentFonts *document_fonts,
 					    EV_DOCUMENT_FONTS_COLUMN_NAME, name,
 					    -1);
 		} while (poppler_fonts_iter_next (iter));
-		poppler_fonts_iter_free (iter);
 	}
-
-	return result;
-#else
-	return FALSE;
-#endif
 }
 
 static void
 pdf_document_document_fonts_iface_init (EvDocumentFontsIface *iface)
 {
 	iface->fill_model = pdf_document_fonts_fill_model;
+	iface->scan = pdf_document_fonts_scan;
+	iface->get_progress = pdf_document_fonts_get_progress;
 }
 
 static gboolean