summaryrefslogtreecommitdiff
authorleseb <leseb>2002-06-23 17:47:21 (UTC)
committer leseb <leseb>2002-06-23 17:47:21 (UTC)
commit3251c55f854ecbd4ece8bf169177ffac28081aaa (patch) (side-by-side diff)
treebeaf75deb513c8ef4a3ea222135308241fe09f6f
parent7c22b9cbf92650c432a84537f4b9c3d810e7dc75 (diff)
downloadopie-3251c55f854ecbd4ece8bf169177ffac28081aaa.zip
opie-3251c55f854ecbd4ece8bf169177ffac28081aaa.tar.gz
opie-3251c55f854ecbd4ece8bf169177ffac28081aaa.tar.bz2
Remove old format reading (XPM gzipped)
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
@@ -36,14 +36,13 @@ SOURCES = drawpad.cpp \
pointtool.cpp \
rectangletool.cpp \
shapetool.cpp \
texttool.cpp \
thumbnailview.cpp \
tool.cpp
-INCLUDEPATH += $(OPIEDIR)/include \
- $(QTDIR)/src/3rdparty/zlib
+INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopie
DESTDIR = $(OPIEDIR)/bin
TARGET = drawpad
TRANSLATIONS = ../../i18n/de/drawpad.ts
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
@@ -25,14 +25,12 @@
#include <qimage.h>
#include <qpainter.h>
#include <qtextcodec.h>
#include <qtextstream.h>
#include <qxml.h>
-#include <zlib.h>
-
const int PAGE_BACKUPS = 99;
class DrawPadCanvasXmlHandler: public QXmlDefaultHandler
{
public:
DrawPadCanvasXmlHandler();
@@ -90,16 +88,12 @@ bool DrawPadCanvasXmlHandler::startElement(const QString& namespaceURI, const QS
} else if (qName == "date") {
m_state = InDate;
} else if (qName == "data") {
m_state = InData;
m_dataLenght = atts.value("length").toULong();
m_dataFormat = atts.value("format");
-
- if (m_dataFormat.isEmpty()) {
- m_dataFormat = "XPM";
- }
}
return true;
}
bool DrawPadCanvasXmlHandler::endElement(const QString& namespaceURI, const QString& localName,
@@ -147,27 +141,14 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch)
r += l - 'a' + 10;
}
byteArray[i] = r;
}
-
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);
Page* page = new Page(m_title, image.width(), image.height());
page->setLastModified(m_date);
page->convertFromImage(image);
m_pages.append(page);
}