[poppler] 2 commits - goo/gfile.cc poppler/Gfx.cc

[Albert Astals Cid]

 goo/gfile.cc   |    3 ++-
 poppler/Gfx.cc |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit ea3546f84c5335c58cdb2906b1a1a4656be9c8ea
Author: Hib Eris <hib at hiberis.nl>
Date:   Sun Dec 21 23:33:49 2008 +0100

    Fix compile warnings on signed/unsigned comparison

diff --git a/goo/gfile.cc b/goo/gfile.cc
index 6d19cce..d0627d2 100644
--- a/goo/gfile.cc
+++ b/goo/gfile.cc
@@ -18,6 +18,7 @@
 // Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
 // Copyright (C) 2006 Kristian Høgsberg <krh at redhat.com>
 // Copyright (C) 2008 Adam Batkin <adam at batkin.net>
+// Copyright (C) 2008 Hib Eris <hib at hiberis.nl>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -617,7 +618,7 @@ GDirEntry::GDirEntry(char *dirPath, char *nameA, GBool doStat) {
 #ifdef VMS
   char *p;
 #elif defined(WIN32)
-  int fa;
+  DWORD fa;
 #elif defined(ACORN)
 #else
   struct stat st;
commit ca672ae51d2c1fa59a891717b418ba86b5e7345c
Author: Hib Eris <hib at hiberis.nl>
Date:   Sun Dec 21 23:33:00 2008 +0100

    Fix compile warnings on ignored pragma with mingw compiler

diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
index 20ec1bf..db06453 100644
--- a/poppler/Gfx.cc
+++ b/poppler/Gfx.cc
@@ -26,6 +26,7 @@
 // Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
 // Copyright (C) 2008 Pino Toscano <pino at kde.org>
 // Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
+// Copyright (C) 2008 Hib Eris <hib at hiberis.nl>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -110,7 +111,7 @@
 // Operator table
 //------------------------------------------------------------------------
 
-#ifdef WIN32 // this works around a bug in the VC7 compiler
+#ifdef _MSC_VER // this works around a bug in the VC7 compiler
 #  pragma optimize("",off)
 #endif
 
@@ -283,7 +284,7 @@ Operator Gfx::opTab[] = {
           &Gfx::opCurveTo2},
 };
 
-#ifdef WIN32 // this works around a bug in the VC7 compiler
+#ifdef _MSC_VER // this works around a bug in the VC7 compiler
 #  pragma optimize("",on)
 #endif