Import of Xpdf 2.02 for merge

[evince.git] / pdf / xpdf / xpdfconfig.h

diff --git a/pdf/xpdf/xpdfconfig.h b/pdf/xpdf/xpdfconfig.h
index c814b88550b945781b17b9fd3979f378a51a719d..ef1764ab7fb725981501f9d3e3b0e5733e9a8699 100644 (file)
--- a/pdf/xpdf/xpdfconfig.h
+++ b/pdf/xpdf/xpdfconfig.h
@@ -14,8 +14,11 @@
 //------------------------------------------------------------------------
 
 // xpdf version
 //------------------------------------------------------------------------
 
 // xpdf version

-
-#define xpdfVersion "1.01.1"
+#define xpdfVersion         "2.01"
+#define xpdfVersionNum      2.01
+#define xpdfMajorVersion    2
+#define xpdfMinorVersion    1
+#define xpdfMajorVersionStr "2"

 
 // supported PDF version
 #define supportedPDFVersionStr "1.4"
 
 // supported PDF version
 #define supportedPDFVersionStr "1.4"


@@ -24,6 +27,10 @@
 // copyright notice
 #define xpdfCopyright "Copyright 1996-2002 Glyph & Cog, LLC"
 
 // copyright notice
 #define xpdfCopyright "Copyright 1996-2002 Glyph & Cog, LLC"
 

+// Windows resource file stuff
+#define winxpdfVersion "WinXpdf 2.01"
+#define xpdfCopyrightAmp "Copyright 1996-2002 Glyph && Cog, LLC"
+

 //------------------------------------------------------------------------
 // paper size
 //------------------------------------------------------------------------
 //------------------------------------------------------------------------
 // paper size
 //------------------------------------------------------------------------


@@ -79,40 +86,12 @@
 #define pclose _pclose
 #endif
 
 #define pclose _pclose
 #endif
 

-#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(WIN32) || defined(__DJGPP__) || defined(__CYGWIN32__) || defined(MACOS)
+#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(WIN32) || defined(__DJGPP__) || defined(MACOS)

 #define POPEN_READ_MODE "rb"
 #else
 #define POPEN_READ_MODE "r"
 #endif
 
 #define POPEN_READ_MODE "rb"
 #else
 #define POPEN_READ_MODE "r"
 #endif
 

-//------------------------------------------------------------------------
-// uncompress program
-//------------------------------------------------------------------------
-
-#ifdef HAVE_POPEN
-
-// command to uncompress to stdout
-#  ifdef USE_GZIP
-#    define uncompressCmd "gzip -d -c -q"
-#  else
-#    ifdef __EMX__
-#      define uncompressCmd "compress -d -c"
-#    else
-#      define uncompressCmd "uncompress -c"
-#    endif // __EMX__
-#  endif // USE_GZIP
-
-#else // HAVE_POPEN
-
-// command to uncompress a file
-#  ifdef USE_GZIP
-#    define uncompressCmd "gzip -d -q"
-#  else
-#    define uncompressCmd "uncompress"
-#  endif // USE_GZIP
-
-#endif // HAVE_POPEN
-

 //------------------------------------------------------------------------
 // Win32 stuff
 //------------------------------------------------------------------------
 //------------------------------------------------------------------------
 // Win32 stuff
 //------------------------------------------------------------------------