diff options
author | Martin Kretzschmar <mkretzschmar@src.gnome.org> | 2002-09-18 22:20:42 (GMT) |
---|---|---|
committer | Martin Kretzschmar <mkretzschmar@src.gnome.org> | 2002-09-18 22:20:42 (GMT) |
commit | 2a393c134fe3fe8eb85bf818cb7ad6ae4396322a (patch) | |
tree | eba8b0dcaba42d799ed8313faee15fb74a5a0cd2 /pdf/xpdf/pdfimages.cc | |
parent | 7aac8dc8533347e21311b15186e0af82f1b22fd6 (diff) |
Synched with Xpdf 1.01
Diffstat (limited to 'pdf/xpdf/pdfimages.cc')
-rw-r--r-- | pdf/xpdf/pdfimages.cc | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/pdf/xpdf/pdfimages.cc b/pdf/xpdf/pdfimages.cc index cd218ff..898ad00 100644 --- a/pdf/xpdf/pdfimages.cc +++ b/pdf/xpdf/pdfimages.cc @@ -2,10 +2,11 @@ // // pdfimages.cc // -// Copyright 1998 Derek B. Noonburg +// Copyright 1998-2002 Glyph & Cog, LLC // //======================================================================== +#include <aconf.h> #include <stdio.h> #include <stdlib.h> #include <stddef.h> @@ -13,6 +14,7 @@ #include "parseargs.h" #include "GString.h" #include "gmem.h" +#include "GlobalParams.h" #include "Object.h" #include "Stream.h" #include "Array.h" @@ -22,14 +24,16 @@ #include "Page.h" #include "PDFDoc.h" #include "ImageOutputDev.h" -#include "Params.h" #include "Error.h" #include "config.h" static int firstPage = 1; static int lastPage = 0; static GBool dumpJPEG = gFalse; +static char ownerPassword[33] = ""; static char userPassword[33] = ""; +static GBool quiet = gFalse; +static char cfgFileName[256] = ""; static GBool printVersion = gFalse; static GBool printHelp = gFalse; @@ -40,16 +44,24 @@ static ArgDesc argDesc[] = { "last page to convert"}, {"-j", argFlag, &dumpJPEG, 0, "write JPEG images as JPEG files"}, + {"-opw", argString, ownerPassword, sizeof(ownerPassword), + "owner password (for encrypted files)"}, {"-upw", argString, userPassword, sizeof(userPassword), "user password (for encrypted files)"}, - {"-q", argFlag, &errQuiet, 0, + {"-q", argFlag, &quiet, 0, "don't print any messages or errors"}, + {"-cfg", argString, cfgFileName, sizeof(cfgFileName), + "configuration file to use in place of .xpdfrc"}, {"-v", argFlag, &printVersion, 0, "print copyright and version info"}, {"-h", argFlag, &printHelp, 0, "print usage information"}, {"-help", argFlag, &printHelp, 0, "print usage information"}, + {"--help", argFlag, &printHelp, 0, + "print usage information"}, + {"-?", argFlag, &printHelp, 0, + "print usage information"}, {NULL} }; @@ -57,7 +69,7 @@ int main(int argc, char *argv[]) { PDFDoc *doc; GString *fileName; char *imgRoot; - GString *userPW; + GString *ownerPW, *userPW; ImageOutputDev *imgOut; GBool ok; @@ -74,23 +86,30 @@ int main(int argc, char *argv[]) { fileName = new GString(argv[1]); imgRoot = argv[2]; - // init error file - errorInit(); - // read config file - initParams(xpdfConfigFile); + globalParams = new GlobalParams(cfgFileName); + if (quiet) { + globalParams->setErrQuiet(quiet); + } // open PDF file - xref = NULL; + if (ownerPassword[0]) { + ownerPW = new GString(ownerPassword); + } else { + ownerPW = NULL; + } if (userPassword[0]) { userPW = new GString(userPassword); } else { userPW = NULL; } - doc = new PDFDoc(fileName, userPW); + doc = new PDFDoc(fileName, ownerPW, userPW); if (userPW) { delete userPW; } + if (ownerPW) { + delete ownerPW; + } if (!doc->isOk()) { goto err; } @@ -116,7 +135,7 @@ int main(int argc, char *argv[]) { // clean up err: delete doc; - freeParams(); + delete globalParams; // check for memory leaks Object::memCheck(stderr); |