Diffstat (limited to 'noncore/graphics/drawpad/drawpadcanvas.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 21 |
1 files changed, 1 insertions, 20 deletions
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 | |||
@@ -28,8 +28,6 @@ | |||
28 | #include <qtextstream.h> | 28 | #include <qtextstream.h> |
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 | ||
35 | class DrawPadCanvasXmlHandler: public QXmlDefaultHandler | 33 | class DrawPadCanvasXmlHandler: public QXmlDefaultHandler |
@@ -93,10 +91,6 @@ bool DrawPadCanvasXmlHandler::startElement(const QString& namespaceURI, const QS | |||
93 | m_state = InData; | 91 | m_state = InData; |
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 | ||
102 | return true; | 96 | return true; |
@@ -150,21 +144,8 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch) | |||
150 | byteArray[i] = r; | 144 | byteArray[i] = r; |
151 | } | 145 | } |
152 | 146 | ||
153 | |||
154 | QImage image; | 147 | QImage image; |
155 | 148 | image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat); | |
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); | ||
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()); |
170 | page->setLastModified(m_date); | 151 | page->setLastModified(m_date); |