office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-25 02:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable qimageblitz usage

Browse source
This commit is contained in:
Frederik Gladhorn 2014-08-08 23:46:43 +02:00
parent d16ac66ab3
commit 4f74ed01cf
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -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) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
find_package(QImageBlitz) # There was no Qt 5 version at the time of porting
set_package_properties("QImageBlitz" PROPERTIES #find_package(QImageBlitz)
DESCRIPTION "An image effects library" #set_package_properties("QImageBlitz" PROPERTIES
URL "http://sourceforge.net/projects/qimageblitz" # DESCRIPTION "An image effects library"
TYPE RECOMMENDED # URL "http://sourceforge.net/projects/qimageblitz"
PURPOSE "Required to build Okular.") # TYPE RECOMMENDED
# PURPOSE "Required to build Okular.")
find_package(LibKScreen "1.0.2") find_package(LibKScreen "1.0.2")
set_package_properties("LibKScreen" PROPERTIES set_package_properties("LibKScreen" PROPERTIES

5
ui/pagepainter.cpp
View file

@ -18,7 +18,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kdebug.h> #include <kdebug.h>
#include <QApplication> #include <QApplication>
#include <qimageblitz.h> // TODO KF5 #include <qimageblitz.h>
// system includes // system includes
#include <math.h> #include <math.h>
@ -351,7 +351,8 @@ void PagePainter::paintCroppedPageOnPainter( QPainter * destPainter, const Okula
break; break;
case Okular::SettingsCore::EnumRenderMode::Recolor: case Okular::SettingsCore::EnumRenderMode::Recolor:
// Recolor image using Blitz::flatten with dither:0 // 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; break;
case Okular::SettingsCore::EnumRenderMode::BlackWhite: case Okular::SettingsCore::EnumRenderMode::BlackWhite:
// Manual Gray and Contrast // Manual Gray and Contrast