[poppler] 4 commits - poppler/CachedFile.cc utils/pdftohtml.cc utils/pdftops.cc utils/pdftotext.cc

[Albert Astals Cid]

 poppler/CachedFile.cc |    1 +
 utils/pdftohtml.cc    |    3 +++
 utils/pdftops.cc      |    3 +++
 utils/pdftotext.cc    |    3 +++
 4 files changed, 10 insertions(+)

New commits:
commit 84cd2186861436fbaa7c29aa691e69fcd543a1c2
Author: Hib Eris <hib at hiberis.nl>
Date:   Tue Apr 13 23:42:28 2010 +0200

    Properly initialize variable

diff --git a/poppler/CachedFile.cc b/poppler/CachedFile.cc
index 95cc58b..cc86c89 100644
--- a/poppler/CachedFile.cc
+++ b/poppler/CachedFile.cc
@@ -24,6 +24,7 @@ CachedFile::CachedFile(CachedFileLoader *cachedFileLoaderA, GooString *uriA)
 
   streamPos = 0;
   chunks = new GooVector<Chunk>();
+  length = 0;
 
   length = loader->init(uri, this);
   refCnt = 1;
commit 24f244f486f332b0bd76c6525c5d9d03168a76e6
Author: Hib Eris <hib at hiberis.nl>
Date:   Tue Apr 13 23:54:28 2010 +0200

    pdftops: require output filename when reading from stdin

diff --git a/utils/pdftops.cc b/utils/pdftops.cc
index 0376e2f..0bc43a1 100644
--- a/utils/pdftops.cc
+++ b/utils/pdftops.cc
@@ -330,6 +330,9 @@ int main(int argc, char *argv[]) {
   // construct PostScript file name
   if (argc == 3) {
     psFileName = new GooString(argv[2]);
+  } else if (fileName->cmp("fd://0") == 0) {
+    error(-1, "You have to provide an output filename when reading form stdin.");
+    goto err1;
   } else {
     p = fileName->getCString() + fileName->getLength() - 4;
     if (!strcmp(p, ".pdf") || !strcmp(p, ".PDF")) {
commit 955f9f53ff225f6794a494fdd0f0fe5ee1a41d88
Author: Hib Eris <hib at hiberis.nl>
Date:   Tue Apr 13 23:47:40 2010 +0200

    pdftotext: require output filename when reading from stdin

diff --git a/utils/pdftotext.cc b/utils/pdftotext.cc
index cee40fa..d4e004b 100644
--- a/utils/pdftotext.cc
+++ b/utils/pdftotext.cc
@@ -224,6 +224,9 @@ int main(int argc, char *argv[]) {
   // construct text file name
   if (argc == 3) {
     textFileName = new GooString(argv[2]);
+  } else if (fileName->cmp("fd://0") == 0) {
+     error(-1, "You have to provide an output filename when reading form stdin.");
+     goto err2;
   } else {
     p = fileName->getCString() + fileName->getLength() - 4;
     if (!strcmp(p, ".pdf") || !strcmp(p, ".PDF")) {
commit 31388aa8b5117619878431b7fed2d033000af541
Author: Hib Eris <hib at hiberis.nl>
Date:   Tue Apr 13 23:27:20 2010 +0200

    pdftohtml: require output filename when reading from stdin

diff --git a/utils/pdftohtml.cc b/utils/pdftohtml.cc
index 74733e7..0e0a376 100644
--- a/utils/pdftohtml.cc
+++ b/utils/pdftohtml.cc
@@ -231,6 +231,9 @@ int main(int argc, char *argv[]) {
       else htmlFileName =new GooString(tmp);
     
     delete tmp;
+  } else if (fileName->cmp("fd://0") == 0) {
+      error(-1, "You have to provide an output filename when reading form stdin.");
+      goto error;
   } else {
     p = fileName->getCString() + fileName->getLength() - 4;
     if (!strcmp(p, ".pdf") || !strcmp(p, ".PDF"))