Synched with Xpdf 0.92

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

diff --git a/pdf/xpdf/xpdfconfig.h b/pdf/xpdf/xpdfconfig.h
index 742c49f7ed397d20ea3f69aa95847a45afc08631..eb56cb4d7ab85c77bbd8a41eb8a059e45f68a638 100644 (file)
--- a/pdf/xpdf/xpdfconfig.h
+++ b/pdf/xpdf/xpdfconfig.h
@@ -14,14 +14,14 @@
 //------------------------------------------------------------------------
 
 // xpdf version
-#define xpdfVersion "0.90.1"
+#define xpdfVersion "0.92.1"
 
 // supported PDF version
-#define pdfVersion "1.3"
-#define pdfVersionNum 1.3
+#define supportedPDFVersionStr "1.3"
+#define supportedPDFVersionNum 1.3
 
 // copyright notice
-#define xpdfCopyright "Copyright \251 1996-1999 Derek B. Noonburg"
+#define xpdfCopyright "Copyright 1996-2000 Derek B. Noonburg"
 
 // default paper size (in points) for PostScript output
 #ifdef A4_PAPER
@@ -52,6 +52,24 @@
 // number of Type 1 (t1lib) fonts to cache
 #define t1FontCacheSize 32
 
+// number of TrueType (FreeType) fonts to cache
+#define ttFontCacheSize 32
+
+//------------------------------------------------------------------------
+// popen
+//------------------------------------------------------------------------
+
+#ifdef _MSC_VER
+#define popen _popen
+#define pclose _pclose
+#endif
+
+#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(WIN32) || defined(__DJGPP__) || defined(__CYGWIN32) || defined(MACOS)
+#define POPEN_READ_MODE "rb"
+#else
+#define POPEN_READ_MODE "r"
+#endif
+
 //------------------------------------------------------------------------
 // uncompress program
 //------------------------------------------------------------------------
@@ -84,10 +102,11 @@
 // Win32 stuff
 //------------------------------------------------------------------------
 
-#ifdef WIN32
 #ifdef CDECL
 #undef CDECL
 #endif
+
+#ifdef _MSC_VER
 #define CDECL __cdecl
 #else
 #define CDECL