-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp index 4e17245..21ef15c 100644 --- a/noncore/graphics/drawpad/drawpadcanvas.cpp +++ b/noncore/graphics/drawpad/drawpadcanvas.cpp | |||
@@ -213,54 +213,48 @@ void DrawPadCanvas::initialPage() | |||
213 | 213 | ||
214 | void DrawPadCanvas::save(QIODevice* ioDevice) | 214 | void DrawPadCanvas::save(QIODevice* ioDevice) |
215 | { | 215 | { |
216 | QTextStream textStream(ioDevice); | 216 | QTextStream textStream(ioDevice); |
217 | textStream.setCodec(QTextCodec::codecForName("UTF-8")); | 217 | textStream.setCodec(QTextCodec::codecForName("UTF-8")); |
218 | 218 | ||
219 | textStream << "<drawpad>" << endl; | 219 | textStream << "<drawpad>" << endl; |
220 | textStream << " <images>" << endl; | 220 | textStream << " <images>" << endl; |
221 | 221 | ||
222 | QListIterator<QPixmap> bufferIterator(m_pages); | 222 | QListIterator<QPixmap> bufferIterator(m_pages); |
223 | 223 | ||
224 | for (bufferIterator.toFirst(); bufferIterator.current() != 0; ++bufferIterator) { | 224 | for (bufferIterator.toFirst(); bufferIterator.current() != 0; ++bufferIterator) { |
225 | textStream << " <image>" << endl; | 225 | textStream << " <image>" << endl; |
226 | 226 | ||
227 | QImage image = bufferIterator.current()->convertToImage(); | 227 | QImage image = bufferIterator.current()->convertToImage(); |
228 | QByteArray byteArray; | 228 | QByteArray byteArray; |
229 | QBuffer buffer(byteArray); | 229 | QBuffer buffer(byteArray); |
230 | QImageIO imageIO(&buffer, "PNG"); | 230 | QImageIO imageIO(&buffer, "PNG"); |
231 | 231 | ||
232 | buffer.open(IO_WriteOnly); | 232 | buffer.open(IO_WriteOnly); |
233 | imageIO.setImage(image); | 233 | imageIO.setImage(image); |
234 | imageIO.write(); | 234 | imageIO.write(); |
235 | buffer.close(); | 235 | buffer.close(); |
236 | 236 | ||
237 | /* | ||
238 | ulong size = byteArray.size() * 2; | ||
239 | QByteArray byteArrayZipped(size); | ||
240 | ::compress((uchar*)byteArrayZipped.data(), &size, (uchar*)byteArray.data(), byteArray.size()); | ||
241 | */ | ||
242 | |||
243 | textStream << " <data length=\"" << byteArray.size() << "\" format=\"PNG\">"; | 237 | textStream << " <data length=\"" << byteArray.size() << "\" format=\"PNG\">"; |
244 | 238 | ||
245 | static const char hexchars[] = "0123456789abcdef"; | 239 | static const char hexchars[] = "0123456789abcdef"; |
246 | 240 | ||
247 | for (int i = 0; i < (int)byteArray.size(); i++ ) { | 241 | for (int i = 0; i < (int)byteArray.size(); i++ ) { |
248 | uchar s = (uchar)byteArray[i]; | 242 | uchar s = (uchar)byteArray[i]; |
249 | textStream << hexchars[s >> 4]; | 243 | textStream << hexchars[s >> 4]; |
250 | textStream << hexchars[s & 0x0f]; | 244 | textStream << hexchars[s & 0x0f]; |
251 | } | 245 | } |
252 | 246 | ||
253 | textStream << "</data>" << endl; | 247 | textStream << "</data>" << endl; |
254 | textStream << " </image>" << endl; | 248 | textStream << " </image>" << endl; |
255 | } | 249 | } |
256 | 250 | ||
257 | textStream << " </images>" << endl; | 251 | textStream << " </images>" << endl; |
258 | textStream << "</drawpad>"; | 252 | textStream << "</drawpad>"; |
259 | } | 253 | } |
260 | 254 | ||
261 | void DrawPadCanvas::importPage(const QString& fileName) | 255 | void DrawPadCanvas::importPage(const QString& fileName) |
262 | { | 256 | { |
263 | QPixmap* importedPixmap = new QPixmap(); | 257 | QPixmap* importedPixmap = new QPixmap(); |
264 | 258 | ||
265 | importedPixmap->load(fileName); | 259 | importedPixmap->load(fileName); |
266 | m_pages.insert(m_pages.at() + 1, importedPixmap); | 260 | m_pages.insert(m_pages.at() + 1, importedPixmap); |