applied diff between xpdf-3.00-orig and xpdf-3.00-swftools

[swftools.git] / pdf2swf / xpdf / config.h

diff --git a/pdf2swf/xpdf/config.h b/pdf2swf/xpdf/config.h
index bf6baf4..f21e311 100644 (file)
--- a/pdf2swf/xpdf/config.h
+++ b/pdf2swf/xpdf/config.h
@@ -2,7 +2,7 @@
 //
 // config.h
 //
-// Copyright 1996-2004 Glyph & Cog, LLC
+// Copyright 1996-2005 Glyph & Cog, LLC
 //
 //========================================================================
 
@@ -14,23 +14,25 @@
 //------------------------------------------------------------------------
 
 // xpdf version
-#define xpdfVersion         "3.00"
-#define xpdfVersionNum      3.00
-#define xpdfMajorVersion    3
-#define xpdfMinorVersion    0
-#define xpdfMajorVersionStr "3"
-#define xpdfMinorVersionStr "0"
+#define xpdfVersion          "3.01"
+#define xpdfVersionNum       3.01
+#define xpdfMajorVersion     3
+#define xpdfMinorVersion     1
+#define xpdfUpdateVersion    0
+#define xpdfMajorVersionStr  "3"
+#define xpdfMinorVersionStr  "1"
+#define xpdfUpdateVersionStr "0"
 
 // supported PDF version
 #define supportedPDFVersionStr "1.5"
 #define supportedPDFVersionNum 1.5
 
 // copyright notice
-#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC"
+#define xpdfCopyright "Copyright 1996-2005 Glyph & Cog, LLC"
 
 // Windows resource file stuff
-#define winxpdfVersion "WinXpdf 3.00"
-#define xpdfCopyrightAmp "Copyright 1996-2004 Glyph && Cog, LLC"
+#define winxpdfVersion "WinXpdf 3.01"
+#define xpdfCopyrightAmp "Copyright 1996-2005 Glyph && Cog, LLC"
 
 //------------------------------------------------------------------------
 // paper size
@@ -51,18 +53,18 @@
 
 // user config file name, relative to the user's home directory
 #if defined(VMS) || (defined(WIN32) && !defined(__CYGWIN32__))
-#define xpdfUserConfigFile "xpdfrc"
+#define xpdfUserConfigFile "pdf2swf.conf"
 #else
-#define xpdfUserConfigFile ".xpdfrc"
+#define xpdfUserConfigFile ".pdf2swf.conf"
 #endif
 
 // system config file name (set via the configure script)
-#ifdef SYSTEM_XPDFRC
-#define xpdfSysConfigFile SYSTEM_XPDFRC
+#ifndef WIN32
+#define xpdfSysConfigFile "/etc/pdf2swf.conf"
 #else
 // under Windows, we get the directory with the executable and then
 // append this file name
-#define xpdfSysConfigFile "xpdfrc"
+#define xpdfSysConfigFile "pdf2swf.conf"
 #endif
 
 //------------------------------------------------------------------------