[poppler] 2 commits - glib/demo poppler/ArthurOutputDev.cc

[Pino Toscano]

 glib/demo/attachments.c    |    2 +-
 poppler/ArthurOutputDev.cc |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fda181c35b7c7500b6d3c6ca9d454addd54929c5
Author: Pino Toscano <pino at kde.org>
Date:   Mon Dec 22 00:53:44 2008 +0100

    group condition within brackets

diff --git a/poppler/ArthurOutputDev.cc b/poppler/ArthurOutputDev.cc
index fe6659f..ede1594 100644
--- a/poppler/ArthurOutputDev.cc
+++ b/poppler/ArthurOutputDev.cc
@@ -762,8 +762,8 @@ void ArthurOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
   /* ICCBased color space doesn't do any color correction
    * so check its underlying color space as well */
   is_identity_transform = colorMap->getColorSpace()->getMode() == csDeviceRGB ||
-		  colorMap->getColorSpace()->getMode() == csICCBased && 
-		  ((GfxICCBasedColorSpace*)colorMap->getColorSpace())->getAlt()->getMode() == csDeviceRGB;
+		  (colorMap->getColorSpace()->getMode() == csICCBased && 
+		  ((GfxICCBasedColorSpace*)colorMap->getColorSpace())->getAlt()->getMode() == csDeviceRGB);
 
   if (maskColors) {
     for (y = 0; y < height; y++) {
commit c1beeecbd6cbf82811d70c75cb24059b4b492abe
Author: Pino Toscano <pino at kde.org>
Date:   Mon Dec 22 00:46:49 2008 +0100

    [demo] use the proper format field for gsize types

diff --git a/glib/demo/attachments.c b/glib/demo/attachments.c
index d17835f..c13147b 100644
--- a/glib/demo/attachments.c
+++ b/glib/demo/attachments.c
@@ -45,7 +45,7 @@ pgd_attachments_fill_model (GtkListStore    *model,
 		gchar             *size;
 		gchar             *ctime, *mtime;
 
-		size = g_strdup_printf ("%d", attachment->size);
+		size = g_strdup_printf ("%" G_GSIZE_FORMAT, attachment->size);
 		ctime = pgd_format_date (attachment->ctime);
 		mtime = pgd_format_date (attachment->mtime);