Commit 391b5d5c authored by Albert Astals Cid's avatar Albert Astals Cid

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
parent d14fb151
......@@ -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"
//------------------------------------------------------------------------
......
......@@ -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"
//------------------------------------------------------------------------
......
......@@ -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) {
......
......@@ -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"
//------------------------------------------------------------------------
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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) {
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment