Index: head/graphics/katarakt/files/patch-src_resourcemanager.cpp =================================================================== --- head/graphics/katarakt/files/patch-src_resourcemanager.cpp (nonexistent) +++ head/graphics/katarakt/files/patch-src_resourcemanager.cpp (revision 544367) @@ -0,0 +1,18 @@ +--- src/resourcemanager.cpp.orig 2020-08-08 07:23:53 UTC ++++ src/resourcemanager.cpp +@@ -118,15 +118,9 @@ void ResourceManager::initialize(const QString &file, + doc->setRenderHint(Poppler::Document::Antialiasing, true); + doc->setRenderHint(Poppler::Document::TextAntialiasing, true); + doc->setRenderHint(Poppler::Document::TextHinting, true); +-#if POPPLER_VERSION >= POPPLER_VERSION_CHECK(0, 18, 0) + doc->setRenderHint(Poppler::Document::TextSlightHinting, true); +-#endif +-#if POPPLER_VERSION >= POPPLER_VERSION_CHECK(0, 22, 0) + // doc->setRenderHint(Poppler::Document::OverprintPreview, true); // TODO what is this? +-#endif +-#if POPPLER_VERSION >= POPPLER_VERSION_CHECK(0, 24, 0) + doc->setRenderHint(Poppler::Document::ThinLineSolid, true); // TODO what's the difference between ThinLineSolid and ThinLineShape? +-#endif + + page_count = doc->numPages(); + Property changes on: head/graphics/katarakt/files/patch-src_resourcemanager.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/katarakt/files/patch-src_search.cpp =================================================================== --- head/graphics/katarakt/files/patch-src_search.cpp (nonexistent) +++ head/graphics/katarakt/files/patch-src_search.cpp (revision 544367) @@ -0,0 +1,29 @@ +--- src/search.cpp.orig 2020-08-08 07:25:17 UTC ++++ src/search.cpp +@@ -68,26 +68,11 @@ void SearchWorker::run() { + + // collect all occurrences + QList *hits = new QList; +-#if POPPLER_VERSION < POPPLER_VERSION_CHECK(0, 22, 0) +- // old search interface, slow for many hits per page +- double x = 0, y = 0, x2 = 0, y2 = 0; +- while (!stop && !die && +- p->search(search_term, x, y, x2, y2, Poppler::Page::NextResult, +- has_upper_case ? Poppler::Page::CaseSensitive : Poppler::Page::CaseInsensitive)) { +- hits->push_back(QRectF(x, y, x2 - x, y2 - y)); +- } +-#elif POPPLER_VERSION < POPPLER_VERSION_CHECK(0, 31, 0) +- // new search interface +- QList tmp = p->search(search_term, +- has_upper_case ? Poppler::Page::CaseSensitive : Poppler::Page::CaseInsensitive); +- hits->swap(tmp); +-#else + // even newer interface + QList tmp = p->search(search_term, + has_upper_case ? (Poppler::Page::SearchFlags) 0 : Poppler::Page::IgnoreCase); + // TODO support Poppler::Page::WholeWords + hits->swap(tmp); +-#endif + #ifdef DEBUG + if (hits->size() > 0) { + cerr << hits->size() << " hits on page " << page << endl; Property changes on: head/graphics/katarakt/files/patch-src_search.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/katarakt/files/patch-src_util.h =================================================================== --- head/graphics/katarakt/files/patch-src_util.h (nonexistent) +++ head/graphics/katarakt/files/patch-src_util.h (revision 544367) @@ -0,0 +1,14 @@ +--- src/util.h.orig 2020-08-08 07:25:17 UTC ++++ src/util.h +@@ -7,11 +7,6 @@ + + class QImage; + +- +-#define POPPLER_VERSION ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) +- +-#define POPPLER_VERSION_CHECK(major,minor,micro) ((major << 16) | (minor << 8) | (micro)) +- + // rounds a float when afterwards cast to int + // seems to fix the mismatch between calculated page height and actual image height + #define ROUND(x) ((x) + 0.5f) Property changes on: head/graphics/katarakt/files/patch-src_util.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property