Submitted By: Ken Moffat Date: 2015-01-19 Initial Package Version: 0.1.8 Upstream Status: Varies Origin: Found at fedora / from Tim Tassonis Description: Three fixes found at fedora. For the first (only glib.h can be included directly, with recent glib), we used to use a sed - but the other two fixes need patches so I've put them all together. Second part is from upstream and fixes trashed colours Upstream: http://trac.emma-soft.com/epdfview/changeset/367/trunk Fixes bug: https://bugzilla.redhat.com/show_bug.cgi?id=745483 Third part was originally the most critical - from Jiri Popelka, found at https://bugzilla.redhat.com/show_bug.cgi?id=841880 - looks as if fedora haven't applied it yet. It solves building with cups-1.6. Fourth part (one-line change to use CAIRO_FORMAT_ARGB32) is from Tim Tassonis and allows embedded transparent pngs to display with "recent" poppler : in practice, it is needed for poppler-0.22 onwards. diff -Naur a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h --- a/src/gtk/StockIcons.h 2011-05-28 11:24:57.000000000 +0100 +++ b/src/gtk/StockIcons.h 2015-03-19 19:04:47.009630630 +0000 @@ -18,7 +18,7 @@ #if !defined (__STOCK_ICONS_H__) #define __STOCK_ICONS_H__ -#include +#include G_BEGIN_DECLS diff -Naur a/src/PDFDocument.cxx b/src/PDFDocument.cxx --- a/src/PDFDocument.cxx 2011-05-28 11:25:01.000000000 +0100 +++ b/src/PDFDocument.cxx 2015-03-19 19:06:10.627619420 +0000 @@ -20,6 +20,7 @@ #include #include #include +#include #include "epdfview.h" using namespace ePDFView; @@ -33,6 +34,24 @@ 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. /// @@ -616,7 +635,7 @@ #if defined (HAVE_POPPLER_0_17_0) cairo_surface_t *surface = cairo_image_surface_create_for_data ( renderedPage->getData (), - CAIRO_FORMAT_RGB24, width, height, + CAIRO_FORMAT_ARGB32, width, height, renderedPage->getRowStride ()); cairo_t *context = cairo_create (surface); cairo_save(context); @@ -650,6 +669,7 @@ 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 (), diff -Naur a/src/PrintPter.cxx b/src/PrintPter.cxx --- a/src/PrintPter.cxx 2011-05-28 11:25:01.000000000 +0100 +++ b/src/PrintPter.cxx 2015-03-19 19:04:47.009630630 +0000 @@ -22,6 +22,40 @@ #include #include "epdfview.h" +#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) +#define HAVE_CUPS_1_6 1 +#endif + +#ifndef HAVE_CUPS_1_6 +inline int ippGetInteger (ipp_attribute_t *attr, int element) +{ + return (attr->values[element].integer); +} + +inline const char * ippGetString (ipp_attribute_t *attr, + int element, + const char **language /*UNUSED*/) +{ + return (attr->values[element].string.text); +} + +inline int ippSetOperation (ipp_t *ipp, ipp_op_t op) +{ + if (!ipp) + return (0); + ipp->request.op.operation_id = op; + return (1); +} + +inline int ippSetRequestId (ipp_t *ipp, int request_id) +{ + if (!ipp) + return (0); + ipp->request.any.request_id = request_id; + return (1); +} +#endif + using namespace ePDFView; // Structures @@ -380,8 +414,8 @@ ipp_t *request = ippNew (); - request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES; - request->request.op.request_id = 1; + ippSetOperation(request, IPP_GET_PRINTER_ATTRIBUTES); + ippSetRequestId(request, 1); ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8"); @@ -403,7 +437,7 @@ ippFindAttribute (answer, "printer-state", IPP_TAG_ZERO); if ( NULL != state ) { - switch (state->values[0].integer) + switch (ippGetInteger (state, 0)) { case IPP_PRINTER_IDLE: attributes->state = g_strdup (_("Idle")); @@ -425,7 +459,7 @@ ippFindAttribute (answer, "printer-location", IPP_TAG_ZERO); if ( NULL != location ) { - attributes->location = g_strdup (location->values[0].string.text); + attributes->location = g_strdup (ippGetString (location, 0, NULL)); } ippDelete (answer);