rpms/evince/devel evince.spec,1.99,1.100 tiff.patch,1.1,1.2

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/evince/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3818

Modified Files:
	evince.spec tiff.patch 
Log Message:
fix a problem in the tiff patch



Index: evince.spec
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/evince.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- evince.spec	20 Nov 2007 03:21:24 -0000	1.99
+++ evince.spec	26 Nov 2007 14:04:35 -0000	1.100
@@ -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 @@
 
 
 %changelog
+* Mon Nov 26 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-5
+- Fix a problem in the tiff patch
+
 * Sat Nov 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-4
 - Enable the dvi and djvu backends
 

tiff.patch:

Index: tiff.patch
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/tiff.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tiff.patch	16 Nov 2007 04:06:24 -0000	1.1
+++ tiff.patch	26 Nov 2007 14:04:35 -0000	1.2
@@ -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 @@
  	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);