[poppler] 2 commits - poppler/Catalog.cc qt4/demos

[Albert Astals Cid]

 poppler/Catalog.cc   |    8 ++++----
 qt4/demos/viewer.cpp |    1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 8df7d83439f0e9ab200840f912f1c08bbf44bd6e
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Nov 5 20:49:01 2008 +0100

    [Qt4Demo] Fix leak

diff --git a/qt4/demos/viewer.cpp b/qt4/demos/viewer.cpp
index e1f1d73..64fb187 100644
--- a/qt4/demos/viewer.cpp
+++ b/qt4/demos/viewer.cpp
@@ -236,6 +236,7 @@ void PdfViewer::slotSaveCopy()
         QMessageBox msgbox(QMessageBox::Critical, tr("Save Error"), tr("Cannot export to:\n%1").arg(fileName),
                            QMessageBox::Ok, this);
     }
+    delete converter;
 }
 
 void PdfViewer::slotAbout()
commit d3c424e0362f53bda5c4e2e415823d78ace76253
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Nov 5 20:14:17 2008 +0100

    Rename i to j so that code is more clear by not shadowing the function parameter

diff --git a/poppler/Catalog.cc b/poppler/Catalog.cc
index 4d29dc9..c5d473f 100644
--- a/poppler/Catalog.cc
+++ b/poppler/Catalog.cc
@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Kristian Høgsberg <krh at redhat.com>
-// Copyright (C) 2005-2007 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005-2008 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2005 Jeff Muizelaar <jrmuizel at nit.ca>
 // Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
 // Copyright (C) 2005 Marco Pesenti Gritti <mpg at redhat.com>
@@ -458,9 +458,9 @@ GooString *Catalog::getJS(int i)
     Stream *stream = obj2.getStream();
     js = new GooString();
     stream->reset();
-    int i;
-    while ((i = stream->getChar()) != EOF) {
-      js->append((char)i);
+    int j;
+    while ((j = stream->getChar()) != EOF) {
+      js->append((char)j);
     }
   }
   obj2.free();