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=aabcd6dee23030259ba34e14603e2be9fc862ef9;hb=05b38f9fa9415e0ce767603785dfdfe488111679;hp=fc8f4aaad3af684f151739111c2291516c37e2d1;hpb=b8aebf2e1ba5b4f9ff1e1256b28acb3e23947c51;p=evince.git

diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c
index fc8f4aaa..aabcd6de 100644
--- a/backend/tiff/tiff-document.c
+++ b/backend/tiff/tiff-document.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "tiffio.h"
 #include "tiff2ps.h"
@@ -37,12 +37,12 @@
 
 struct _TiffDocumentClass
 {
-  GObjectClass parent_class;
+  EvDocumentClass parent_class;
 };
 
 struct _TiffDocument
 {
-  GObject parent_instance;
+  EvDocument parent_instance;
 
   TIFF *tiff;
   gint n_pages;
@@ -53,7 +53,6 @@ struct _TiffDocument
 
 typedef struct _TiffDocumentClass TiffDocumentClass;
 
-static void tiff_document_document_iface_init (EvDocumentIface *iface);
 static void tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
 static void tiff_document_document_file_exporter_iface_init (EvFileExporterIface *iface);
 
@@ -91,13 +90,11 @@ tiff_document_load (EvDocument  *document,
 	gchar *filename;
 	TIFF *tiff;
 	
-	push_handlers ();
 	filename = g_filename_from_uri (uri, NULL, error);
-	if (!filename) {
-		pop_handlers ();
+	if (!filename)
 		return FALSE;
-	}
 	
+	push_handlers ();
 	tiff = TIFFOpen (filename, "r");
 	if (tiff) {
 		guint32 w, h;
@@ -109,6 +106,13 @@ tiff_document_load (EvDocument  *document,
 	
 	if (!tiff) {
 		pop_handlers ();
+
+    		g_set_error_literal (error,
+				     EV_DOCUMENT_ERROR,
+				     EV_DOCUMENT_ERROR_INVALID,
+				     _("Invalid document"));
+
+		g_free (filename);
 		return FALSE;
 	}
 	
@@ -215,6 +219,7 @@ tiff_document_render (EvDocument      *document,
 	gint rowstride, bytes;
 	guchar *pixels = NULL;
 	guchar *p;
+	int orientation;
 	cairo_surface_t *surface;
 	cairo_surface_t *rotated_surface;
 	static const cairo_user_data_key_t key;
@@ -238,6 +243,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 ();
@@ -250,10 +259,10 @@ tiff_document_render (EvDocument      *document,
 	rowstride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, width);
 #else
 	rowstride = width * 4;
+#endif
 	if (rowstride / 4 != width)
-		/* overflow */
+		/* overflow, or cairo was changed in an unsupported way */
 		return NULL;                
-#endif
 	
 	bytes = height * rowstride;
 	if (bytes / rowstride != height)
@@ -274,7 +283,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
@@ -282,16 +291,15 @@ tiff_document_render (EvDocument      *document,
 	*/
 	p = pixels;
 	while (p < pixels + bytes) {
-		uint32 pixel = *(uint32 *)p;
-		int r = TIFFGetR(pixel);
-		int g = TIFFGetG(pixel);
-		int b = TIFFGetB(pixel);
-		int a = TIFFGetA(pixel);
-		
-		*p++ = b;
-		*p++ = g;
-		*p++ = r;
-		*p++ = a;
+		guint32 *pixel = (guint32*)p;
+		guint8 r = TIFFGetR(*pixel);
+		guint8 g = TIFFGetG(*pixel);
+		guint8 b = TIFFGetB(*pixel);
+		guint8 a = TIFFGetA(*pixel);
+
+		*pixel = (a << 24) | (r << 16) | (g << 8) | b;
+
+		p += 4;
 	}
 
 	rotated_surface = ev_document_misc_surface_rotate_and_scale (surface,
@@ -375,6 +383,21 @@ tiff_document_render_pixbuf (EvDocument      *document,
 	return rotated_pixbuf;
 }
 
+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 void
 tiff_document_finalize (GObject *object)
 {
@@ -391,31 +414,17 @@ tiff_document_finalize (GObject *object)
 static void
 tiff_document_class_init (TiffDocumentClass *klass)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+	GObjectClass    *gobject_class = G_OBJECT_CLASS (klass);
+	EvDocumentClass *ev_document_class = EV_DOCUMENT_CLASS (klass);
 
 	gobject_class->finalize = tiff_document_finalize;
-}
 
-static EvDocumentInfo *
-tiff_document_get_info (EvDocument *document)
-{
-	EvDocumentInfo *info;
-
-	info = g_new0 (EvDocumentInfo, 1);
-	info->fields_mask = 0;
-
-	return info;
-}
-
-static void
-tiff_document_document_iface_init (EvDocumentIface *iface)
-{
-	iface->load = tiff_document_load;
-	iface->save = tiff_document_save;
-	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_info = tiff_document_get_info;
+	ev_document_class->load = tiff_document_load;
+	ev_document_class->save = tiff_document_save;
+	ev_document_class->get_n_pages = tiff_document_get_n_pages;
+	ev_document_class->get_page_size = tiff_document_get_page_size;
+	ev_document_class->render = tiff_document_render;
+	ev_document_class->get_page_label = tiff_document_get_page_label;
 }
 
 static GdkPixbuf *