Some more of cleanup

4 files changed, 17 insertions, 156 deletions

diff --git a/src/lib/PictHeader.cpp b/src/lib/PictHeader.cpp
index 2949057..aecdaff 100644
--- a/src/lib/PictHeader.cpp
+++ b/src/lib/PictHeader.cpp
@@ -45,8 +45,8 @@ unsigned short readU16(WPXInputStream *input)
 unsigned readU32(WPXInputStream *input)
 {
 	unsigned long numBytesRead;
-	unsigned const *p = (unsigned int const *)input->read(sizeof(unsigned int), numBytesRead);
-	if (numBytesRead !=  sizeof(unsigned int))
+	unsigned const *p = (unsigned const *)input->read(sizeof(unsigned), numBytesRead);
+	if (numBytesRead !=  sizeof(unsigned))
 		;
 	return (unsigned)((((unsigned char const *)(p))[3] << 0) | (((unsigned char const *)(p))[2] << 8) |
 				  (((unsigned char const *)(p))[1] << 16) | (((unsigned char const *)(p))[0] << 24));
@@ -60,6 +60,8 @@ PictHeader::PictHeader() :
 	m_bottom(0),
 	m_right(0),
 	m_pictVersion(0),
+	m_horizontalResolution(72),
+	m_verticalResolution(72),
 	m_dataStart(0)
 {
 }
diff --git a/src/lib/PictHeader.h b/src/lib/PictHeader.h
index 1c04f99..4b2ac9e 100644
--- a/src/lib/PictHeader.h
+++ b/src/lib/PictHeader.h
@@ -37,6 +37,9 @@ public:
 	unsigned getLeft() const { return m_left; }
 	unsigned getBottom() const { return m_bottom; }
 	unsigned getRight() const { return m_right; }
+	unsigned getHorizontalResolution() const { return m_horizontalResolution; }
+	unsigned getVerticalResolution() const { return m_verticalResolution; }
+	
 
 private:
 	unsigned short m_fileSize;
diff --git a/src/lib/PictXParser.cpp b/src/lib/PictXParser.cpp
index a1f00be..7d92112 100644
--- a/src/lib/PictXParser.cpp
+++ b/src/lib/PictXParser.cpp
@@ -50,12 +50,12 @@ unsigned short PictXParser::readU16()
 	return (unsigned short)(p1|(p0<<8));
 }
 
-unsigned int PictXParser::readU32()
+unsigned PictXParser::readU32()
 {
-	unsigned int p0 = (unsigned int)readU8();
-	unsigned int p1 = (unsigned int)readU8();
-	unsigned int p2 = (unsigned int)readU8();
-	unsigned int p3 = (unsigned int)readU8();
+	unsigned p0 = (unsigned)readU8();
+	unsigned p1 = (unsigned)readU8();
+	unsigned p2 = (unsigned)readU8();
+	unsigned p3 = (unsigned)readU8();
 	return (unsigned long)(p3|(p2<<8)|(p1<<16)|(p0<<24));
 }
 
@@ -69,13 +69,13 @@ int PictXParser::readS32()
 	return (int)readU32();
 }
 
-unsigned int PictXParser::readVariableLengthInteger()
+unsigned PictXParser::readVariableLengthInteger()
 {
 	// read a byte
 	unsigned char value8 = readU8();
 	// if it's in the range 0-0xFE, then we have a 8-bit value
 	if (value8<=0xFE) {
-		return (unsigned int)value8;
+		return (unsigned)value8;
 	} else {
 		// now read a 16 bit value
 		unsigned short value16 = readU16();
@@ -87,7 +87,7 @@ unsigned int PictXParser::readVariableLengthInteger()
 			return (value32<<16)+lvalue16;
 		} else {
 			// we have a 16 bit value, return it
-			return (unsigned int)value16;
+			return (unsigned)value16;
 		}
 	}
 }
@@ -99,58 +99,3 @@ PictXParser& PictXParser::operator=(const PictXParser& parser)
     m_colorPalette = parser.m_colorPalette;
     return *this;
 }
-
-void PictTextDataHandler::endSubDocument()
-{
-	PICT_DEBUG_MSG(("PictTextDataHandler::endSubDocument\n"));
-}
-
-void PictTextDataHandler::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector & /* tabStops */)
-{
-	m_painter->startTextLine(propList);
-}
-
-void PictTextDataHandler::closeParagraph()
-{
-	m_painter->endTextLine();
-}
-
-void PictTextDataHandler::openSpan(const WPXPropertyList &propList)
-{
-	m_painter->startTextSpan(propList);
-}
-
-void PictTextDataHandler::closeSpan()
-{
-	m_painter->endTextSpan();
-}
-
-void PictTextDataHandler::insertTab()
-{
-	PICT_DEBUG_MSG(("PictTextDataHandler::insertTab\n"));
-}
-
-void PictTextDataHandler::insertSpace()
-{
-	m_painter->insertText(" ");
-}
-
-void PictTextDataHandler::insertText(const WPXString &text)
-{
-	m_painter->insertText(text);
-}
-
-void PictTextDataHandler::insertLineBreak()
-{
-	PICT_DEBUG_MSG(("PictTextDataHandler::insertLineBreak\n"));
-}
-
-void PictTextDataHandler::openListElement(const WPXPropertyList & propList, const WPXPropertyListVector &/*tabStops*/)
-{
-	m_painter->startTextLine(propList);
-}
-
-void PictTextDataHandler::closeListElement()
-{
-	PICT_DEBUG_MSG(("PictTextDataHandler::closeListElement\n"));
-}
diff --git a/src/lib/PictXParser.h b/src/lib/PictXParser.h
index 3fee480..d5e1a47 100644
--- a/src/lib/PictXParser.h
+++ b/src/lib/PictXParser.h
@@ -45,10 +45,10 @@ public:
 	
 	unsigned char readU8();
 	unsigned short readU16();  
