From e59ac4ca1977976acaf7918ff0332b42e541cda0 Mon Sep 17 00:00:00 2001
From: Claudio Valerio <claudio@sente.ch>
Date: Thu, 1 Sep 2011 10:35:00 +0200
Subject: [PATCH] fixed crash after pdf import

---
 src/pdf/XPDFRenderer.cpp | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/src/pdf/XPDFRenderer.cpp b/src/pdf/XPDFRenderer.cpp
index 6dce6d3d..c77113fd 100644
--- a/src/pdf/XPDFRenderer.cpp
+++ b/src/pdf/XPDFRenderer.cpp
@@ -40,7 +40,6 @@ XPDFRenderer::XPDFRenderer(const QString &filename, bool importingFile)
     mDocument = new PDFDoc(new GString(filename.toUtf8().data()), 0, 0, 0); // the filename GString is deleted on PDFDoc desctruction
     sInstancesCount.ref();
     bThumbGenerated = !importingFile;
-    bPagesGenerated = false;
     mPagesMap.clear();
     mThumbs.clear();
     mThumbMap.clear();
@@ -154,7 +153,6 @@ void XPDFRenderer::render(QPainter *p, int pageNumber, const QRectF &bounds)
         qreal xscale = p->worldTransform().m11();
         qreal yscale = p->worldTransform().m22();
         bool bZoomChanged = false;
-        bool bFirstThumbnail = false;
 
         if(fabs(mScaleX - xscale) > 0.1 || fabs(mScaleY - yscale) > 0.1)
         {
@@ -163,51 +161,36 @@ void XPDFRenderer::render(QPainter *p, int pageNumber, const QRectF &bounds)
             bZoomChanged = true;
         }
 
+        QImage *pdfImage;
+
         // First verify if the thumbnails and the pages are generated
         if(!bThumbGenerated)
         {
-            if(pageNumber == 1)
-            {
-                bFirstThumbnail = true;
-            }
-
             if(!mThumbMap[pageNumber - 1])
             {
-
                 // Generate the thumbnail
                 mThumbs << createPDFImage(pageNumber, xscale, yscale, bounds);
                 mThumbMap[pageNumber - 1] = true;
+                pdfImage = mThumbs.at(pageNumber - 1);
                 if(pageNumber == mDocument->getNumPages())
                 {
                     bThumbGenerated = true;
                 }
             }
         }
-        else if(!bPagesGenerated || bZoomChanged)
+        else
         {
             if(!mPagesMap[pageNumber - 1] || bZoomChanged)
             {
                 // Generate the page
+                if (mPagesMap[pageNumber - 1])
+                    delete mNumPageToPageMap[pageNumber];
                 mNumPageToPageMap[pageNumber] = createPDFImage(pageNumber, xscale, yscale, bounds);
                 mPagesMap[pageNumber - 1] = true;
-                if(mPagesMap.size() == mDocument->getNumPages())
-                {
-                    bPagesGenerated = true;
-                }
+                pdfImage = mNumPageToPageMap[pageNumber];
             }
         }
 
-        QImage *pdfImage;
-
-        if(!bThumbGenerated || bFirstThumbnail)
-        {
-            pdfImage = mThumbs.at(pageNumber - 1);
-        }
-        else
-        {
-            pdfImage = mNumPageToPageMap[pageNumber];
-        }
-
         QTransform savedTransform = p->worldTransform();
         p->resetTransform();
         p->drawImage(QPointF(savedTransform.dx() + mSliceX, savedTransform.dy() + mSliceY), *pdfImage);