From 8954a5e9ac17c50cb01c3fcf2787daf40feb7a04 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 26 Nov 2007 11:38:02 +0000
Subject: Tiff documents were rendered with wrong colors. Fixes bug #497279.

2007-11-26  Matthias Clasen  <mclasen@redhat.com>
	* backend/tiff/tiff-document.c: (tiff_document_render):
	Tiff documents were rendered with wrong colors. Fixes bug #497279.

svn path=/trunk/; revision=2748
---
(limited to 'backend')

diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c
index f813c47..34275c1 100644
--- a/backend/tiff/tiff-document.c
+++ b/backend/tiff/tiff-document.c
@@ -210,6 +210,7 @@ tiff_document_render (EvDocument      *document,
 	float x_res, y_res;
 	gint rowstride, bytes;
 	guchar *pixels = NULL;
+	guchar *p;
 	GdkPixbuf *pixbuf;
 	GdkPixbuf *scaled_pixbuf;
 	GdkPixbuf *rotated_pixbuf;
@@ -271,6 +272,23 @@ tiff_document_render (EvDocument      *document,
 				   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);
+		int g = TIFFGetG(pixel);
+		int b = TIFFGetB(pixel);
+		int a = TIFFGetA(pixel);
+		
+		*p++ = b;
+		*p++ = g;
+		*p++ = r;
+		*p++ = a;
+	}
+
 	rotated_surface = ev_document_misc_surface_rotate_and_scale (surface,
 								     (width * rc->scale) + 0.5,
 								     (height * rc->scale * (x_res / y_res)) + 0.5,
--
cgit v0.9.1