Fixes a bug with poppler swapping the blue and red channels, from

http://trac.emma-soft.com/epdfview/changeset/367
From James Turner, ok dcoppa@.
This commit is contained in:
landry 2012-01-13 19:07:25 +00:00
parent 17b58c9332
commit b4fcb70248
2 changed files with 50 additions and 2 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.25 2011/12/03 23:04:37 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.26 2012/01/13 19:07:25 landry Exp $
COMMENT= lightweight PDF document viewer
DISTNAME= epdfview-0.1.8
REVISION= 1
REVISION= 2
CATEGORIES= print
HOMEPAGE= http://trac.emma-soft.com/epdfview/

View File

@ -0,0 +1,48 @@
$OpenBSD: patch-src_PDFDocument_cxx,v 1.4 2012/01/13 19:07:25 landry Exp $
Fixes a bug with poppler swapping the blue and red channels.
http://trac.emma-soft.com/epdfview/changeset/367
--- src/PDFDocument.cxx.orig Sat May 28 06:25:01 2011
+++ src/PDFDocument.cxx Thu Jan 12 22:08:15 2012
@@ -20,6 +20,7 @@
#include <time.h>
#include <poppler.h>
#include <unistd.h>
+#include <algorithm>
#include "epdfview.h"
using namespace ePDFView;
@@ -33,6 +34,24 @@ static PageLayout convertPageLayout (gint pageLayout);
static PageMode convertPageMode (gint pageMode);
static gchar *getAbsoluteFileName (const gchar *fileName);
+namespace
+{
+ void
+ convert_bgra_to_rgba (guint8 *data, int width, int height)
+ {
+ using std::swap;
+
+ for (int y = 0; y < height; y++)
+ {
+ for (int x = 0; x < width; x++)
+ {
+ swap(data[0], data[2]);
+ data += 4;
+ }
+ }
+ }
+}
+
///
/// @brief Constructs a new PDFDocument object.
///
@@ -650,6 +669,7 @@ PDFDocument::renderPage (gint pageNum)
poppler_page_render (page, context);
cairo_destroy(context);
cairo_surface_destroy (surface);
+ convert_bgra_to_rgba(renderedPage->getData (), width, height);
#else // !HAVE_POPPLER_0_17_0
// Create the pixbuf from the data and render to it.
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data (renderedPage->getData (),