Drop duplicate io code ( Bug #1120585 )

(bzr r12192)

4 files changed, 270 insertions, 1 deletions

diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
index c5606779e..34502d3db 100644
--- a/src/io/CMakeLists.txt
+++ b/src/io/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 set(io_SRC
 	base64stream.cpp
+	bufferstream.cpp
 	ftos.cpp
 	gzipstream.cpp
 	inkjar.cpp
@@ -12,10 +13,10 @@ set(io_SRC
 	uristream.cpp
 	xsltstream.cpp
 
-
 	# -------
 	# Headers
 	base64stream.h
+	bufferstream.h
 	ftos.h
 	gzipstream.h
 	inkjar.h
diff --git a/src/io/Makefile_insert b/src/io/Makefile_insert
index bb47b46b8..935c0cc07 100644
--- a/src/io/Makefile_insert
+++ b/src/io/Makefile_insert
@@ -3,6 +3,8 @@
 ink_common_sources += \
 	io/base64stream.h \
 	io/base64stream.cpp \
+	io/bufferstream.cpp  \
+	io/bufferstream.h    \
 	io/ftos.cpp \
 	io/ftos.h \
 	io/gzipstream.cpp \
diff --git a/src/io/bufferstream.cpp b/src/io/bufferstream.cpp
new file mode 100644
index 000000000..ba440254f
--- /dev/null
+++ b/src/io/bufferstream.cpp
@@ -0,0 +1,157 @@
+/*
+ * Phoebe DOM Implementation.
+ *
+ * This is a C++ approximation of the W3C DOM model, which follows
+ * fairly closely the specifications in the various .idl files, copies of
+ * which are provided for reference.  Most important is this one:
+ *
+ * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
+ *
+ * Authors:
+ *   Bob Jamison
+ *
+ * Copyright (C) 2006 Bob Jamison
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/**
+ * This class provided buffered endpoints for input and output.
+ */
+
+#include "bufferstream.h"
+
+namespace Inkscape
+{
+namespace IO
+{
+
+//#########################################################################
+//# B U F F E R    I N P U T    S T R E A M
+//#########################################################################
+/**
+ *
+ */
+BufferInputStream::BufferInputStream(
+           const std::vector<unsigned char> &sourceBuffer)
+           : buffer(sourceBuffer)
+{
+    position = 0;
+    closed = false;
+}
+
+/**
+ *
+ */
+BufferInputStream::~BufferInputStream()
+{
+
+}
+
+/**
+ * Returns the number of bytes that can be read (or skipped over) from
+ * this input stream without blocking by the next caller of a method for
+ * this input stream.
+ */
+int BufferInputStream::available()
+{
+    if (closed)
+        return -1;
+    return buffer.size() - position;
+}
+
+
+/**
+ *  Closes this input stream and releases any system resources
+ *  associated with the stream.
+ */
+void BufferInputStream::close()
+{
+    closed = true;
+}
+
+/**
+ * Reads the next byte of data from the input stream.  -1 if EOF
+ */
+int BufferInputStream::get()
+{
+    if (closed)
+        return -1;
+    if (position >= (int)buffer.size())
+        return -1;
+    int ch = (int) buffer[position++];
+    return ch;
+}
+
+
+
+
+//#########################################################################
+//# B U F F E R    O U T P U T    S T R E A M
+//#########################################################################
+
+/**
+ *
+ */
+BufferOutputStream::BufferOutputStream()
+{
+    closed = false;
+}
+
+/**
+ *
+ */
+BufferOutputStream::~BufferOutputStream()
+{
+}
+
+/**
+ * Closes this output stream and releases any system resources
+ * associated with this stream.
+ */
+void BufferOutputStream::close()
+{
+    closed = true;
+}
+
+/**
+ *  Flushes this output stream and forces any buffered output
+ *  bytes to be written out.
+ */
+void BufferOutputStream::flush()
+{
+    //nothing to do
+}
+
+/**
+ * Writes the specified byte to this output stream.
+ */
+int BufferOutputStream::put(gunichar ch)
+{
+    if (closed)
+        return -1;
+    buffer.push_back(ch);
+    return 1;
+}
+
+
+
+
+}  //namespace IO
+}  //namespace Inkscape
+
+//#########################################################################
+//# E N D    O F    F I L E
+//#########################################################################
diff --git a/src/io/bufferstream.h b/src/io/bufferstream.h
new file mode 100644
index 000000000..ed565572a
--- /dev/null
+++ b/src/io/bufferstream.h
@@ -0,0 +1,109 @@
+#ifndef SEEN_BUFFERSTREAM_H
+#define SEEN_BUFFERSTREAM_H
+/**
+ * @file
+ * Phoebe DOM Implementation.
+ *
+ * This is a C++ approximation of the W3C DOM model, which follows
+ * fairly closely the specifications in the various .idl files, copies of
+ * which are provided for reference.  Most important is this one:
+ *
+ * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
+ */
+/*
+ * Authors:
+ *   Bob Jamison
+ *
+ * Copyright (C) 2006 Bob Jamison
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <vector.h>
+#include "inkscapestream.h"
+
+
+namespace Inkscape
+{
+namespace IO
+{
+
+//#########################################################################
+//# S T R I N G    I N P U T    S T R E A M
+//#########################################################################
+
+/**
+ * This class is for reading character from a DOMString
+ *
+ */
+class BufferInputStream : public InputStream
+{
+
+public:
+
+    BufferInputStream(const std::vector<unsigned char> &sourceBuffer);
+    virtual ~BufferInputStream();
+    virtual int available();
+    virtual void close();
+    virtual int get();
+
+private:
+    const std::vector<unsigned char> &buffer;
+    long position;
+    bool closed;
+
+}; // class BufferInputStream
+
+
+
+
+//#########################################################################
+//# B U F F E R     O U T P U T    S T R E A M
+//#########################################################################
+
+/**
+ * This class is for sending a stream to a character buffer
+ *
+ */
+class BufferOutputStream : public OutputStream
+{
+
+public:
+
+    BufferOutputStream();
+    virtual ~BufferOutputStream();
+    virtual void close();
+    virtual void flush();
+    virtual int put(gunichar ch);
+    virtual std::vector<unsigned char> &getBuffer()
+        { return buffer; }
+
+    virtual void clear()
+        { buffer.clear(); }
+
+private:
+    std::vector<unsigned char> buffer;
+    bool closed;
+
+}; // class BufferOutputStream
+
+
+
+}  //namespace IO
+}  //namespace Inkscape
+
+
+
+#endif // SEEN_BUFFERSTREAM_H