1 files changed, 180 insertions, 98 deletions

diff --git a/src-qt5/desktop-utils/lumina-pdf/Renderer-mupdf.cpp b/src-qt5/desktop-utils/lumina-pdf/Renderer-mupdf.cpp
index 799f6584..23d9b3d1 100644
--- a/src-qt5/desktop-utils/lumina-pdf/Renderer-mupdf.cpp
+++ b/src-qt5/desktop-utils/lumina-pdf/Renderer-mupdf.cpp
@@ -1,152 +1,215 @@
 #include "Renderer.h"
 #include <QDateTime>
 #include <mupdf/fitz.h>
-//#include <pthread.h>
+#include <QMutex>
+#include <QFuture>
+#include <QtConcurrent>
+
+class Data {
+  public:
+    Data(int _pagenum, fz_context *_ctx, fz_display_list *_list, fz_rect _bbox, fz_pixmap *_pix, fz_matrix _ctm, double _sf) :
+      pagenumber(_pagenum),
+      ctx(_ctx),
+      list(_list),
+      bbox(_bbox),
+      pix(_pix),
+      ctm(_ctm),
+      sf(_sf)
+    { }
+
+    ~Data() { }
+
+    int pagenumber;
+    fz_context *ctx;
+    fz_display_list *list;
+    fz_rect bbox;
+    fz_pixmap *pix;
+    fz_matrix ctm;
+    QImage img;
+    QFuture<void> renderThread;
+    double sf;
+};
 
 fz_document *DOC;
 fz_context *CTX;
+QHash<int, Data*> dataHash;
+QMutex mutex[FZ_LOCK_MAX];
+fz_locks_context locks;
 
 inline QString getTextInfo(QString str) {
-	char infoBuff[1000];
-	int size = DOC->lookup_metadata(CTX, DOC, ("info:"+str).toLocal8Bit().data(), infoBuff, 1000);
+  char infoBuff[1000];
+  int size = DOC->lookup_metadata(CTX, DOC, ("info:"+str).toLocal8Bit().data(), infoBuff, 1000);
   if(size != -1){ return QString::fromLatin1(infoBuff); }
   return "";
 }
 
-/*void lock_mutex(void *user, int lock) {
-	pthread_mutex_t *mutex = (pthread_mutex_t *) user;
-	pthread_mutex_lock(&mutex[lock]);
+void lock_mutex(void *user, int lock) {
+  QMutex *mutex = (QMutex*) user;
+  mutex[lock].lock();
 }
 
 void unlock_mutex(void *user, int lock) {
-	pthread_mutex_t *mutex = (pthread_mutex_t *) user;
-	pthread_mutex_unlock(&mutex[lock]);
-}*/
+  QMutex *mutex = (QMutex*) user;
+  mutex[lock].unlock();
+}
 
 Renderer::Renderer(){
-	/*pthread_mutex_t mutex[FZ_LOCK_MAX];
-	fz_locks_context locks;
-	locks.user = mutex;
-	locks.lock = lock_mutex;
-	locks.unlock = unlock_mutex;
-
-	for (int i = 0; i < FZ_LOCK_MAX; i++)
-		pthread_mutex_init(&mutex[i], NULL);*/
+  locks.user = mutex;
+  locks.lock = lock_mutex;
+  locks.unlock = unlock_mutex;
 
-	mutex = new QMutex();
   DOC = 0;
-  //CTX = fz_new_context(NULL, &locks, FZ_STORE_UNLIMITED);
-  CTX = fz_new_context(NULL, NULL, FZ_STORE_UNLIMITED);
-	qDebug() << "Context created";
+  qDebug() << "Creating Context";
+  CTX = fz_new_context(NULL, &locks, FZ_STORE_UNLIMITED);
   needpass = false;
+  degrees = 0;
 }
 
 Renderer::~Renderer(){
-
+  qDebug() << "Calling destructor";
+  qDeleteAll(dataHash);
+  dataHash.clear();
+  fz_drop_document(CTX, DOC);
+  DOC = NULL;
+  fz_drop_context(CTX);
+  CTX = NULL;
 }
 
