From 64afe19c704cb8e5c404d2e1692dc7274b36d635 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 8 May 2013 14:18:10 +0200 Subject: Uploading libmwaw 0.1.8 Change-Id: Id5e9ab64924ddc48921d0c028ede712b8cb3477d --- libmwaw/UnpackedTarball_libmwaw.mk | 1 - libmwaw/libmwaw-0.1.7-misc.patch | 141 ------------------------------------- 2 files changed, 142 deletions(-) delete mode 100644 libmwaw/libmwaw-0.1.7-misc.patch (limited to 'libmwaw') diff --git a/libmwaw/UnpackedTarball_libmwaw.mk b/libmwaw/UnpackedTarball_libmwaw.mk index 08a1d614a210..c9c149e27eab 100644 --- a/libmwaw/UnpackedTarball_libmwaw.mk +++ b/libmwaw/UnpackedTarball_libmwaw.mk @@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1)) $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\ libmwaw/libmwaw-0.1.7-autotools.patch \ - libmwaw/libmwaw-0.1.7-misc.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/libmwaw/libmwaw-0.1.7-misc.patch b/libmwaw/libmwaw-0.1.7-misc.patch deleted file mode 100644 index b40166b230b2..000000000000 --- a/libmwaw/libmwaw-0.1.7-misc.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- a/src/lib/CWGraph.cxx -+++ b/src/lib/CWGraph.cxx -@@ -55,6 +55,8 @@ - - #include "CWGraph.hxx" - -+#include "libmwaw_internal.hxx" -+ - /** Internal: the structures of a CWGraph */ - namespace CWGraphInternal - { ---- a/src/lib/EDParser.cxx -+++ b/src/lib/EDParser.cxx -@@ -51,6 +51,8 @@ - #include "MWAWRSRCParser.hxx" - #include "MWAWSubDocument.hxx" - -+#include "libmwaw_internal.hxx" -+ - #include "EDParser.hxx" - - /** Internal: the structures of a EDParser */ -@@ -756,7 +758,7 @@ private: - - bool DeflateStruct::sendDuplicated(int num, int depl) - { -- ssize_t readPos=ssize_t(m_circQueuePos)+ssize_t(depl); -+ int64_t readPos=m_circQueuePos+depl; - while (readPos < 0) readPos+=0x2000; - while (readPos >= 0x2000) readPos-=0x2000; - ---- a/src/lib/HMWKGraph.cxx -+++ b/src/lib/HMWKGraph.cxx -@@ -53,6 +53,8 @@ - - #include "HMWKGraph.hxx" - -+#include "libmwaw_internal.hxx" -+ - /** Internal: the structures of a HMWKGraph */ - namespace HMWKGraphInternal - { ---- a/src/lib/MSW1Parser.cxx -+++ b/src/lib/MSW1Parser.cxx -@@ -527,7 +527,7 @@ bool MSW1Parser::prepareTextZones() - return false; - } - -- std::map::iterator plcIt = m_state->m_plcMap.begin(); -+ std::multimap::iterator plcIt = m_state->m_plcMap.begin(); - long pos = 0x80, prevMainPos=pos; - int actPage = 1; - int actType = 0; -@@ -1216,7 +1216,7 @@ bool MSW1Parser::sendText(MWAWEntry const &textEntry, bool isMain) - libmwaw::DebugStream f; - f << "TextContent:"; - int actFId=-1, actRId = -1, actPage=0; -- std::map::iterator plcIt = m_state->m_plcMap.begin(); -+ std::multimap::iterator plcIt = m_state->m_plcMap.begin(); - while (plcIt != m_state->m_plcMap.end() && plcIt->first < pos) { - MSW1ParserInternal::PLC const &plc = plcIt++->second; - if (plc.m_type == MSW1ParserInternal::FONT) ---- a/src/lib/MSWStruct.cxx -+++ b/src/lib/MSWStruct.cxx -@@ -1027,7 +1027,7 @@ void Paragraph::insert(Paragraph const ¶, bool insertModif) - for (size_t j = 0; j < m_tabs->size(); j++) { - if (m_tabs.get()[j].m_position < val-1e-4 || m_tabs.get()[j].m_position > val+1e-4) - continue; -- m_tabs->erase (m_tabs->begin()+ssize_t(j)); -+ m_tabs->erase (m_tabs->begin()+j); - done = true; - break; - } ---- a/src/lib/MWAWPageSpan.cxx -+++ b/src/lib/MWAWPageSpan.cxx -@@ -236,7 +236,7 @@ void MWAWPageSpan::getPageProperty(WPXPropertyList &propList) const - - propList.insert("fo:page-height", getFormLength()); - propList.insert("fo:page-width", getFormWidth()); -- if (getFormOrientation() == MWAWPageSpan::MWAWPageSpan::LANDSCAPE) -+ if (getFormOrientation() == LANDSCAPE) - propList.insert("style:print-orientation", "landscape"); - else - propList.insert("style:print-orientation", "portrait"); ---- a/src/lib/WNParser.cxx -+++ b/src/lib/WNParser.cxx -@@ -336,7 +336,7 @@ bool WNParser::createZones() - } else if (!readDocEntries()) - return false; - -- std::map::const_iterator iter; -+ std::multimap::const_iterator iter; - - // the Color map zone - iter = m_entryManager->m_typeMap.find("ColMap"); ---- a/src/lib/WNText.cxx -+++ b/src/lib/WNText.cxx -@@ -589,7 +589,7 @@ WNEntry WNText::getFooter() const - //////////////////////////////////////////////////////////// - bool WNText::createZones() - { -- std::map::const_iterator iter; -+ std::multimap::const_iterator iter; - - iter = m_entryManager->m_typeMap.find("FontZone"); - if (iter != m_entryManager->m_typeMap.end()) ---- a/src/lib/ZWText.cxx -+++ b/src/lib/ZWText.cxx -@@ -433,7 +433,7 @@ bool ZWText::sendText(ZWTextInternal::Section const &zone, MWAWEntry const &entr - - ZWTextInternal::Font actFont; - actFont.m_font=MWAWFont(3,12); -- std::multimap::const_iterator fIt= -+ std::map::const_iterator fIt= - zone.m_idFontMap.begin(); - long cPos = pos-zone.m_pos.begin(); - while (fIt != zone.m_idFontMap.end() && fIt->first - #include - #include -+#include - #include - -+#ifndef M_PI -+#define M_PI 3.14159265358979323846 -+#endif -+ - #include - #include - -@@ -60,6 +65,7 @@ typedef unsigned short uint16_t; - typedef signed int int32_t; - typedef unsigned int uint32_t; - typedef unsigned __int64 uint64_t; -+typedef __int64 int64_t; - - #else /* !_MSC_VER && !__DJGPP__*/ - -- cgit