summaryrefslogtreecommitdiff
Unidiff
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
@@ -131,15 +131,21 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch)
131 byteArray[i] = r; 131 byteArray[i] = r;
132 } 132 }
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
144 QPixmap* pixmap = new QPixmap(image.width(), image.height()); 150 QPixmap* pixmap = new QPixmap(image.width(), image.height());
145 pixmap->convertFromImage(image); 151 pixmap->convertFromImage(image);
@@ -228,16 +234,18 @@ void DrawPadCanvas::save(QIODevice* ioDevice)
228 imageIO.write(); 234 imageIO.write();
229 buffer.close(); 235 buffer.close();
230 236
237/*
231 ulong size = byteArray.size() * 2; 238 ulong size = byteArray.size() * 2;
232 QByteArray byteArrayZipped(size); 239 QByteArray byteArrayZipped(size);
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
235 textStream << " <data length=\"" << byteArray.size() << "\" format=\"PNG\">"; 243 textStream << " <data length=\"" << byteArray.size() << "\" format=\"PNG\">";
236 244
237 static const char hexchars[] = "0123456789abcdef"; 245 static const char hexchars[] = "0123456789abcdef";
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];
242 textStream << hexchars[s & 0x0f]; 250 textStream << hexchars[s & 0x0f];
243 } 251 }