author | leseb <leseb> | 2002-06-23 17:47:21 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-06-23 17:47:21 (UTC) |
commit | 3251c55f854ecbd4ece8bf169177ffac28081aaa (patch) (side-by-side diff) | |
tree | beaf75deb513c8ef4a3ea222135308241fe09f6f /noncore/graphics/drawpad/drawpadcanvas.cpp | |
parent | 7c22b9cbf92650c432a84537f4b9c3d810e7dc75 (diff) | |
download | opie-3251c55f854ecbd4ece8bf169177ffac28081aaa.zip opie-3251c55f854ecbd4ece8bf169177ffac28081aaa.tar.gz opie-3251c55f854ecbd4ece8bf169177ffac28081aaa.tar.bz2 |
Remove old format reading (XPM gzipped)
Diffstat (limited to 'noncore/graphics/drawpad/drawpadcanvas.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp index ae1b554..5437068 100644 --- a/noncore/graphics/drawpad/drawpadcanvas.cpp +++ b/noncore/graphics/drawpad/drawpadcanvas.cpp @@ -25,14 +25,12 @@ #include <qimage.h> #include <qpainter.h> #include <qtextcodec.h> #include <qtextstream.h> #include <qxml.h> -#include <zlib.h> - const int PAGE_BACKUPS = 99; class DrawPadCanvasXmlHandler: public QXmlDefaultHandler { public: DrawPadCanvasXmlHandler(); @@ -90,16 +88,12 @@ bool DrawPadCanvasXmlHandler::startElement(const QString& namespaceURI, const QS } else if (qName == "date") { m_state = InDate; } else if (qName == "data") { m_state = InData; m_dataLenght = atts.value("length").toULong(); m_dataFormat = atts.value("format"); - - if (m_dataFormat.isEmpty()) { - m_dataFormat = "XPM"; - } } return true; } bool DrawPadCanvasXmlHandler::endElement(const QString& namespaceURI, const QString& localName, @@ -147,27 +141,14 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch) r += l - 'a' + 10; } byteArray[i] = r; } - QImage image; - - 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); - } Page* page = new Page(m_title, image.width(), image.height()); page->setLastModified(m_date); page->convertFromImage(image); m_pages.append(page); } |