[poppler] 2 commits - utils/pdftotext.cc

Thu Aug 8 11:47:16 PDT 2013

utils/pdftotext.cc |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

New commits:
commit b8b5773386ee4f57e72c2b867421cdff8a2eab5a
Merge: 5f9d385 62d079b
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Aug 8 20:47:05 2013 +0200

    Merge remote-tracking branch 'origin/poppler-0.24'

commit 62d079b40a2f816f59cc533b1624ea57458331f3
Author: Yury G. Kudryashov <urkud.urkud at gmail.com>
Date:   Thu Aug 8 20:45:08 2013 +0200

    Fix `pdftotext -bbox in.pdf -`
    
    Print body text to stdout if invoked as above.
    
    Bug #45163

diff --git a/utils/pdftotext.cc b/utils/pdftotext.cc
index a170f1b..3b8b69f 100644
--- a/utils/pdftotext.cc
+++ b/utils/pdftotext.cc
@@ -22,6 +22,7 @@
 // Copyright (C) 2010 Kenneth Berland <ken at hero.com>
 // Copyright (C) 2011 Tom Gleason <tom at buildadam.com>
 // Copyright (C) 2011 Steven Murdoch <Steven.Murdoch at cl.cam.ac.uk>
+// Copyright (C) 2013 Yury G. Kudryashov <urkud.urkud at gmail.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -331,21 +332,17 @@ int main(int argc, char *argv[]) {
     info.free();
     fputs("</head>\n", f);
     fputs("<body>\n", f);
-    if (!bbox) fputs("<pre>\n", f);
-    if (f != stdout) {
-      fclose(f);
+    if (!bbox) {
+      fputs("<pre>\n", f);
+      if (f != stdout) {
+	fclose(f);
+      }
     }
   }
 
   // write text file
   if (bbox) {
     textOut = new TextOutputDev(NULL, physLayout, fixedPitch, rawOrder, htmlMeta);
-    if (!(f = fopen(textFileName->getCString(), "ab"))) {
-      error(errIO, -1, "Couldn't open text file '{0:t}' for append", textFileName);
-      exitCode = 2;
-      delete textOut;
-      goto err3;
-    }
 
     if (textOut->isOk()) {
       fprintf(f, "<doc>\n");
