summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -128,21 +128,27 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch)
r += l - 'a' + 10;
}
byteArray[i] = r;
}
- 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());
QImage image;
- image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat);
+
+ 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);
+ }
QPixmap* pixmap = new QPixmap(image.width(), image.height());
pixmap->convertFromImage(image);
m_pixmaps.append(pixmap);
}
@@ -225,22 +231,24 @@ void DrawPadCanvas::save(QIODevice* ioDevice)
buffer.open(IO_WriteOnly);
imageIO.setImage(image);
imageIO.write();
buffer.close();
+/*
ulong size = byteArray.size() * 2;
QByteArray byteArrayZipped(size);
::compress((uchar*)byteArrayZipped.data(), &size, (uchar*)byteArray.data(), byteArray.size());
+*/
textStream << " <data length=\"" << byteArray.size() << "\" format=\"PNG\">";
static const char hexchars[] = "0123456789abcdef";
- for (int i = 0; i < (int)size; i++ ) {
- uchar s = (uchar)byteArrayZipped[i];
+ for (int i = 0; i < (int)byteArray.size(); i++ ) {
+ uchar s = (uchar)byteArray[i];
textStream << hexchars[s >> 4];
textStream << hexchars[s & 0x0f];
}
textStream << "</data>" << endl;
textStream << " </image>" << endl;