fix a problem in the tiff patch

This commit is contained in:
Matthias Clasen 2007-11-26 14:04:35 +00:00
parent ed31fcde67
commit 502233f933
2 changed files with 7 additions and 3 deletions

View File

@ -5,7 +5,7 @@
Name: evince
Version: 2.20.1
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Document viewer
License: GPLv2+ and GFDL+
@ -163,6 +163,9 @@ fi
%changelog
* Mon Nov 26 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-5
- Fix a problem in the tiff patch
* Sat Nov 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-4
- Enable the dvi and djvu backends

View File

@ -1,6 +1,6 @@
diff -up evince-2.20.1/backend/tiff/tiff-document.c.tiff evince-2.20.1/backend/tiff/tiff-document.c
--- evince-2.20.1/backend/tiff/tiff-document.c.tiff 2007-10-15 16:12:12.000000000 -0400
+++ evince-2.20.1/backend/tiff/tiff-document.c 2007-11-15 23:02:08.000000000 -0500
+++ evince-2.20.1/backend/tiff/tiff-document.c 2007-11-26 09:03:29.000000000 -0500
@@ -210,6 +210,7 @@ tiff_document_render (EvDocument *d
float x_res, y_res;
gint rowstride, bytes;
@ -9,13 +9,14 @@ diff -up evince-2.20.1/backend/tiff/tiff-document.c.tiff evince-2.20.1/backend/t
GdkPixbuf *pixbuf;
GdkPixbuf *scaled_pixbuf;
GdkPixbuf *rotated_pixbuf;
@@ -271,6 +272,21 @@ tiff_document_render (EvDocument *d
@@ -271,6 +272,22 @@ tiff_document_render (EvDocument *d
ORIENTATION_TOPLEFT, 1);
pop_handlers ();
+ /* Convert the format returned by libtiff to
+ * what cairo expects
+ */
+ p = pixels;
+ while (p < pixels + bytes) {
+ uint32 pixel = *(uint32 *)p;
+ int r = TIFFGetR(pixel);