summaryrefslogtreecommitdiff
authorleseb <leseb>2002-04-07 10:27:38 (UTC)
committer leseb <leseb>2002-04-07 10:27:38 (UTC)
commitd7664dfe7f78fe89f85e168cad8cbf9c175ad6e3 (patch) (unidiff)
treeacab53680e94465be80ae20e08bec96316256c0b
parente237c0758206c34f96c11870e033412b89e37463 (diff)
downloadopie-d7664dfe7f78fe89f85e168cad8cbf9c175ad6e3.zip
opie-d7664dfe7f78fe89f85e168cad8cbf9c175ad6e3.tar.gz
opie-d7664dfe7f78fe89f85e168cad8cbf9c175ad6e3.tar.bz2
Fix load/save of XML file
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/drawpad/drawpadcanvas.cpp26
1 files changed, 17 insertions, 9 deletions
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp
index b8a1c2e..4e17245 100644
--- a/noncore/graphics/drawpad/drawpadcanvas.cpp
+++ b/noncore/graphics/drawpad/drawpadcanvas.cpp
@@ -133,11 +133,17 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch)
133 133
134 if (m_dataLenght < ch.length() * 5) {
135 m_dataLenght = ch.length() * 5;
136 }
137
138 QByteArray byteArrayUnzipped(m_dataLenght);
139 ::uncompress((uchar*)byteArrayUnzipped.data(), &m_dataLenght, (uchar*)byteArray.data(), byteArray.size());
140 134
141 QImage image; 135 QImage image;
142 image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat); 136
137 if (m_dataFormat == "XPM") {
138 if (m_dataLenght < ch.length() * 5) {
139 m_dataLenght = ch.length() * 5;
140 }
141
142 QByteArray byteArrayUnzipped(m_dataLenght);
143 ::uncompress((uchar*)byteArrayUnzipped.data(), &m_dataLenght, (uchar*)byteArray.data(), byteArray.size());
144
145 image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat);
146 } else {
147 image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat);
148 }
143 149
@@ -230,2 +236,3 @@ void DrawPadCanvas::save(QIODevice* ioDevice)
230 236
237/*
231 ulong size = byteArray.size() * 2; 238 ulong size = byteArray.size() * 2;
@@ -233,2 +240,3 @@ void DrawPadCanvas::save(QIODevice* ioDevice)
233 ::compress((uchar*)byteArrayZipped.data(), &size, (uchar*)byteArray.data(), byteArray.size()); 240 ::compress((uchar*)byteArrayZipped.data(), &size, (uchar*)byteArray.data(), byteArray.size());
241*/
234 242
@@ -238,4 +246,4 @@ void DrawPadCanvas::save(QIODevice* ioDevice)
238 246
239 for (int i = 0; i < (int)size; i++ ) { 247 for (int i = 0; i < (int)byteArray.size(); i++ ) {
240 uchar s = (uchar)byteArrayZipped[i]; 248 uchar s = (uchar)byteArray[i];
241 textStream << hexchars[s >> 4]; 249 textStream << hexchars[s >> 4];