[poppler] Branch 'poppler-0.14' - goo/ImgWriter.h goo/JpegWriter.h poppler/SplashOutputDev.cc

[Albert Astals Cid]

 goo/ImgWriter.h            |    3 ++-
 goo/JpegWriter.h           |    3 ++-
 poppler/SplashOutputDev.cc |    6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 9bf18e685fccba9c4b7bbde26c37ec158a6186f7
Author: Brian Cameron <brian.cameron at oracle.com>
Date:   Fri Jun 18 19:22:17 2010 +0100

    Compile with Sun Studio

diff --git a/goo/ImgWriter.h b/goo/ImgWriter.h
index e11a30b..f44c85d 100644
--- a/goo/ImgWriter.h
+++ b/goo/ImgWriter.h
@@ -7,6 +7,7 @@
 // Copyright (C) 2009 Stefan Thomas <thomas at eload24.com>
 // Copyright (C) 2009 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2010 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2010 Brian Cameron <brian.cameron at oracle.com>
 //
 //========================================================================
 
@@ -14,7 +15,7 @@
 #define IMGWRITER_H
 
 #include <config.h>
-#include <cstdio>
+#include <stdio.h>
 	
 class ImgWriter
 {
diff --git a/goo/JpegWriter.h b/goo/JpegWriter.h
index 3b98da2..1f7a738 100644
--- a/goo/JpegWriter.h
+++ b/goo/JpegWriter.h
@@ -8,6 +8,7 @@
 // Copyright (C) 2010 Adrian Johnson <ajohnson at redneon.com>
 // Copyright (C) 2010 Jürg Billeter <j at bitron.ch>
 // Copyright (C) 2010 Harry Roberts <harry.roberts at midnight-labs.org>
+// Copyright (C) 2010 Brian Cameron <brian.cameron at oracle.com>
 //
 //========================================================================
 
@@ -18,7 +19,7 @@
 
 #ifdef ENABLE_LIBJPEG
 
-#include <cstdio>
+#include <sys/types.h>
 #include "ImgWriter.h"
 
 extern "C" {
diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index 00aae92..21d7be6 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -24,6 +24,7 @@
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
 // Copyright (C) 2009 William Bader <williambader at hotmail.com>
 // Copyright (C) 2010 Patrick Spendrin <ps_ml at gmx.de>
+// Copyright (C) 2010 Brian Cameron <brian.cameron at oracle.com>
 //
 // 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
@@ -72,6 +73,11 @@ extern "C" int unlink(char *filename);
 #define isfinite(x) _finite(x)
 #endif
 
+#ifdef __sun
+#include <ieeefp.h>
+#define isfinite(x) finite(x)
+#endif
+
 //------------------------------------------------------------------------
 
 // Divide a 16-bit value (in [0, 255*255]) by 255, returning an 8-bit result.