Handle document orientation in tiff backend. Fixes bug #548444.

2008-08-19  Carlos Garcia Campos  <carlosgc@gnome.org>

	* backend/tiff/tiff-document.c: (tiff_document_render):

	Handle document orientation in tiff backend. Fixes bug #548444.

svn path=/trunk/; revision=3110

diff --git a/ChangeLog b/ChangeLog
index 581f5647e1c325d51c4424b3aab5152459bfe56c..179d4b7fee29fbe0eee844b7fd92a346073d3e45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-19  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * backend/tiff/tiff-document.c: (tiff_document_render):
+
+       Handle document orientation in tiff backend. Fixes bug #548444.
+       
 2008-08-17  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * shell/ev-sidebar-thumbnails.c: (adjustment_changed_cb):

diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c
index fc8f4aaad3af684f151739111c2291516c37e2d1..8b15b0cd31925618b67dbc5c85963041c935d6f9 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