From 586ed14c9029da7eea09e7358227bc8bb5514bd4 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Tue, 19 Aug 2008 16:05:20 +0000 Subject: [PATCH] Handle document orientation in tiff backend. Fixes bug #548444. 2008-08-19 Carlos Garcia Campos * backend/tiff/tiff-document.c: (tiff_document_render): Handle document orientation in tiff backend. Fixes bug #548444. svn path=/trunk/; revision=3110 --- ChangeLog | 6 ++++++ backend/tiff/tiff-document.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 581f5647..179d4b7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-19 Carlos Garcia Campos + + * backend/tiff/tiff-document.c: (tiff_document_render): + + Handle document orientation in tiff backend. Fixes bug #548444. + 2008-08-17 Carlos Garcia Campos * shell/ev-sidebar-thumbnails.c: (adjustment_changed_cb): diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c index fc8f4aaa..8b15b0cd 100644 --- 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 -- 2.43.5