[poppler] 3 commits - qt4/src utils/pdftotext.cc

[Albert Astals Cid]

 qt4/src/poppler-qt4.h |    2 +-
 utils/pdftotext.cc    |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8a1740b0b6ee4b217ecbe9d0046e4afa491e9f17
Merge: b27588c c3f953d
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Aug 12 22:47:44 2013 +0200

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

commit c3f953dc87f83ac726f99cb8f1f959c486098391
Author: Yury G. Kudryashov <urkud.urkud at gmail.com>
Date:   Sat Aug 10 21:43:57 2013 +0300

    Fix a typo

diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
index 1e3efca..72874ec 100644
--- a/qt4/src/poppler-qt4.h
+++ b/qt4/src/poppler-qt4.h
@@ -103,7 +103,7 @@ namespace Poppler {
     public:
       /**
 	 The default constructor sets the \p text and the rectangle that
-	 contains the text. Coordinated for the \p bBox are in points =
+	 contains the text. Coordinates for the \p bBox are in points =
 	 1/72 of an inch.
       */
       TextBox(const QString& text, const QRectF &bBox);
commit b27588c4c946ef4f9a62248fbead4dffcb60b4d1
Author: Yury G. Kudryashov <urkud.urkud at gmail.com>
Date:   Mon Aug 12 22:42:13 2013 +0200

    Fix indentation

diff --git a/utils/pdftotext.cc b/utils/pdftotext.cc
index 3b8b69f..f7b2b0e 100644
--- a/utils/pdftotext.cc
+++ b/utils/pdftotext.cc
@@ -385,9 +385,9 @@ int main(int argc, char *argv[]) {
       }
 
     } else {
-    delete textOut;
-    exitCode = 2;
-    goto err3;
+      delete textOut;
+      exitCode = 2;
+      goto err3;
     }
   }
   delete textOut;