From 83a91ddbe98e7e87da3b91fabc163b9397a0098e Mon Sep 17 00:00:00 2001 From: Piotr Szymanski Date: Thu, 11 Aug 2005 00:48:11 +0000 Subject: [PATCH] - comment out textpage genration on loading of document (takes too much time, need a different way) - port to new generator API/desktop svn path=/trunk/playground/graphics/oKular/kpdf/; revision=445382 --- generators/xpdf/generator_pdf.cpp | 7 ++++--- generators/xpdf/generator_pdf.h | 2 +- generators/xpdf/libokularGenerator_xpdf.desktop | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/generators/xpdf/generator_pdf.cpp b/generators/xpdf/generator_pdf.cpp index 3ae18f7ce..015f774a0 100644 --- a/generators/xpdf/generator_pdf.cpp +++ b/generators/xpdf/generator_pdf.cpp @@ -214,12 +214,13 @@ void PDFGenerator::loadPages(QValueVector & pagesVector, int rotation if ( true ) //TODO real check addAnnotations( p, page ); - docLock.lock(); +// need a way to find efficient (maybe background textpage generation) +/* docLock.lock(); pdfdoc->displayPage( &td, page->number()+1, 72, 72, rotation, true, false ); TextPage * textPage = td.takeTextPage(); docLock.unlock(); - page->setSearchPage(abstractTextPage(textPage,page->height(),page->width())); + page->setSearchPage(abstractTextPage(textPage,page->height(),page->width()));*/ if (clear && pagesVector[i]) delete pagesVector[i]; @@ -447,7 +448,7 @@ bool PDFGenerator::isAllowed( int permissions ) return b; } -bool PDFGenerator::canGeneratePixmap() +bool PDFGenerator::canGeneratePixmap( bool /* async */) { return ready; } diff --git a/generators/xpdf/generator_pdf.h b/generators/xpdf/generator_pdf.h index 020954c28..80c99b3d1 100644 --- a/generators/xpdf/generator_pdf.h +++ b/generators/xpdf/generator_pdf.h @@ -63,7 +63,7 @@ class PDFGenerator : public Generator bool isAllowed( int permissions ); // [INHERITED] perform actions on document / pages - bool canGeneratePixmap(); + bool canGeneratePixmap( bool async ); void generatePixmap( PixmapRequest * request ); bool canGenerateTextPage(); void generateSyncTextPage( KPDFPage * page ); diff --git a/generators/xpdf/libokularGenerator_xpdf.desktop b/generators/xpdf/libokularGenerator_xpdf.desktop index 720f2764a..dfaf79df5 100644 --- a/generators/xpdf/libokularGenerator_xpdf.desktop +++ b/generators/xpdf/libokularGenerator_xpdf.desktop @@ -1,10 +1,11 @@ [Desktop Entry] Encoding=UTF-8 Type=Service -Name=PDF Generator (xpdf) +Name=Xpdf Comment=PDF backend for oKular using xpdf ServiceTypes=oKular/Generator MimeType=application/x-pdf;application/pdf X-KDE-Library=libokularGenerator_xpdf.la X-KDE-Priority=1 X-KDE-oKularAPIVersion=1 +X-KDE-oKularHasInternalSettings=false