X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=pdf%2Fxpdf%2Fxpdfconfig.h;h=ef1764ab7fb725981501f9d3e3b0e5733e9a8699;hb=bfd0b848c8c81ab10698f74b77f9f0904c3161e1;hp=c814b88550b945781b17b9fd3979f378a51a719d;hpb=2a393c134fe3fe8eb85bf818cb7ad6ae4396322a;p=evince.git

diff --git a/pdf/xpdf/xpdfconfig.h b/pdf/xpdf/xpdfconfig.h
index c814b885..ef1764ab 100644
--- a/pdf/xpdf/xpdfconfig.h
+++ b/pdf/xpdf/xpdfconfig.h
@@ -14,8 +14,11 @@
 //------------------------------------------------------------------------
 
 // 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"
@@ -24,6 +27,10 @@
 // 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
 //------------------------------------------------------------------------
@@ -79,40 +86,12 @@
 #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
 
-//------------------------------------------------------------------------
-// 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
 //------------------------------------------------------------------------