Painful merge.

Painful merge.

I merged the latest release into the CVS.

This version supports the regular xpdf or gpdf if the GNOME libraries
are found.

Miguel.

1 files changed, 11 insertions, 4 deletions

diff --git a/pdf/xpdf/pdfinfo.cc b/pdf/xpdf/pdfinfo.cc
index fae8a18..2c183c8 100644
--- a/pdf/xpdf/pdfinfo.cc
+++ b/pdf/xpdf/pdfinfo.cc
@@ -106,16 +106,23 @@ int main(int argc, char *argv[]) {
   // print page count
   printf("Pages:        %d\n", doc->getNumPages());
 
-  // print encrypted flag
-  printf("Encrypted:    %s\n", doc->isEncrypted() ? "yes" : "no");
+  // print encryption info
+  printf("Encrypted:    ");
+  if (doc->isEncrypted()) {
+    printf("yes (print:%s copy:%s)\n",
+	   doc->okToPrint() ? "yes" : "no",
+	   doc->okToCopy() ? "yes" : "no");
+  } else {
+    printf("no\n");
+  }
 
   // clean up
   delete doc;
   freeParams();
 
   // check for memory leaks
-  Object::memCheck(errFile);
-  gMemReport(errFile);
+  Object::memCheck(stderr);
+  gMemReport(stderr);
 
   return 0;
 }