summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/drawpad/drawpad.pro3
-rw-r--r--noncore/graphics/drawpad/drawpadcanvas.cpp21
2 files changed, 2 insertions, 22 deletions
diff --git a/noncore/graphics/drawpad/drawpad.pro b/noncore/graphics/drawpad/drawpad.pro
index 6bea193..8f70cc6 100644
--- a/noncore/graphics/drawpad/drawpad.pro
+++ b/noncore/graphics/drawpad/drawpad.pro
@@ -41,4 +41,3 @@ SOURCES = drawpad.cpp \
tool.cpp
-INCLUDEPATH += $(OPIEDIR)/include \
- $(QTDIR)/src/3rdparty/zlib
+INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp
index ae1b554..5437068 100644
--- a/noncore/graphics/drawpad/drawpadcanvas.cpp
+++ b/noncore/graphics/drawpad/drawpadcanvas.cpp
@@ -30,4 +30,2 @@
-#include <zlib.h>
-
const int PAGE_BACKUPS = 99;
@@ -95,6 +93,2 @@ bool DrawPadCanvasXmlHandler::startElement(const QString& namespaceURI, const QS
m_dataFormat = atts.value("format");
-
- if (m_dataFormat.isEmpty()) {
- m_dataFormat = "XPM";
- }
}
@@ -152,17 +146,4 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch)
-
QImage image;
-
- if (m_dataFormat == "XPM") {
- if (m_dataLenght < ch.length() * 5) {
- m_dataLenght = ch.length() * 5;
- }
-
- QByteArray byteArrayUnzipped(m_dataLenght);
- ::uncompress((uchar*)byteArrayUnzipped.data(), &m_dataLenght, (uchar*)byteArray.data(), byteArray.size());
-
- image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat);
- } else {
- image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat);
- }
+ image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat);