Imported Xpdf 2.03 and fixed build.

[evince.git] / pdf / xpdf / pdftops.cc

diff --git a/pdf/xpdf/pdftops.cc b/pdf/xpdf/pdftops.cc
index 2bb2e3b284f0cb30b0975f928cf687a593768966..247e45506c08b13bd612e8b2c27f15777849a758 100644 (file)
--- a/pdf/xpdf/pdftops.cc
+++ b/pdf/xpdf/pdftops.cc
@@ -48,8 +48,8 @@ static char paperSize[15] = "";
 static int paperWidth = 0;
 static int paperHeight = 0;
 static GBool duplex = gFalse;
-static char ownerPassword[33] = "";
-static char userPassword[33] = "";
+static char ownerPassword[33] = "\001";
+static char userPassword[33] = "\001";
 static GBool quiet = gFalse;
 static char cfgFileName[256] = "";
 static GBool printVersion = gFalse;
@@ -220,12 +220,12 @@ int main(int argc, char *argv[]) {
   }
 
   // open PDF file
-  if (ownerPassword[0]) {
+  if (ownerPassword[0] != '\001') {
     ownerPW = new GString(ownerPassword);
   } else {
     ownerPW = NULL;
   }
-  if (userPassword[0]) {
+  if (userPassword[0] != '\001') {
     userPW = new GString(userPassword);
   } else {
     userPW = NULL;
@@ -281,7 +281,7 @@ int main(int argc, char *argv[]) {
   psOut = new PSOutputDev(psFileName->getCString(), doc->getXRef(),
                          doc->getCatalog(), firstPage, lastPage, mode);
   if (psOut->isOk()) {
-    doc->displayPages(psOut, firstPage, lastPage, 72, 0, gFalse);
+    doc->displayPages(psOut, firstPage, lastPage, 72, 72, 0, gFalse);
   } else {
     delete psOut;
     exitCode = 2;