X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Ftiff%2Ftiff-document.c;h=7f51aacf7b22821eef9b938358362db519b436c1;hb=4cec7958f9bfd4f2950bdf0b257757348b26dafc;hp=d1473a17bbd3d94908305a030f91d7a4eba8e361;hpb=31e16bd8f386dc292e60489d4a17227804bdc2e6;p=evince.git

diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c
index d1473a17..7f51aacf 100644
--- a/backend/tiff/tiff-document.c
+++ b/backend/tiff/tiff-document.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 
+#include <config.h>
 #include <stdio.h>
 #include <glib.h>
 #include <glib/gi18n.h>
@@ -58,10 +59,10 @@ static void tiff_document_document_file_exporter_iface_init (EvFileExporterIface
 
 EV_BACKEND_REGISTER_WITH_CODE (TiffDocument, tiff_document,
 			 {
-			   G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
-						  tiff_document_document_thumbnails_iface_init);
-			   G_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
-						  tiff_document_document_file_exporter_iface_init);
+			   EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
+							   tiff_document_document_thumbnails_iface_init);
+			   EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
+							   tiff_document_document_file_exporter_iface_init);
 			 });
 
 static TIFFErrorHandler orig_error_handler = NULL;
@@ -175,10 +176,10 @@ tiff_document_get_resolution (TiffDocument *tiff_document,
 }
 
 static void
-tiff_document_get_page_size (EvDocument   *document,
-			     int           page,
-			     double       *width,
-			     double       *height)
+tiff_document_get_page_size (EvDocument *document,
+			     EvPage     *page,
+			     double     *width,
+			     double     *height)
 {
 	guint32 w, h;
 	gfloat x_res, y_res;
@@ -188,7 +189,7 @@ tiff_document_get_page_size (EvDocument   *document,
 	g_return_if_fail (tiff_document->tiff != NULL);
 	
 	push_handlers ();
-	if (TIFFSetDirectory (tiff_document->tiff, page) != 1) {
+	if (TIFFSetDirectory (tiff_document->tiff, page->index) != 1) {
 		pop_handlers ();
 		return;
 	}
@@ -214,9 +215,7 @@ tiff_document_render (EvDocument      *document,
 	gint rowstride, bytes;
 	guchar *pixels = NULL;
 	guchar *p;
-	GdkPixbuf *pixbuf;
-	GdkPixbuf *scaled_pixbuf;
-	GdkPixbuf *rotated_pixbuf;
+	int orientation;
 	cairo_surface_t *surface;
 	cairo_surface_t *rotated_surface;
 	static const cairo_user_data_key_t key;
@@ -225,7 +224,7 @@ tiff_document_render (EvDocument      *document,
 	g_return_val_if_fail (tiff_document->tiff != NULL, NULL);
   
 	push_handlers ();
-	if (TIFFSetDirectory (tiff_document->tiff, rc->page) != 1) {
+	if (TIFFSetDirectory (tiff_document->tiff, rc->page->index) != 1) {
 		pop_handlers ();
 		return NULL;
 	}
@@ -240,6 +239,10 @@ tiff_document_render (EvDocument      *document,
 		return NULL;
 	}
 
+	if (! TIFFGetField (tiff_document->tiff, TIFFTAG_ORIENTATION, &orientation)) {
+		orientation = ORIENTATION_TOPLEFT;
+	}
+
 	tiff_document_get_resolution (tiff_document, &x_res, &y_res);
 	
 	pop_handlers ();
@@ -248,11 +251,15 @@ tiff_document_render (EvDocument      *document,
 	if (width <= 0 || height <= 0)
 		return NULL;                
 
+#ifdef HAVE_CAIRO_FORMAT_STRIDE_FOR_WIDTH
+	rowstride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, width);
+#else
 	rowstride = width * 4;
 	if (rowstride / 4 != width)
 		/* overflow */
 		return NULL;                
-        
+#endif
+	
 	bytes = height * rowstride;
 	if (bytes / rowstride != height)
 		/* overflow */
@@ -272,7 +279,7 @@ tiff_document_render (EvDocument      *document,
 	TIFFReadRGBAImageOriented (tiff_document->tiff,
 				   width, height,
 				   (uint32 *)pixels,
-				   ORIENTATION_TOPLEFT, 1);
+				   orientation, 1);
 	pop_handlers ();
 
 	/* Convert the format returned by libtiff to
@@ -315,7 +322,7 @@ tiff_document_render_pixbuf (EvDocument      *document,
 	GdkPixbuf *rotated_pixbuf;
 	
 	push_handlers ();
-	if (TIFFSetDirectory (tiff_document->tiff, rc->page) != 1) {
+	if (TIFFSetDirectory (tiff_document->tiff, rc->page->index) != 1) {
 		pop_handlers ();
 		return NULL;
 	}
@@ -394,6 +401,21 @@ tiff_document_class_init (TiffDocumentClass *klass)
 	gobject_class->finalize = tiff_document_finalize;
 }
 
+static gchar *
+tiff_document_get_page_label (EvDocument *document,
+			      EvPage     *page)
+{
+	TiffDocument *tiff_document = TIFF_DOCUMENT (document);
+	static gchar *label;
+	
+	if (TIFFGetField (tiff_document->tiff, TIFFTAG_PAGENAME, &label) &&
+	    g_utf8_validate (label, -1, NULL)) {
+		return g_strdup (label);
+	}
+	
+	return NULL;
+}
+
 static EvDocumentInfo *
 tiff_document_get_info (EvDocument *document)
 {
@@ -413,6 +435,7 @@ tiff_document_document_iface_init (EvDocumentIface *iface)
 	iface->get_n_pages = tiff_document_get_n_pages;
 	iface->get_page_size = tiff_document_get_page_size;
 	iface->render = tiff_document_render;
+	iface->get_page_label = tiff_document_get_page_label;
 	iface->get_info = tiff_document_get_info;
 }
 
@@ -480,7 +503,7 @@ tiff_document_file_exporter_do_page (EvFileExporter *exporter, EvRenderContext *
 
 	if (document->ps_export_ctx == NULL)
 		return;
-	if (TIFFSetDirectory (document->tiff, rc->page) != 1)
+	if (TIFFSetDirectory (document->tiff, rc->page->index) != 1)
 		return;
 	tiff2ps_process_page (document->ps_export_ctx, document->tiff,
 			      0, 0, 0, 0, 0);