[poppler] Branch 'poppler-0.8' - 2 commits - poppler/ArthurOutputDev.cc qt4/src

[Pino Toscano]

 poppler/ArthurOutputDev.cc          |    5 +++++
 qt4/src/poppler-converter-private.h |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 3674ccd6884713ba6ed0cda882c8ba44fe374b5c
Author: Pino Toscano <pino at kde.org>
Date:   Sun Apr 20 18:32:59 2008 +0200

    the dtor should be virtual
    (cherry pick backport of commit 6c248bdad77235a45402d9693a0b822cc208b6b9)

diff --git a/qt4/src/poppler-converter-private.h b/qt4/src/poppler-converter-private.h
index 051d9eb..84ae4d3 100644
--- a/qt4/src/poppler-converter-private.h
+++ b/qt4/src/poppler-converter-private.h
@@ -32,7 +32,7 @@ class BaseConverterPrivate
 {
 	public:
 		BaseConverterPrivate();
-		~BaseConverterPrivate();
+		virtual ~BaseConverterPrivate();
 
 		QIODevice* openDevice();
 		void closeDevice();
commit af60f571ae19903269ede3b72f54bff44fbf36ce
Author: Pino Toscano <pino at kde.org>
Date:   Sun Apr 6 11:43:49 2008 +0200

    propetly initialise a couple of members; leak less
    (cherry pick backport of commit fc24500ddd9182f97d23c46eaafc6be79a6721eb)

diff --git a/poppler/ArthurOutputDev.cc b/poppler/ArthurOutputDev.cc
index ff5a77a..1c0728c 100644
--- a/poppler/ArthurOutputDev.cc
+++ b/poppler/ArthurOutputDev.cc
@@ -71,10 +71,13 @@ ArthurOutputDev::ArthurOutputDev(QPainter *painter):
 {
   m_currentBrush = QBrush(Qt::SolidPattern);
   m_fontEngine = 0;
+  m_font = 0;
+  m_image = 0;
 }
 
 ArthurOutputDev::~ArthurOutputDev()
 {
+  delete m_fontEngine;
 }
 
 void ArthurOutputDev::startDoc(XRef *xrefA) {
@@ -740,6 +743,8 @@ void ArthurOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
 
   m_painter->setMatrix(matrix, true);
   m_painter->drawImage( QPoint(0,0), *m_image );
+  delete m_image;
+  m_image = 0;
   free (buffer);
   delete imgStr;