Bug 568229 – library needs libtool versioning

[evince.git] / backend / tiff / tiff-document.c

diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c
index fc8f4aaad3af684f151739111c2291516c37e2d1..7f51aacf7b22821eef9b938358362db519b436c1 100644 (file)
--- a/backend/tiff/tiff-document.c
+++ b/backend/tiff/tiff-document.c
@@ -215,6 +215,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 +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 ();
@@ -274,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
@@ -396,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)
 {
@@ -415,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;
 }