Kaydet (Commit) 0a905178 authored tarafından David Tardon's avatar David Tardon

drop unneeded patches

Change-Id: I67314a12717ada0bdb49d9578821abf66fb41302
üst 9c6ddb1f
From 3355f5314cd01d8c264c91014d136a58f68d03f4 Mon Sep 17 00:00:00 2001
From: osnola <alonso@loria.fr>
Date: Wed, 13 Aug 2014 11:00:35 +0200
Subject: [PATCH] MWAWDocument.cxx: remove an useless debug message.
---
src/lib/MWAWDocument.cxx | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/lib/MWAWDocument.cxx b/src/lib/MWAWDocument.cxx
index 5591f70..8246bf7 100644
--- a/src/lib/MWAWDocument.cxx
+++ b/src/lib/MWAWDocument.cxx
@@ -109,7 +109,6 @@ MWAWDocument::Confidence MWAWDocument::isFileFormatSupported(librevenge::RVNGInp
}
try {
- MWAW_DEBUG_MSG(("MWAWDocument::isFileFormatSupported()\n"));
MWAWInputStreamPtr ip(new MWAWInputStream(input, false, true));
MWAWInputStreamPtr rsrc=ip->getResourceForkStream();
shared_ptr<MWAWRSRCParser> rsrcParser;
--
1.8.4.5
From 7b7cf183a7ad454706aa0f1657c851c578ec476e Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sun, 25 May 2014 15:51:54 +0200
Subject: [PATCH] librevenge-stream is optional: don't depend on it
---
src/lib/MWAWStringStream.cxx | 153 +++++++++++++++++++++++++++++++++++++++++++
src/lib/MWAWStringStream.hxx | 50 ++++++++++++++
src/lib/Makefile.am | 2 +
src/lib/WingzParser.cxx | 3 +-
4 files changed, 207 insertions(+), 1 deletion(-)
create mode 100644 src/lib/MWAWStringStream.cxx
create mode 100644 src/lib/MWAWStringStream.hxx
diff --git a/src/lib/MWAWStringStream.cxx b/src/lib/MWAWStringStream.cxx
new file mode 100644
index 0000000..efea071
--- /dev/null
+++ b/src/lib/MWAWStringStream.cxx
@@ -0,0 +1,153 @@
+/* -*- Mode: C++; c-default-style: "k&r"; indent-tabs-mode: nil; tab-width: 2; c-basic-offset: 2 -*- */
+
+/* libmwaw
+* Version: MPL 2.0 / LGPLv2+
+*
+* The contents of this file are subject to the Mozilla Public License Version
+* 2.0 (the "License"); you may not use this file except in compliance with
+* the License or as specified alternatively below. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* Alternatively, the contents of this file may be used under the terms of
+* the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+* in which case the provisions of the LGPLv2+ are applicable
+* instead of those above.
+*/
+
+#include <cstring>
+#include <vector>
+
+#include <librevenge-stream/librevenge-stream.h>
+
+#include "MWAWStringStream.hxx"
+
+class MWAWStringStreamPrivate
+{
+public:
+ MWAWStringStreamPrivate(const unsigned char *data, unsigned dataSize);
+ ~MWAWStringStreamPrivate();
+ std::vector<unsigned char> buffer;
+ long offset;
+private:
+ MWAWStringStreamPrivate(const MWAWStringStreamPrivate &);
+ MWAWStringStreamPrivate &operator=(const MWAWStringStreamPrivate &);
+};
+
+MWAWStringStreamPrivate::MWAWStringStreamPrivate(const unsigned char *data, unsigned dataSize) :
+ buffer(dataSize),
+ offset(0)
+{
+ std::memcpy(&buffer[0], data, dataSize);
+}
+
+MWAWStringStreamPrivate::~MWAWStringStreamPrivate()
+{
+}
+
+MWAWStringStream::MWAWStringStream(const unsigned char *data, const unsigned int dataSize) :
+ librevenge::RVNGInputStream(),
+ d(new MWAWStringStreamPrivate(data, dataSize))
+{
+}
+
+MWAWStringStream::~MWAWStringStream()
+{
+ delete d;
+}
+
+const unsigned char *MWAWStringStream::read(unsigned long numBytes, unsigned long &numBytesRead)
+{
+ numBytesRead = 0;
+
+ if (numBytes == 0)
+ return 0;
+
+ long numBytesToRead;
+
+ if ((unsigned long)d->offset+numBytes < d->buffer.size())
+ numBytesToRead = (long) numBytes;
+ else
+ numBytesToRead = (long) d->buffer.size() - d->offset;
+
+ numBytesRead = (unsigned long) numBytesToRead; // about as paranoid as we can be..
+
+ if (numBytesToRead == 0)
+ return 0;
+
+ long oldOffset = d->offset;
+ d->offset += numBytesToRead;
+
+ return &d->buffer[size_t(oldOffset)];
+
+}
+
+long MWAWStringStream::tell()
+{
+ return d->offset;
+}
+
+int MWAWStringStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType)
+{
+ if (seekType == librevenge::RVNG_SEEK_CUR)
+ d->offset += offset;
+ else if (seekType == librevenge::RVNG_SEEK_SET)
+ d->offset = offset;
+ else if (seekType == librevenge::RVNG_SEEK_END)
+ d->offset += d->buffer.size();
+
+ if (d->offset < 0) {
+ d->offset = 0;
+ return 1;
+ }
+ if ((long)d->offset > (long)d->buffer.size()) {
+ d->offset = (long) d->buffer.size();
+ return 1;
+ }
+
+ return 0;
+}
+
+bool MWAWStringStream::isEnd()
+{
+ if ((long)d->offset >= (long)d->buffer.size())
+ return true;
+
+ return false;
+}
+
+bool MWAWStringStream::isStructured()
+{
+ return false;
+}
+
+unsigned MWAWStringStream::subStreamCount()
+{
+ return 0;
+}
+
+const char *MWAWStringStream::subStreamName(unsigned)
+{
+ return 0;
+}
+
+bool MWAWStringStream::existsSubStream(const char *)
+{
+ return false;
+}
+
+librevenge::RVNGInputStream *MWAWStringStream::getSubStreamById(unsigned)
+{
+ return 0;
+}
+
+librevenge::RVNGInputStream *MWAWStringStream::getSubStreamByName(const char *)
+{
+ return 0;
+}
+
+// vim: set filetype=cpp tabstop=2 shiftwidth=2 cindent autoindent smartindent noexpandtab:
diff --git a/src/lib/MWAWStringStream.hxx b/src/lib/MWAWStringStream.hxx
new file mode 100644
index 0000000..9a6aa02
--- /dev/null
+++ b/src/lib/MWAWStringStream.hxx
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; c-default-style: "k&r"; indent-tabs-mode: nil; tab-width: 2; c-basic-offset: 2 -*- */
+
+/* libmwaw
+* Version: MPL 2.0 / LGPLv2+
+*
+* The contents of this file are subject to the Mozilla Public License Version
+* 2.0 (the "License"); you may not use this file except in compliance with
+* the License or as specified alternatively below. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* Alternatively, the contents of this file may be used under the terms of
+* the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+* in which case the provisions of the LGPLv2+ are applicable
+* instead of those above.
+*/
+
+#include <librevenge-stream/librevenge-stream.h>
+
+class MWAWStringStreamPrivate;
+
+class MWAWStringStream: public librevenge::RVNGInputStream
+{
+public:
+ MWAWStringStream(const unsigned char *data, const unsigned int dataSize);
+ ~MWAWStringStream();
+
+ const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
+ long tell();
+ int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType);
+ bool isEnd();
+
+ bool isStructured();
+ unsigned subStreamCount();
+ const char *subStreamName(unsigned);
+ bool existsSubStream(const char *name);
+ librevenge::RVNGInputStream *getSubStreamByName(const char *name);
+ librevenge::RVNGInputStream *getSubStreamById(unsigned);
+
+private:
+ MWAWStringStreamPrivate *d;
+ MWAWStringStream(const MWAWStringStream &); // copy is not allowed
+ MWAWStringStream &operator=(const MWAWStringStream &); // assignment is not allowed
+};
+
+// vim: set filetype=cpp tabstop=2 shiftwidth=2 cindent autoindent smartindent noexpandtab:
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index eb17bad..f7934b4 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -162,12 +162,12 @@ am_libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MI
MWAWPrinter.lo MWAWPropertyHandler.lo MWAWRSRCParser.lo \
MWAWSection.lo MWAWSpreadsheetDecoder.lo \
MWAWSpreadsheetEncoder.lo MWAWSpreadsheetListener.lo \
- MWAWSubDocument.lo MWAWTable.lo MWAWTextListener.lo \
- NisusWrtGraph.lo NisusWrtParser.lo NisusWrtStruct.lo \
- NisusWrtText.lo RagTimeParser.lo RagTimeSpreadsheet.lo \
- RagTimeText.lo SuperPaintParser.lo TeachTxtParser.lo \
- WingzParser.lo WriteNowParser.lo WriteNowText.lo \
- WriterPlsParser.lo ZWrtParser.lo ZWrtText.lo
+ MWAWStringStream.lo MWAWSubDocument.lo MWAWTable.lo \
+ MWAWTextListener.lo NisusWrtGraph.lo NisusWrtParser.lo \
+ NisusWrtStruct.lo NisusWrtText.lo RagTimeParser.lo \
+ RagTimeSpreadsheet.lo RagTimeText.lo SuperPaintParser.lo \
+ TeachTxtParser.lo WingzParser.lo WriteNowParser.lo \
+ WriteNowText.lo WriterPlsParser.lo ZWrtParser.lo ZWrtText.lo
libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_OBJECTS = $(am_libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -610,6 +610,8 @@ libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR
MWAWSpreadsheetEncoder.hxx \
MWAWSpreadsheetListener.cxx \
MWAWSpreadsheetListener.hxx \
+ MWAWStringStream.cxx \
+ MWAWStringStream.hxx \
MWAWSubDocument.cxx \
MWAWSubDocument.hxx \
MWAWTable.cxx \
@@ -812,6 +814,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MWAWSpreadsheetDecoder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MWAWSpreadsheetEncoder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MWAWSpreadsheetListener.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MWAWStringStream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MWAWSubDocument.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MWAWTable.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MWAWTextListener.Plo@am__quote@
diff --git a/src/lib/WingzParser.cxx b/src/lib/WingzParser.cxx
index 4813816..93dde7d 100644
--- a/src/lib/WingzParser.cxx
+++ b/src/lib/WingzParser.cxx
@@ -49,6 +49,7 @@
#include "MWAWPictMac.hxx"
#include "MWAWPrinter.hxx"
#include "MWAWSpreadsheetListener.hxx"
+#include "MWAWStringStream.hxx"
#include "MWAWSubDocument.hxx"
#include "WingzParser.hxx"
@@ -2496,7 +2497,7 @@ bool WingzParser::decodeEncrypted()
// finally replace the actual input with a new input
shared_ptr<librevenge::RVNGInputStream> newInput
- (new librevenge::RVNGStringStream(buffer, (unsigned int)length));
+ (new MWAWStringStream(buffer, (unsigned int)length));
delete [] buffer;
getParserState()->m_input.reset(new MWAWInputStream(newInput, false));
return true;
--
1.9.0
From f61d5c4ba6812aac5539084f6b23816fbb51b132 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 7 Jul 2014 19:37:25 +0200
Subject: [PATCH] msvc2013 does not like this
---
src/lib/RagTimeParser.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/RagTimeParser.cxx b/src/lib/RagTimeParser.cxx
index 2fb8e41..0f7d9e8 100644
--- a/src/lib/RagTimeParser.cxx
+++ b/src/lib/RagTimeParser.cxx
@@ -2404,7 +2404,7 @@ bool RagTimeParser::sendPicture(int zId, MWAWPosition const &position)
}
input->seek(pict.m_pos.begin(), librevenge::RVNG_SEEK_SET);
shared_ptr<MWAWPict> thePict(MWAWPictData::get(input, pictSize));
- bool ok=thePict;
+ bool ok=bool(thePict);
if (ok) {
librevenge::RVNGBinaryData data;
std::string type;
--
1.9.3
From ead2223f2d3d4742df84f37c6cea9c73b71257c5 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sun, 25 May 2014 16:07:21 +0200
Subject: [PATCH] librevenge-stream is optional: don't depend on it
---
src/lib/MWAWInputStream.cxx | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/lib/MWAWInputStream.cxx b/src/lib/MWAWInputStream.cxx
index 91b713b..0d60f67 100644
--- a/src/lib/MWAWInputStream.cxx
+++ b/src/lib/MWAWInputStream.cxx
@@ -43,6 +43,7 @@
#include "MWAWDebug.hxx"
#include "MWAWInputStream.hxx"
+#include "MWAWStringStream.hxx"
MWAWInputStream::MWAWInputStream(shared_ptr<librevenge::RVNGInputStream> inp, bool inverted)
: m_stream(inp), m_streamSize(0), m_inverseRead(inverted), m_readLimit(-1), m_prevLimits(),
@@ -517,7 +518,7 @@ bool MWAWInputStream::unBinHex()
MWAW_DEBUG_MSG(("MWAWInputStream::unBinHex: can not read the resource fork\n"));
}
else {
- shared_ptr<librevenge::RVNGInputStream> rsrc(new librevenge::RVNGStringStream(data, (unsigned int)numBytesRead));
+ shared_ptr<librevenge::RVNGInputStream> rsrc(new MWAWStringStream(data, (unsigned int)numBytesRead));
m_resourceFork.reset(new MWAWInputStream(rsrc,false));
}
}
@@ -532,7 +533,7 @@ bool MWAWInputStream::unBinHex()
MWAW_DEBUG_MSG(("MWAWInputStream::unBinHex: can not read the data fork\n"));
return false;
}
- m_stream.reset(new librevenge::RVNGStringStream(data, (unsigned int)numBytesRead));
+ m_stream.reset(new MWAWStringStream(data, (unsigned int)numBytesRead));
}
return true;
@@ -692,9 +693,9 @@ bool MWAWInputStream::unMacMIME(MWAWInputStream *inp,
return false;
}
if (wh==1)
- dataInput.reset(new librevenge::RVNGStringStream(data, (unsigned int)numBytesRead));
+ dataInput.reset(new MWAWStringStream(data, (unsigned int)numBytesRead));
else if (wh==2)
- rsrcInput.reset(new librevenge::RVNGStringStream(data, (unsigned int)numBytesRead));
+ rsrcInput.reset(new MWAWStringStream(data, (unsigned int)numBytesRead));
else { // the finder info
if (entrySize < 8) {
MWAW_DEBUG_MSG(("MWAWInputStream::unMacMIME: finder info size is odd\n"));
--
1.9.0
See <https://sourceforge.net/p/libmwaw/tickets/6/attachment/minimal.patch>:
--- src/lib/MWAWPictMac.cxx
+++ src/lib/MWAWPictMac.cxx
@@ -1060,7 +1060,6 @@
if (type5==WP_NONE) return;
else m_types.push_back(type5);
}
- virtual ~OpCode() {}
/** tries to read the data in the file
*
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment