crtxcr/looqs
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

remove max previewimage memory usage

Browse Source
This commit is contained in:
Albert S.
2019-08-26 09:35:39 +02:00
parent fa8e351859
commit a979eb1f51
1 changed files with 29 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gui/pdfworker.cpp
View File

@@ -18,27 +18,14 @@ struct Renderer
double scaleX; double scaleX;
double scaleY; double scaleY;
QHash<QString, Poppler::Document *> documentcache; QHash<QString, Poppler::Document *> documentcache;
qsizetype maxTotalPreviewImageMemUsage;
std::atomic<qsizetype> currentTotalPreviewImageMemUsage{0};
QVector<QString> wordsToHighlight; QVector<QString> wordsToHighlight;
Renderer(double scaleX, double scaleY, qsizetype maxPreviewImageMemUsage, QVector<QString> wordsToHighlight) Renderer(double scaleX, double scaleY, QVector<QString> wordsToHighlight)
{ {
this->scaleX = scaleX; this->scaleX = scaleX;
this->scaleY = scaleY; this->scaleY = scaleY;
this->maxTotalPreviewImageMemUsage = maxPreviewImageMemUsage;
this->wordsToHighlight = wordsToHighlight; this->wordsToHighlight = wordsToHighlight;
} }
/*we need this one because std::atomic has none, but this is only a functor for
concurrentmap, thus, it's ok for it to be half-broken*/
Renderer(const Renderer &o)
{
this->scaleX = o.scaleX;
this->scaleY = o.scaleY;
this->maxTotalPreviewImageMemUsage = o.maxTotalPreviewImageMemUsage;
this->wordsToHighlight = o.wordsToHighlight;
}
~Renderer() ~Renderer()
{ {
qDeleteAll(documentcache); qDeleteAll(documentcache);
@@ -47,8 +34,9 @@ struct Renderer
Poppler::Document *document(QString path) Poppler::Document *document(QString path)
{ {
if(documentcache.contains(path)) if(documentcache.contains(path))
{
return documentcache.value(path); return documentcache.value(path);
}
Poppler::Document *result = Poppler::Document::load(path); Poppler::Document *result = Poppler::Document::load(path);
if(result == nullptr) if(result == nullptr)
{ {
@@ -64,8 +52,6 @@ struct Renderer
PdfPreview operator()(const PdfPreview &preview) PdfPreview operator()(const PdfPreview &preview)
{ {
PdfPreview result = preview; PdfPreview result = preview;
if(currentTotalPreviewImageMemUsage.load() < maxTotalPreviewImageMemUsage)
{
Poppler::Document *doc = document(preview.documentPath); Poppler::Document *doc = document(preview.documentPath);
if(doc == nullptr) if(doc == nullptr)
{ {
@@ -93,8 +79,6 @@ struct Renderer
} }
} }
result.previewImage = img; result.previewImage = img;
currentTotalPreviewImageMemUsage += img.sizeInBytes();
}
return result; return result;
} }
}; };
@@ -119,6 +103,5 @@ QFuture<PdfPreview> PdfWorker::generatePreviews(const QVector<SearchResult> path
double scaleY = QGuiApplication::primaryScreen()->physicalDotsPerInchY() * scalefactor; double scaleY = QGuiApplication::primaryScreen()->physicalDotsPerInchY() * scalefactor;
QSettings setting; QSettings setting;
qsizetype maxPreviewImageMemUsage = setting.value("maxpreviewimagesmemory", 1024 * 1024 * 1024).toLongLong(); return QtConcurrent::mapped(previews, Renderer(scaleX, scaleY, wordsToHighlight));
return QtConcurrent::mapped(previews, Renderer(scaleX, scaleY, maxPreviewImageMemUsage, wordsToHighlight));
} }