[poppler] msvc/poppler poppler-config.h.cmake poppler/poppler-config.h.in poppler/PSOutputDev.cc utils/pdffonts.cc utils/pdfimages.cc utils/pdfinfo.cc utils/pdftohtml.cc utils/pdftoppm.cc utils/pdftops.cc utils/pdftotext.cc
Albert Astals Cid
aacid at kemper.freedesktop.org
Fri Aug 1 14:37:03 PDT 2008
msvc/poppler/poppler-config.h | 9 +--------
poppler-config.h.cmake | 9 +--------
poppler/PSOutputDev.cc | 2 +-
poppler/poppler-config.h.in | 9 +--------
utils/pdffonts.cc | 3 ++-
utils/pdfimages.cc | 3 ++-
utils/pdfinfo.cc | 3 ++-
utils/pdftohtml.cc | 3 ++-
utils/pdftoppm.cc | 3 ++-
utils/pdftops.cc | 3 ++-
utils/pdftotext.cc | 3 ++-
11 files changed, 18 insertions(+), 32 deletions(-)
New commits:
commit 391b5d5cdd9f63fe90229f88cdad628fb63c0206
Author: Albert Astals Cid <aacid at kde.org>
Date: Fri Aug 1 23:36:09 2008 +0200
Get rid of more defines, say our version on command line tools, also say our copyright
Did not modify PSOutputDev.cc output as PS is too fragile
diff --git a/msvc/poppler/poppler-config.h b/msvc/poppler/poppler-config.h
index 699a495..4a34b75 100644
--- a/msvc/poppler/poppler-config.h
+++ b/msvc/poppler/poppler-config.h
@@ -31,19 +31,12 @@
// version
//------------------------------------------------------------------------
-// xpdf version
-#define xpdfVersion "3.00"
-#define xpdfVersionNum 3.00
-#define xpdfMajorVersion 3
-#define xpdfMinorVersion 0
-#define xpdfMajorVersionStr "3"
-#define xpdfMinorVersionStr "0"
-
// supported PDF version
#define supportedPDFVersionStr "1.5"
#define supportedPDFVersionNum 1.5
// copyright notice
+#define popplerCopyright "Copyright 2005-2008 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC"
//------------------------------------------------------------------------
diff --git a/poppler-config.h.cmake b/poppler-config.h.cmake
index cb55bbd..4932f74 100644
--- a/poppler-config.h.cmake
+++ b/poppler-config.h.cmake
@@ -46,19 +46,12 @@
// version
//------------------------------------------------------------------------
-// xpdf version
-#define xpdfVersion "3.00"
-#define xpdfVersionNum 3.00
-#define xpdfMajorVersion 3
-#define xpdfMinorVersion 0
-#define xpdfMajorVersionStr "3"
-#define xpdfMinorVersionStr "0"
-
// supported PDF version
#define supportedPDFVersionStr "1.5"
#define supportedPDFVersionNum 1.5
// copyright notice
+#define popplerCopyright "Copyright 2005-2008 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC"
//------------------------------------------------------------------------
diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
index 6148acd..46224df 100644
--- a/poppler/PSOutputDev.cc
+++ b/poppler/PSOutputDev.cc
@@ -1330,7 +1330,7 @@ void PSOutputDev::writeXpdfProcset() {
char **p;
char *q;
- writePSFmt("%%BeginResource: procset xpdf {0:s} 0\n", xpdfVersion);
+ writePSFmt("%%BeginResource: procset xpdf {0:s} 0\n", "3.00");
writePSFmt("%%Copyright: {0:s}\n", xpdfCopyright);
lev1 = lev2 = lev3 = sep = nonSep = gTrue;
for (p = prolog; *p; ++p) {
diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
index 337a3b3..7a12751 100644
--- a/poppler/poppler-config.h.in
+++ b/poppler/poppler-config.h.in
@@ -46,19 +46,12 @@
// version
//------------------------------------------------------------------------
-// xpdf version
-#define xpdfVersion "3.00"
-#define xpdfVersionNum 3.00
-#define xpdfMajorVersion 3
-#define xpdfMinorVersion 0
-#define xpdfMajorVersionStr "3"
-#define xpdfMinorVersionStr "0"
-
// supported PDF version
#define supportedPDFVersionStr "1.5"
#define supportedPDFVersionNum 1.5
// copyright notice
+#define popplerCopyright "Copyright 2005-2008 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC"
//------------------------------------------------------------------------
diff --git a/utils/pdffonts.cc b/utils/pdffonts.cc
index 7691d7e..39fcf24 100644
--- a/utils/pdffonts.cc
+++ b/utils/pdffonts.cc
@@ -92,7 +92,8 @@ int main(int argc, char *argv[]) {
// parse args
ok = parseArgs(argDesc, &argc, argv);
if (!ok || argc != 2 || printVersion || printHelp) {
- fprintf(stderr, "pdffonts version %s\n", xpdfVersion);
+ fprintf(stderr, "pdffonts version %s\n", PACKAGE_VERSION);
+ fprintf(stderr, "%s\n", popplerCopyright);
fprintf(stderr, "%s\n", xpdfCopyright);
if (!printVersion) {
printUsage("pdffonts", "<PDF-file>", argDesc);
diff --git a/utils/pdfimages.cc b/utils/pdfimages.cc
index febbdea..3d5ac8d 100644
--- a/utils/pdfimages.cc
+++ b/utils/pdfimages.cc
@@ -78,7 +78,8 @@ int main(int argc, char *argv[]) {
// parse args
ok = parseArgs(argDesc, &argc, argv);
if (!ok || argc != 3 || printVersion || printHelp) {
- fprintf(stderr, "pdfimages version %s\n", xpdfVersion);
+ fprintf(stderr, "pdfimages version %s\n", PACKAGE_VERSION);
+ fprintf(stderr, "%s\n", popplerCopyright);
fprintf(stderr, "%s\n", xpdfCopyright);
if (!printVersion) {
printUsage("pdfimages", "<PDF-file> <image-root>", argDesc);
diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc
index 71ce3a8..9e924fd 100644
--- a/utils/pdfinfo.cc
+++ b/utils/pdfinfo.cc
@@ -99,7 +99,8 @@ int main(int argc, char *argv[]) {
// parse args
ok = parseArgs(argDesc, &argc, argv);
if (!ok || (argc != 2 && !printEnc) || printVersion || printHelp) {
- fprintf(stderr, "pdfinfo version %s\n", xpdfVersion);
+ fprintf(stderr, "pdfinfo version %s\n", PACKAGE_VERSION);
+ fprintf(stderr, "%s\n", popplerCopyright);
fprintf(stderr, "%s\n", xpdfCopyright);
if (!printVersion) {
printUsage("pdfinfo", "<PDF-file>", argDesc);
diff --git a/utils/pdftohtml.cc b/utils/pdftohtml.cc
index 392f336..6a78366 100644
--- a/utils/pdftohtml.cc
+++ b/utils/pdftohtml.cc
@@ -130,7 +130,8 @@ int main(int argc, char *argv[]) {
// parse args
ok = parseArgs(argDesc, &argc, argv);
if (!ok || argc < 2 || argc > 3 || printHelp || printVersion) {
- fprintf(stderr, "pdftohtml version %s http://pdftohtml.sourceforge.net/, based on Xpdf version %s\n", "0.36", xpdfVersion);
+ fprintf(stderr, "pdftohtml version %s\n", PACKAGE_VERSION);
+ fprintf(stderr, "%s\n", popplerCopyright);
fprintf(stderr, "%s\n", "Copyright 1999-2003 Gueorgui Ovtcharov and Rainer Dorsch");
fprintf(stderr, "%s\n\n", xpdfCopyright);
if (!printVersion) {
diff --git a/utils/pdftoppm.cc b/utils/pdftoppm.cc
index 4d32e6b..34602f7 100644
--- a/utils/pdftoppm.cc
+++ b/utils/pdftoppm.cc
@@ -142,7 +142,8 @@ int main(int argc, char *argv[]) {
ok = gFalse;
}
if (!ok || argc > 3 || printVersion || printHelp) {
- fprintf(stderr, "pdftoppm version %s\n", xpdfVersion);
+ fprintf(stderr, "pdftoppm version %s\n", PACKAGE_VERSION);
+ fprintf(stderr, "%s\n", popplerCopyright);
fprintf(stderr, "%s\n", xpdfCopyright);
if (!printVersion) {
printUsage("pdftoppm", "[PDF-file [PPM-file-prefix]]", argDesc);
diff --git a/utils/pdftops.cc b/utils/pdftops.cc
index 69562a2..a1af9aa 100644
--- a/utils/pdftops.cc
+++ b/utils/pdftops.cc
@@ -170,7 +170,8 @@ int main(int argc, char *argv[]) {
// parse args
ok = parseArgs(argDesc, &argc, argv);
if (!ok || argc < 2 || argc > 3 || printVersion || printHelp) {
- fprintf(stderr, "pdftops version %s\n", xpdfVersion);
+ fprintf(stderr, "pdftops version %s\n", PACKAGE_VERSION);
+ fprintf(stderr, "%s\n", popplerCopyright);
fprintf(stderr, "%s\n", xpdfCopyright);
if (!printVersion) {
printUsage("pdftops", "<PDF-file> [<PS-file>]", argDesc);
diff --git a/utils/pdftotext.cc b/utils/pdftotext.cc
index b6f885b..6731b9b 100644
--- a/utils/pdftotext.cc
+++ b/utils/pdftotext.cc
@@ -107,7 +107,8 @@ int main(int argc, char *argv[]) {
// parse args
ok = parseArgs(argDesc, &argc, argv);
if (!ok || (argc < 2 && !printEnc) || argc > 3 || printVersion || printHelp) {
- fprintf(stderr, "pdftotext version %s\n", xpdfVersion);
+ fprintf(stderr, "pdftotext version %s\n", PACKAGE_VERSION);
+ fprintf(stderr, "%s\n", popplerCopyright);
fprintf(stderr, "%s\n", xpdfCopyright);
if (!printVersion) {
printUsage("pdftotext", "<PDF-file> [<text-file>]", argDesc);
More information about the poppler
mailing list