-	unsigned int readU32();  
+	unsigned readU32();  
 	short readS16();  
 	int readS32();  
-	unsigned int readVariableLengthInteger();
+	unsigned readVariableLengthInteger();
 	PictXParser& operator=(const PictXParser& parser);
 
 protected:
@@ -57,94 +57,5 @@ protected:
 	std::map<int,libpict::PictColor> m_colorPalette;
 };
 
-class PictTextDataHandler : public ::WPXDocumentInterface
-{
-public:
-	PictTextDataHandler(libwpg::WPGPaintInterface* painter) :
-		m_painter(painter),
-		m_x(0.0),
-		m_y(0.0),
-		m_width(0.0),
-		m_height(0.0),
-		m_fontName("Times New Roman"),
-		m_fontSize(12.0),
-		m_paragraphStyle(),
-		m_textStyle() {}
-		
-	~PictTextDataHandler() {}
- 	void setDocumentMetaData(const WPXPropertyList & /* propList */) {}
-
- 	void startDocument() {}
- 	void endDocument() {}
-
- 	void startSubDocument() {}
- 	void endSubDocument();
-
- 	void definePageStyle(const WPXPropertyList & /* propList */) {}
- 	void openPageSpan(const WPXPropertyList & /* propList */) {}
- 	void closePageSpan() {}
- 	void openHeader(const WPXPropertyList & /* propList */) {}
- 	void closeHeader() {}
- 	void openFooter(const WPXPropertyList & /* propList */) {}
- 	void closeFooter() {}
-
- 	void defineParagraphStyle(const WPXPropertyList & /* propList */, const WPXPropertyListVector & /* tabStops */) {}
- 	void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
- 	void closeParagraph();
-
- 	void defineCharacterStyle(const WPXPropertyList & /* propList */) {}
- 	void openSpan(const WPXPropertyList &propList);
- 	void closeSpan();
-
- 	void defineSectionStyle(const WPXPropertyList & /* propList */, const WPXPropertyListVector & /* columns */) {}
- 	void openSection(const WPXPropertyList & /* propList */, const WPXPropertyListVector & /* columns */) {}
- 	void closeSection() {}
-
- 	void insertTab();
- 	void insertSpace();
- 	void insertText(const WPXString &text);
- 	void insertLineBreak();
-	void insertField(const WPXString & /* type */, const WPXPropertyList & /* propList */) {}
-
- 	void defineOrderedListLevel(const WPXPropertyList & /* propList */) {}
- 	void defineUnorderedListLevel(const WPXPropertyList & /* propList */) {}
- 	void openOrderedListLevel(const WPXPropertyList & /* propList */) {}
- 	void openUnorderedListLevel(const WPXPropertyList & /* propList */) {}
- 	void closeOrderedListLevel() {}
- 	void closeUnorderedListLevel() {}
- 	void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
- 	void closeListElement();
-
- 	void openFootnote(const WPXPropertyList & /* propList */) {}
- 	void closeFootnote() {}
- 	void openEndnote(const WPXPropertyList & /* propList */) {}
- 	void closeEndnote() {}
- 	void openComment(const WPXPropertyList & /* propList */) {}
- 	void closeComment() {}
- 	void openTextBox(const WPXPropertyList & /* propList */) {}
- 	void closeTextBox() {}
-
- 	void openTable(const WPXPropertyList & /* propList */, const WPXPropertyListVector & /* columns */) {}
- 	void openTableRow(const WPXPropertyList & /* propList */) {}
- 	void closeTableRow() {}
- 	void openTableCell(const WPXPropertyList & /* propList */) {}
- 	void closeTableCell() {}
- 	void insertCoveredTableCell(const WPXPropertyList & /* propList */) {}
- 	void closeTable() {}
-
- 	void openFrame(const WPXPropertyList & /* propList */) {}
- 	void closeFrame() {}
-	
- 	void insertBinaryObject(const WPXPropertyList & /* propList */, const WPXBinaryData & /* data */) {}
- 	void insertEquation(const WPXPropertyList & /* propList */, const WPXString & /* data */) {}
-
-private:
-	libwpg::WPGPaintInterface *m_painter;
-	double m_x, m_y, m_width, m_height;
-	::WPXString m_fontName;
-	double m_fontSize;
-	::WPXPropertyList m_paragraphStyle, m_textStyle;
-};
-
 
 #endif // __PICTXPARSER_H__