From fcf7e9aa4e6a41eed81c0b3d221fc7f0d40915e3 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 30 Jan 2007 12:50:45 +0000 Subject: [PATCH] waiting for a refactory, use or destroy the object rects created in the generation thread svn path=/trunk/playground/graphics/okular/; revision=628577 --- generators/poppler/generator_pdf.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp index 17ac6a404..28b8fedd1 100644 --- a/generators/poppler/generator_pdf.cpp +++ b/generators/poppler/generator_pdf.cpp @@ -1338,7 +1338,10 @@ void PDFGenerator::threadFinished() qDeleteAll(outText); } bool genObjectRects = request->id() & (PAGEVIEW_ID | PRESENTATION_ID); - if (genObjectRects) request->page()->setObjectRects( outRects ); + if (genObjectRects) + request->page()->setObjectRects( outRects ); + else + qDeleteAll( outRects ); // 3. tell generator that data has been taken generatorThread->endGeneration(); @@ -1458,7 +1461,9 @@ QList PDFPixmapGeneratorThread::takeText() QLinkedList< Okular::ObjectRect * > PDFPixmapGeneratorThread::takeObjectRects() const { d->m_rectsTaken = true; - return d->m_rects; + QLinkedList< Okular::ObjectRect * > newrects = d->m_rects; + d->m_rects.clear(); + return newrects; } void PDFPixmapGeneratorThread::run()