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=6597cfa9c808b7ba39ce3f91b42921c95e45544a;hpb=0abb14da9b027db4a090b0dc78ce45e574a589cf;p=evince.git

diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc
index 6597cfa9..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,56 +538,77 @@ pdf_document_security_iface_init (EvDocumentSecurityIface *iface)
 	iface->set_password = pdf_document_set_password;
 }
 
-static void
-build_fonts_list (PdfDocument      *pdf_document,
-	          GtkTreeModel     *model,
-	          GtkTreeIter      *parent,
-	          PopplerFontsIter *iter)
+static gdouble
+pdf_document_fonts_get_progress (EvDocumentFonts *document_fonts)
 {
-#ifdef POPPLER_FONT_INFO
-	do {
-		GtkTreeIter list_iter;
-		PopplerIndexIter *child;
-		const char *name;
-		
-		name = poppler_fonts_iter_get_name (iter);
-		gtk_list_store_append (GTK_LIST_STORE (model), &list_iter);
-		gtk_list_store_set (GTK_LIST_STORE (model), &list_iter,
-				    EV_DOCUMENT_FONTS_COLUMN_NAME, name,
-				    -1);
-	} while (poppler_fonts_iter_next (iter));
-#endif
+	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 GtkTreeModel *
-pdf_document_fonts_get_fonts_model (EvDocumentFonts *document_fonts)
+static gboolean
+pdf_document_fonts_scan (EvDocumentFonts *document_fonts,
+			 int              n_pages)
 {
 	PdfDocument *pdf_document = PDF_DOCUMENT (document_fonts);
-	GtkTreeModel *model = NULL;
-	PopplerFontsIter *iter;
+	gboolean result;
 
-	g_return_val_if_fail (PDF_IS_DOCUMENT (document_fonts), NULL);
+	g_return_val_if_fail (PDF_IS_DOCUMENT (document_fonts), FALSE);
 
-#ifdef POPPLER_FONT_INFO
-	iter = poppler_fonts_iter_new (pdf_document->document);
-	/* Create the model iff we have items*/
-	if (iter != NULL) {
-#endif
-		model = (GtkTreeModel *) gtk_list_store_new (EV_DOCUMENT_FONTS_COLUMN_NUM_COLUMNS,
-							     G_TYPE_STRING);
-#ifdef POPPLER_FONT_INFO
-		build_fonts_list (pdf_document, model, NULL, iter);
-		poppler_fonts_iter_free (iter);
+	if (pdf_document->font_info == NULL) { 
+		pdf_document->font_info = poppler_font_info_new (pdf_document->document);
 	}
-#endif
 
-	return model;
+	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;	
+	}
+
+	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 {
+			GtkTreeIter list_iter;
+			PopplerIndexIter *child;
+			const char *name;
+		
+			name = poppler_fonts_iter_get_name (iter);
+			gtk_list_store_append (GTK_LIST_STORE (model), &list_iter);
+			gtk_list_store_set (GTK_LIST_STORE (model), &list_iter,
+					    EV_DOCUMENT_FONTS_COLUMN_NAME, name,
+					    -1);
+		} while (poppler_fonts_iter_next (iter));
+	}
 }
 
 static void
 pdf_document_document_fonts_iface_init (EvDocumentFontsIface *iface)
 {
-	iface->get_fonts_model = pdf_document_fonts_get_fonts_model;
+	iface->fill_model = pdf_document_fonts_fill_model;
+	iface->scan = pdf_document_fonts_scan;
+	iface->get_progress = pdf_document_fonts_get_progress;
 }
 
 static gboolean