author | leseb <leseb> | 2002-04-07 10:27:38 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-04-07 10:27:38 (UTC) |
commit | d7664dfe7f78fe89f85e168cad8cbf9c175ad6e3 (patch) (side-by-side diff) | |
tree | acab53680e94465be80ae20e08bec96316256c0b /noncore/graphics/drawpad | |
parent | e237c0758206c34f96c11870e033412b89e37463 (diff) | |
download | opie-d7664dfe7f78fe89f85e168cad8cbf9c175ad6e3.zip opie-d7664dfe7f78fe89f85e168cad8cbf9c175ad6e3.tar.gz opie-d7664dfe7f78fe89f85e168cad8cbf9c175ad6e3.tar.bz2 |
Fix load/save of XML file
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 26 |
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 @@ -122,33 +122,39 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch) r = r << 4; if (l <= '9') { r += l - '0'; } else { 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); } return true; } DrawPadCanvas::DrawPadCanvas(DrawPad* drawPad, QWidget* parent, const char* name) : QScrollView(parent, name) { @@ -219,34 +225,36 @@ void DrawPadCanvas::save(QIODevice* ioDevice) textStream << " <image>" << endl; QImage image = bufferIterator.current()->convertToImage(); QByteArray byteArray; QBuffer buffer(byteArray); QImageIO imageIO(&buffer, "PNG"); 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; } textStream << " </images>" << endl; textStream << "</drawpad>"; } |