author | leseb <leseb> | 2002-04-06 22:20:19 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-04-06 22:20:19 (UTC) |
commit | 75bc9d885aa131334a0b906a1a58134740c40783 (patch) (unidiff) | |
tree | 08a05fe92e1e2f1dc67604f9040bf669e5b4c84a /noncore/graphics/drawpad/drawpadcanvas.cpp | |
parent | 8e092bf08c2873dcdec4694573cf715b7a590e41 (diff) | |
download | opie-75bc9d885aa131334a0b906a1a58134740c40783.zip opie-75bc9d885aa131334a0b906a1a58134740c40783.tar.gz opie-75bc9d885aa131334a0b906a1a58134740c40783.tar.bz2 |
- Save album in PNG format instead of XPM
- Small fixes
Diffstat (limited to 'noncore/graphics/drawpad/drawpadcanvas.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp index 8818c03..b8a1c2e 100644 --- a/noncore/graphics/drawpad/drawpadcanvas.cpp +++ b/noncore/graphics/drawpad/drawpadcanvas.cpp | |||
@@ -55,4 +55,5 @@ private: | |||
55 | State m_state; | 55 | State m_state; |
56 | ulong m_dataLenght; | 56 | ulong m_dataLenght; |
57 | QString m_dataFormat; | ||
57 | QList<QPixmap> m_pixmaps; | 58 | QList<QPixmap> m_pixmaps; |
58 | }; | 59 | }; |
@@ -81,4 +82,9 @@ bool DrawPadCanvasXmlHandler::startElement(const QString& namespaceURI, const QS | |||
81 | m_state = InData; | 82 | m_state = InData; |
82 | m_dataLenght = atts.value("length").toULong(); | 83 | m_dataLenght = atts.value("length").toULong(); |
84 | m_dataFormat = atts.value("format"); | ||
85 | |||
86 | if (m_dataFormat.isEmpty()) { | ||
87 | m_dataFormat = "XPM"; | ||
88 | } | ||
83 | } | 89 | } |
84 | 90 | ||
@@ -134,5 +140,5 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch) | |||
134 | 140 | ||
135 | QImage image; | 141 | QImage image; |
136 | image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, "XPM"); | 142 | image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat); |
137 | 143 | ||
138 | QPixmap* pixmap = new QPixmap(image.width(), image.height()); | 144 | QPixmap* pixmap = new QPixmap(image.width(), image.height()); |
@@ -216,5 +222,5 @@ void DrawPadCanvas::save(QIODevice* ioDevice) | |||
216 | QByteArray byteArray; | 222 | QByteArray byteArray; |
217 | QBuffer buffer(byteArray); | 223 | QBuffer buffer(byteArray); |
218 | QImageIO imageIO(&buffer, "XPM"); | 224 | QImageIO imageIO(&buffer, "PNG"); |
219 | 225 | ||
220 | buffer.open(IO_WriteOnly); | 226 | buffer.open(IO_WriteOnly); |
@@ -227,5 +233,5 @@ void DrawPadCanvas::save(QIODevice* ioDevice) | |||
227 | ::compress((uchar*)byteArrayZipped.data(), &size, (uchar*)byteArray.data(), byteArray.size()); | 233 | ::compress((uchar*)byteArrayZipped.data(), &size, (uchar*)byteArray.data(), byteArray.size()); |
228 | 234 | ||
229 | textStream << " <data length=\"" << byteArray.size() << "\">"; | 235 | textStream << " <data length=\"" << byteArray.size() << "\" format=\"PNG\">"; |
230 | 236 | ||
231 | static const char hexchars[] = "0123456789abcdef"; | 237 | static const char hexchars[] = "0123456789abcdef"; |