summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-08 21:46:43 (GMT)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-08 21:48:00 (GMT)
commit4f74ed01cfeef288b0d481a4cae8ab81d953386a (patch)
treed1df39cd2fa6623d29f443ec56c08f445e8860da
parentd16ac66ab37ba5d5802ce8e754580eb4541539fd (diff)
Disable qimageblitz usage
-rw-r--r--CMakeLists.txt13
-rw-r--r--ui/pagepainter.cpp5
2 files changed, 10 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e4be02..51d2014 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,12 +21,13 @@ find_package(KF5 REQUIRED Archive Bookmarks CoreAddons Config ConfigWidgets DBus
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
-find_package(QImageBlitz)
-set_package_properties("QImageBlitz" PROPERTIES
- DESCRIPTION "An image effects library"
- URL "http://sourceforge.net/projects/qimageblitz"
- TYPE RECOMMENDED
- PURPOSE "Required to build Okular.")
+# There was no Qt 5 version at the time of porting
+#find_package(QImageBlitz)
+#set_package_properties("QImageBlitz" PROPERTIES
+# DESCRIPTION "An image effects library"
+# URL "http://sourceforge.net/projects/qimageblitz"
+# TYPE RECOMMENDED
+# PURPOSE "Required to build Okular.")
find_package(LibKScreen "1.0.2")
set_package_properties("LibKScreen" PROPERTIES
diff --git a/ui/pagepainter.cpp b/ui/pagepainter.cpp
index 7399d4a..7d4b59c 100644
--- a/ui/pagepainter.cpp
+++ b/ui/pagepainter.cpp
@@ -18,7 +18,7 @@
#include <kiconloader.h>
#include <kdebug.h>
#include <QApplication>
-#include <qimageblitz.h>
+// TODO KF5 #include <qimageblitz.h>
// system includes
#include <math.h>
@@ -351,7 +351,8 @@ void PagePainter::paintCroppedPageOnPainter( QPainter * destPainter, const Okula
break;
case Okular::SettingsCore::EnumRenderMode::Recolor:
// Recolor image using Blitz::flatten with dither:0
- Blitz::flatten( backImage, Okular::Settings::recolorForeground(), Okular::Settings::recolorBackground() );
+#pragma("KF5: implement RenderMode::Recolor again")
+ // Blitz::flatten( backImage, Okular::Settings::recolorForeground(), Okular::Settings::recolorBackground() );
break;
case Okular::SettingsCore::EnumRenderMode::BlackWhite:
// Manual Gray and Contrast