From: Ivailo Monev <xakepa10@gmail.com>
Date: Fri, 27 Feb 2015 11:40:53 +0000 (+0000)
Subject: ksmserver: remove QImageBlitz dependency
X-Git-Tag: 4.22.0~1752
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7fc3c029d195627f6bd336137cf4c9d87d5fdea2;p=kde%2Fkde-workspace.git

ksmserver: remove QImageBlitz dependency
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2c359e7..9a7f0747 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,12 +38,6 @@ set_package_properties(DBusMenuQt PROPERTIES DESCRIPTION "Support for notificati
                        TYPE REQUIRED
                       )
 
-find_package(QImageBlitz)
-set_package_properties(QImageBlitz PROPERTIES DESCRIPTION "An image effects library"
-                       URL "http://sourceforge.net/projects/qimageblitz"
-                       TYPE REQUIRED
-                      )
-
 find_package(KDeclarative QUIET CONFIG)
 set_package_properties(KDeclarative PROPERTIES DESCRIPTION "KDE Declarative (QML) support from kdelibs"
                        URL "http://www.kde.org"
diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt
index 5de8f275..49b83a75 100644
--- a/ksmserver/CMakeLists.txt
+++ b/ksmserver/CMakeLists.txt
@@ -3,7 +3,6 @@ add_subdirectory( kcm )
 
 include_directories(
    ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs
-   ${QIMAGEBLITZ_INCLUDES}
    ${KDECLARATIVE_INCLUDE_DIR}
 )
 
@@ -57,7 +56,7 @@ qt4_add_dbus_adaptor( ksmserver_KDEINIT_SRCS org.kde.KSMServerInterface.xml serv
 kde4_add_kdeinit_executable( ksmserver ${ksmserver_KDEINIT_SRCS})
 
 target_link_libraries(kdeinit_ksmserver ${SCREEN_LOCKER} ${KDE4_PLASMA_LIBS} kworkspace
-   ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QIMAGEBLITZ_LIBRARIES} ${KDE4_SOLID_LIBS} ${X11_LIBRARIES} ${X11_Xrender_LIB}
+   ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${X11_LIBRARIES} ${X11_Xrender_LIB}
    ${QT_QTDECLARATIVE_LIBRARY} ${KDECLARATIVE_LIBRARIES}
 )
 
diff --git a/ksmserver/curtaineffect.cpp b/ksmserver/curtaineffect.cpp
index e14cb8a5..2a6db5bf 100644
--- a/ksmserver/curtaineffect.cpp
+++ b/ksmserver/curtaineffect.cpp
@@ -31,8 +31,6 @@
 #include <QTimer>
 #include "config-workspace.h"
 
-#include <qimageblitz.h>
-
 CurtainEffect::CurtainEffect(QWidget *parent, QPixmap *pixmap)
     : LogoutEffect(parent, pixmap)
 {
@@ -49,8 +47,16 @@ void CurtainEffect::nextFrame()
 {
     QImage image = QPixmap::grabWindow(QApplication::desktop()->winId(), 0, currentY,
                                        parent->width(), 10 ).toImage();
-    Blitz::intensity(image, -0.4);
-    Blitz::grayscale(image);
+
+    // gray scale
+    QColor oldColor;
+    for(int x = 0; x < image.width(); x++){
+        for(int y = 0; y < image.height(); y++){
+            oldColor = QColor(image.pixel(x, y));
+            int average = (oldColor.red() + oldColor.green() + oldColor.blue()) / 3;
+            image.setPixel(x, y, qRgb(average,average,average));
+        }
+    }
 
     QPainter painter(pixmap);
     painter.drawImage(0, currentY, image);