-//bool Renderer::loadMultiThread(){ return true; }
-
-QJsonObject Renderer::properties(){
-  QJsonObject jobj;
-  jobj.insert("title", getTextInfo("Title") );
-  jobj.insert("subject", getTextInfo("Subject") );
-  jobj.insert("author", getTextInfo("Author") );
-  jobj.insert("creator", getTextInfo("Creator") );
-  jobj.insert("producer", getTextInfo("Producer") );
-  jobj.insert("keywords", getTextInfo("Keywords") );
-  jobj.insert("dt_created", QDateTime::fromString( getTextInfo("CreationDate").left(16), "'D:'yyyyMMddHHmmss").toString() );
-  jobj.insert("dt_modified", QDateTime::fromString( getTextInfo("ModDate").left(16), "'D:'yyyyMMddHHmmss").toString() );
-  return jobj;
-}
+bool Renderer::loadMultiThread(){ return false; }
 
 bool Renderer::loadDocument(QString path, QString password){
-	//first time through
-  if(DOC==0){ 
-		fz_register_document_handlers(CTX); 
-		qDebug() << "Document handlers registered";
-	}else if(path!=docpath){
-    //fz_close_document(DOC);
-    //Clear out the old document first
-    delete DOC;
-    DOC=0;
-    needpass = false;
-		docpath = path;
-  }
+  //first time through
+  if(path != docpath) {
+    if(DOC != 0) {
+      qDebug() << "New document";
+      fz_drop_document(CTX, DOC);
+      DOC = NULL;
+      needpass = false;
+      docpath = path;
+    }else if(DOC==0){ 
+      fz_register_document_handlers(CTX); 
+      qDebug() << "Document handlers registered";
+    }
 
-  if(DOC==0){
     DOC = fz_open_document(CTX, path.toLocal8Bit().data());
-		docpath = path;
-		qDebug() << "File opened";
+    docpath = path;
+    qDebug() << "File opened" << DOC;
     if(DOC==0){
       qDebug() << "Could not open file:" << path;
       return false;
     }
     needpass = (fz_needs_password(CTX, DOC) != 0);
-  }
 
-  if(needpass && password.isEmpty()){ return false; }
-  else if(needpass){
-    needpass = !fz_authenticate_password(CTX, DOC, password.toLocal8Bit());
-    if(needpass){ return false; } //incorrect password
+    if(needpass && password.isEmpty()){ 
+      return false; 
+    }else if(needpass){
+      needpass = !fz_authenticate_password(CTX, DOC, password.toLocal8Bit());
+      if(needpass){ return false; } //incorrect password
+    }
+
+    //qDebug() << "Password Check cleared";
+    pnum = fz_count_pages(CTX, DOC);
+    qDebug() << "Page count: " << pnum;
+
+    doctitle.clear();
+    //qDebug() << "Opening File:" << path;
+    jobj.insert("title", getTextInfo("Title") );
+    jobj.insert("subject", getTextInfo("Subject") );
+    jobj.insert("author", getTextInfo("Author") );
+    jobj.insert("creator", getTextInfo("Creator") );
+    jobj.insert("producer", getTextInfo("Producer") );
+    jobj.insert("keywords", getTextInfo("Keywords") );
+    jobj.insert("dt_created", QDateTime::fromString( getTextInfo("CreationDate").left(16), "'D:'yyyyMMddHHmmss").toString() );
+    jobj.insert("dt_modified", QDateTime::fromString( getTextInfo("ModDate").left(16), "'D:'yyyyMMddHHmmss").toString() );
+
+    if(!jobj["title"].isNull())
+      doctitle = jobj["title"].toString();
+    else
+      doctitle = path.section("/",-1);
+
+    qDebug() << "Page Loaded";
+    //Possibly check Page orientation
+    return true;
   }
+  return false;
+}
 
-	qDebug() << "Password Check cleared";
-
-  //Could read/access the PDF - go ahead and load the info now
-  pnum = -1;
-  doctitle.clear();
-  //qDebug() << "Opening File:" << path;
-	QString title = getTextInfo("Subject");
-	if(!title.isNull())
-		doctitle = title;
-	else
-		doctitle = path.section("/",-1);
-  pnum = fz_count_pages(CTX, DOC);
-  //Setup the Document
-  fz_page *PAGE = fz_load_page(CTX, DOC, 0);
-	qDebug() << "Page Loaded";
-	//Possibly check Page orientation";
-
-  return (PAGE);
+void renderer(Data *data, Renderer *obj)
+{
+  int pagenum = data->pagenumber;
+  //qDebug() << "Rendering:" << pagenum;
+  fz_context *ctx = data->ctx;
+  fz_display_list *list = data->list;
+  fz_rect bbox = data->bbox;
+  fz_pixmap *pixmap = data->pix;
+  fz_matrix ctm = data->ctm;
+  fz_device *dev;
+
+  ctx = fz_clone_context(ctx);
+  dev = fz_new_draw_device(ctx, &fz_identity, pixmap);
+  fz_run_display_list(ctx, list, dev, &ctm, &bbox, NULL);
+
+  data->img = QImage(pixmap->samples, pixmap->w, pixmap->h, pixmap->stride, QImage::Format_RGB888);   
+  fz_close_device(ctx, dev);
+  fz_drop_device(ctx, dev);
+
+  fz_drop_context(ctx);
+
+  if(dataHash.find(pagenum) == dataHash.end())
+    dataHash.insert(pagenum, data);
+  else
+    dataHash[pagenum] = data;
+  emit obj->PageLoaded(pagenum);
 }
 
 //Consider rendering through a display list
-QImage Renderer::renderPage(int pagenum, QSize DPI){
-	QImage img;
-	fz_matrix matrix;
-	fz_pixmap *pixmap = nullptr;
-
-	fz_scale(&matrix, DPI.width()/96.0, DPI.height()/96.0);
-
-	//fz_context *ctx = fz_clone_context(CTX);
-	mutex->lock();
-
-	fz_try(CTX) {
-		pixmap = fz_new_pixmap_from_page_number(CTX, DOC, pagenum, &matrix, fz_device_rgb(CTX), 0);
-	}fz_catch(CTX){
-		qDebug() << "Error when rendering page using MuPDF";
-	}
-
-	mutex->unlock();
-
-	img = QImage(pixmap->samples, pixmap->w, pixmap->h, pixmap->stride, QImage::Format_RGB888);
-  qDebug() << "Render Page:" << pagenum;
-  return img;
+void Renderer::renderPage(int pagenum, QSize DPI, int degrees){
+  //qDebug() << "- Rendering Page:" << pagenum << degrees;
+  Data *data;
+  fz_matrix matrix;
+  fz_rect bbox;
+  fz_irect rbox;
+  fz_pixmap *pixmap;
+  fz_display_list *list;
+
+  double pageDPI = 96.0;
+  double sf = DPI.width() / pageDPI;
+  fz_scale(&matrix, sf, sf);
+  fz_pre_rotate(&matrix, degrees);
+
+  fz_page *PAGE = fz_load_page(CTX, DOC, pagenum);
+  fz_bound_page(CTX, PAGE, &bbox);
+  emit OrigSize(QSizeF(bbox.x1 - bbox.x0, bbox.y1 - bbox.y0));
+
+  fz_transform_rect(&bbox, &matrix);
+  list = fz_new_display_list(CTX, &bbox);
+  fz_device *dev = fz_new_list_device(CTX, list);
+  fz_run_page(CTX, PAGE, dev, &fz_identity, NULL);  
+
+  fz_close_device(CTX, dev);
+  fz_drop_device(CTX, dev);
+  fz_drop_page(CTX, PAGE);
+
+  pixmap = fz_new_pixmap_with_bbox(CTX, fz_device_rgb(CTX), fz_round_rect(&rbox, &bbox), NULL, 0);
+  fz_clear_pixmap_with_value(CTX, pixmap, 0xff);
+
+  data = new Data(pagenum, CTX, list, bbox, pixmap, matrix, sf);
+  data->renderThread = QtConcurrent::run(&renderer, data, this);
 }
 
 QList<TextData*> Renderer::searchDocument(QString text, bool matchCase){
   fz_rect rectBuffer[1000];
   QList<TextData*> results;
   for(int i = 0; i < pnum; i++) {
-    int count = fz_search_page_number(CTX, DOC, i, text.toLatin1().data(), rectBuffer, 1000);
+    int count = fz_search_display_list(CTX, dataHash[i]->list, text.toLatin1().data(), rectBuffer, 1000);
     //qDebug() << "Page " << i+1 << ": Count, " << count;
     for(int j = 0; j < count; j++) {
-      QRect rect(rectBuffer[j].x0, rectBuffer[j].y0, rectBuffer[j].x1-rectBuffer[j].x0, rectBuffer[j].y1 - rectBuffer[j].y0);
+      double sf = dataHash[i]->sf;
+      QRectF rect(rectBuffer[j].x0*sf, rectBuffer[j].y0*sf, (rectBuffer[j].x1-rectBuffer[j].x0)*sf, (rectBuffer[j].y1 - rectBuffer[j].y0)*sf);
       TextData *t = new TextData(rect, i+1, text);
       //MuPDF search does not match case, so retrieve the exact text at the location found and determine whether or not it matches the case of the search text if the user selected to match case
       if(matchCase){
-        fz_stext_page *sPage = fz_new_stext_page_from_page_number(CTX, DOC, i, NULL);
+        fz_stext_page *sPage = fz_new_stext_page_from_display_list(CTX, dataHash[i]->list, NULL);
         QString currentStr = QString(fz_copy_selection(CTX, sPage, *fz_rect_min(&rectBuffer[j]), *fz_rect_max(&rectBuffer[j]), false));
         if(currentStr.contains(text, Qt::CaseSensitive)){ results.append(t); }
       }else{
@@ -156,3 +219,22 @@ QList<TextData*> Renderer::searchDocument(QString text, bool matchCase){
   }
   return results;
 }
+
+QImage Renderer::imageHash(int pagenum) {
+  return dataHash[pagenum]->img;
+}
+
+int Renderer::hashSize() {
+  return dataHash.size();
+}
+
+void Renderer::clearHash() {
+  for(int i = 0; i < dataHash.size(); i++) {
+    fz_drop_pixmap(CTX, dataHash[i]->pix);
+    fz_drop_display_list(CTX, dataHash[i]->list);
+  }
+  qDeleteAll(dataHash);
+  dataHash.clear();
+}
+
+bool Renderer::supportsExtraFeatures() { return true; }