author | leseb <leseb> | 2002-06-23 17:47:21 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-06-23 17:47:21 (UTC) |
commit | 3251c55f854ecbd4ece8bf169177ffac28081aaa (patch) (unidiff) | |
tree | beaf75deb513c8ef4a3ea222135308241fe09f6f /noncore | |
parent | 7c22b9cbf92650c432a84537f4b9c3d810e7dc75 (diff) | |
download | opie-3251c55f854ecbd4ece8bf169177ffac28081aaa.zip opie-3251c55f854ecbd4ece8bf169177ffac28081aaa.tar.gz opie-3251c55f854ecbd4ece8bf169177ffac28081aaa.tar.bz2 |
Remove old format reading (XPM gzipped)
-rw-r--r-- | noncore/graphics/drawpad/drawpad.pro | 3 | ||||
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 19 |
2 files changed, 1 insertions, 21 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 | |||
@@ -40,6 +40,5 @@ SOURCES = drawpad.cpp \ | |||
40 | thumbnailview.cpp \ | 40 | thumbnailview.cpp \ |
41 | tool.cpp | 41 | tool.cpp |
42 | INCLUDEPATH+= $(OPIEDIR)/include \ | 42 | INCLUDEPATH+= $(OPIEDIR)/include |
43 | $(QTDIR)/src/3rdparty/zlib | ||
44 | DEPENDPATH+= $(OPIEDIR)/include | 43 | DEPENDPATH+= $(OPIEDIR)/include |
45 | LIBS += -lqpe -lopie | 44 | LIBS += -lqpe -lopie |
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 | |||
@@ -29,6 +29,4 @@ | |||
29 | #include <qxml.h> | 29 | #include <qxml.h> |
30 | 30 | ||
31 | #include <zlib.h> | ||
32 | |||
33 | const int PAGE_BACKUPS = 99; | 31 | const int PAGE_BACKUPS = 99; |
34 | 32 | ||
@@ -94,8 +92,4 @@ bool DrawPadCanvasXmlHandler::startElement(const QString& namespaceURI, const QS | |||
94 | m_dataLenght = atts.value("length").toULong(); | 92 | m_dataLenght = atts.value("length").toULong(); |
95 | m_dataFormat = atts.value("format"); | 93 | m_dataFormat = atts.value("format"); |
96 | |||
97 | if (m_dataFormat.isEmpty()) { | ||
98 | m_dataFormat = "XPM"; | ||
99 | } | ||
100 | } | 94 | } |
101 | 95 | ||
@@ -151,19 +145,6 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch) | |||
151 | } | 145 | } |
152 | 146 | ||
153 | |||
154 | QImage image; | 147 | QImage image; |
155 | |||
156 | if (m_dataFormat == "XPM") { | ||
157 | if (m_dataLenght < ch.length() * 5) { | ||
158 | m_dataLenght = ch.length() * 5; | ||
159 | } | ||
160 | |||
161 | QByteArray byteArrayUnzipped(m_dataLenght); | ||
162 | ::uncompress((uchar*)byteArrayUnzipped.data(), &m_dataLenght, (uchar*)byteArray.data(), byteArray.size()); | ||
163 | |||
164 | image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat); | ||
165 | } else { | ||
166 | image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat); | 148 | image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat); |
167 | } | ||
168 | 149 | ||
169 | Page* page = new Page(m_title, image.width(), image.height()); | 150 | Page* page = new Page(m_title, image.width(), image.height()); |