From 3251c55f854ecbd4ece8bf169177ffac28081aaa Mon Sep 17 00:00:00 2001
From: leseb <leseb>
Date: Sun, 23 Jun 2002 17:47:21 +0000
Subject: Remove old format reading (XPM gzipped)

---
(limited to 'noncore')

diff --git a/noncore/graphics/drawpad/drawpad.pro b/noncore/graphics/drawpad/drawpad.pro
index 6bea193..8f70cc6 100644
--- a/noncore/graphics/drawpad/drawpad.pro
+++ b/noncore/graphics/drawpad/drawpad.pro
@@ -39,8 +39,7 @@ SOURCES		= drawpad.cpp \
 		  texttool.cpp \
 		  thumbnailview.cpp \
 		  tool.cpp
-INCLUDEPATH	+= $(OPIEDIR)/include \
-		  $(QTDIR)/src/3rdparty/zlib
+INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS		+= -lqpe -lopie
 DESTDIR		= $(OPIEDIR)/bin
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
@@ -28,8 +28,6 @@
 #include <qtextstream.h>
 #include <qxml.h>
 
-#include <zlib.h>
-
 const int PAGE_BACKUPS = 99;
 
 class DrawPadCanvasXmlHandler: public QXmlDefaultHandler
@@ -93,10 +91,6 @@ bool DrawPadCanvasXmlHandler::startElement(const QString& namespaceURI, const QS
         m_state = InData;
         m_dataLenght = atts.value("length").toULong();
         m_dataFormat = atts.value("format");
-
-        if (m_dataFormat.isEmpty()) {
-            m_dataFormat = "XPM";
-        }
     }
 
     return true;
@@ -150,21 +144,8 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch)
             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);
-        }
+        image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat);
 
         Page* page = new Page(m_title, image.width(), image.height());
         page->setLastModified(m_date);
--
cgit v0.9.0.2