60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
|
From d30496f52b85f82947bd07b9bd60f8482843ece8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e>
|
||
|
|
Date: Tue, 5 Jul 2011 09:23:38 +0000
|
||
|
|
Subject: [PATCH 1/2] When using Poppler 0.17.0, I needed to swap the blue and
|
||
|
|
red channels, otherwise the colors (other than black
|
||
|
|
and white) looked wierd.
|
||
|
|
|
||
|
|
git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@367 cb4bfb15-1111-0410-82e2-95233c8f1c7e
|
||
|
|
---
|
||
|
|
src/PDFDocument.cxx | 20 ++++++++++++++++++++
|
||
|
|
1 files changed, 20 insertions(+), 0 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx
|
||
|
|
index df5d75f..63b3513 100644
|
||
|
|
--- src/PDFDocument.cxx
|
||
|
|
+++ src/PDFDocument.cxx
|
||
|
|
@@ -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 (),
|
||
|
|
--
|
||
|
|
1.7.7
|