Changeset 367

Timestamp:

07/05/11 05:23:38 (11 months ago)

Author:

jordi

Message:

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.

File:

• trunk/src/PDFDocument.cxx (modified) (3 diffs)

trunk/src/PDFDocument.cxx

@@ -21 +21 @@
 #include <poppler.h>
 #include <unistd.h>
+#include <algorithm>
 #include "epdfview.h"
 
@@ -33 +34 @@
 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;
+            }
+        }
+    }
+}
 
 ///
@@ -651 +670 @@
         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.