Start proyect, Merge from Trunk

(bzr r11950.1.27)

6 files changed, 40 insertions, 9 deletions

diff --git a/src/io/base64stream.cpp b/src/io/base64stream.cpp
index 0a28a8cc3..667487c35 100644
--- a/src/io/base64stream.cpp
+++ b/src/io/base64stream.cpp
@@ -5,18 +5,35 @@
  * of Base64 data with a stream interface, hiding
  * the implementation from the user.
  *
+ * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
+ *
  * Authors:
- *   Bob Jamison <rjamison@titan.com>
+
+ *   Bob Jamison
+ *
+ * Copyright (C) 2006 Bob Jamison
  *
- * Copyright (C) 2004 Inkscape.org
+
+ *  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.
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+ *  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 "base64stream.h"
 
 
 
+
 namespace Inkscape
 {
 namespace IO
diff --git a/src/io/gzipstream.cpp b/src/io/gzipstream.cpp
index cbe29a41e..f9e30de91 100644
--- a/src/io/gzipstream.cpp
+++ b/src/io/gzipstream.cpp
@@ -8,13 +8,27 @@
  * Authors:
  *   Bob Jamison <rjamison@titan.com>
  *
- * Copyright (C) 2004 Inkscape.org
+ * Copyright (C) 2004
  *
- * Released under GNU GPL, read the file 'COPYING' for more information
+
+ *  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 "gzipstream.h"
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <string>
 
diff --git a/src/io/gzipstream.h b/src/io/gzipstream.h
index 4debbfca9..89c5f64f3 100644
--- a/src/io/gzipstream.h
+++ b/src/io/gzipstream.h
@@ -17,7 +17,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
+#include <vector>
 #include "inkscapestream.h"
 #include <zlib.h>
 
diff --git a/src/io/inkscapestream.cpp b/src/io/inkscapestream.cpp
index da7870add..65f24cf59 100644
--- a/src/io/inkscapestream.cpp
+++ b/src/io/inkscapestream.cpp
@@ -11,7 +11,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
+#include <cstdlib>
 #include "inkscapestream.h"
 
 namespace Inkscape
diff --git a/src/io/inkscapestream.h b/src/io/inkscapestream.h
index a766e16e0..37c41552f 100644
--- a/src/io/inkscapestream.h
+++ b/src/io/inkscapestream.h
@@ -9,9 +9,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
 #include <cstdio>
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 
 namespace Inkscape
 {
diff --git a/src/io/sys.cpp b/src/io/sys.cpp
index 26c1993a7..60e850c96 100644
--- a/src/io/sys.cpp
+++ b/src/io/sys.cpp
@@ -15,6 +15,7 @@
 # include "config.h"
 #endif
 
+#include <fstream>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <glibmm/fileutils.h>