File librevenge-0.0.0-cumulated.patch of Package mingw32-librevenge

Overview Repositories Revisions Requests Users Attributes Meta

File librevenge-0.0.0-cumulated.patch of Package mingw32-librevenge (Revision fef63f075c68f0e78b9aa0953867d051)

Currently displaying revision fef63f075c68f0e78b9aa0953867d051 , Show latest

--- a/configure.ac
+++ b/configure.ac
@@ -179,22 +179,11 @@ AS_IF([test "x$enable_debug" = "xyes"], [
 ])
 AC_SUBST(DEBUG_CXXFLAGS)
 
-# =========
-# Find zlib
-# =========
-PKG_CHECK_MODULES([ZLIB],[zlib],[],[
-	AC_CHECK_HEADER(zlib.h, [ZLIB_CFLAGS=],
-		[AC_MSG_ERROR(zlib.h not found. install zlib)], [])
-	AC_CHECK_LIB(z, inflate, [ ZLIB_LIBS=-lz ],
-		[AC_MSG_ERROR(zlib not found or functional)], [])
-])
-AC_SUBST(ZLIB_CFLAGS)
-AC_SUBST(ZLIB_LIBS)
-
 # ==================
 # Find boost headers
 # ==================
 AC_CHECK_HEADERS(
+		boost/algorithm/string.hpp \
 		boost/archive/iterators/base64_from_binary.hpp \
 		boost/archive/iterators/binary_from_base64.hpp \
 		boost/archive/iterators/remove_whitespace.hpp \
@@ -208,6 +197,21 @@ AC_CHECK_HEADERS(
 	[]
 )
 
+# ==========
+# Unit tests
+# ==========
+AC_ARG_ENABLE([tests],
+    [AS_HELP_STRING([--enable-tests], [Build and run unit tests])],
+    [enable_tests="$enableval"],
+    [enable_tests=yes]
+)
+AS_IF([test "x$enable_tests" = "xyes"], [
+    PKG_CHECK_MODULES([CPPUNIT], [cppunit])
+], [])
+AC_SUBST([CPPUNIT_CFLAGS])
+AC_SUBST([CPPUNIT_LIBS])
+AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = "xyes"])
+
 # =============
 # Documentation
 # =============
@@ -231,14 +235,23 @@ AM_CONDITIONAL([WITH_LIBREVENGE_DOCS], [test "x$build_docs" != "xno"])
 # =======
 AC_ARG_ENABLE(streams,
 	[AS_HELP_STRING([--disable-streams], [Do not build librevenge-stream library])],
-	[enable_streams="$withval"],
+	[enable_streams="$enableval"],
 	[enable_streams=yes]
 )
 AM_CONDITIONAL([BUILD_STREAMS], [test "x$enable_streams" != "xno"])
 
 AS_IF([test "x$enable_streams" != "xno"], [
-	AX_BOOST_BASE
-	AX_BOOST_FILESYSTEM
+	# =========
+	# Find zlib
+	# =========
+	PKG_CHECK_MODULES([ZLIB],[zlib],[],[
+		AC_CHECK_HEADER(zlib.h, [ZLIB_CFLAGS=],
+			[AC_MSG_ERROR(zlib.h not found. install zlib)], [])
+		AC_CHECK_LIB(z, inflate, [ ZLIB_LIBS=-lz ],
+			[AC_MSG_ERROR(zlib not found or functional)], [])
+	])
+	AC_SUBST(ZLIB_CFLAGS)
+	AC_SUBST(ZLIB_LIBS)
 ])
 
 # ==========
@@ -246,7 +259,7 @@ AS_IF([test "x$enable_streams" != "xno"], [
 # ==========
 AC_ARG_ENABLE(generators,
 	[AS_HELP_STRING([--disable-generators], [Do not build librevenge-generators library])],
-	[enable_generators="$withval"],
+	[enable_generators="$enableval"],
 	[enable_generators=yes]
 )
 AM_CONDITIONAL([BUILD_GENERATORS], [test "x$enable_generators" != "xno"])
@@ -312,6 +325,7 @@ AC_MSG_NOTICE([
 Build configuration:
 	debug:           ${enable_debug}
 	docs:            ${build_docs}
+	tests:           ${enable_tests}
 	generators:      ${enable_generators}
 	streams:         ${enable_streams}
 	werror:          ${enable_werror}
--- a/inc/librevenge-generators/Makefile.am
+++ b/inc/librevenge-generators/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST =				\
 	librevenge-generators.h		\
+	librevenge-generators-api.h	\
 	RVNGCSVSpreadsheetGenerator.h	\
 	RVNGHTMLTextGenerator.h		\
 	RVNGRawDrawingGenerator.h	\
--- a/inc/librevenge-generators/RVNGCSVSpreadsheetGenerator.h
+++ b/inc/librevenge-generators/RVNGCSVSpreadsheetGenerator.h
@@ -21,6 +21,8 @@
 #ifndef RVNGCSVSPREADSHEETGENERATOR_H
 #define RVNGCSVSPREADSHEETGENERATOR_H
 
+#include "librevenge-generators-api.h"
+
 #include <librevenge/librevenge.h>
 #include <librevenge-stream/librevenge-stream.h>
 
@@ -32,7 +34,7 @@ struct RVNGCSVSpreadsheetGeneratorImpl;
   *
   * See \c ::librevenge::RVNGSpreadsheetInterface for documentation of the basic interface.
   */
-class RVNGCSVSpreadsheetGenerator : public RVNGSpreadsheetInterface
+class REVENGE_GENERATORS_API RVNGCSVSpreadsheetGenerator : public RVNGSpreadsheetInterface
 {
 	//! unimplemented copy constructor to prevent copy
 	RVNGCSVSpreadsheetGenerator(const RVNGCSVSpreadsheetGenerator &other);
--- a/inc/librevenge-generators/RVNGHTMLTextGenerator.h
+++ b/inc/librevenge-generators/RVNGHTMLTextGenerator.h
@@ -21,6 +21,8 @@
 #ifndef RVNGHTMLTEXTGENERATOR_H
 #define RVNGHTMLTEXTGENERATOR_H
 
+#include "librevenge-generators-api.h"
+
 #include <librevenge/librevenge.h>
 #include <librevenge-stream/librevenge-stream.h>
 
@@ -29,7 +31,7 @@ namespace librevenge
 
 struct RVNGHTMLTextGeneratorImpl;
 
-class RVNGHTMLTextGenerator : public RVNGTextInterface
+class REVENGE_GENERATORS_API RVNGHTMLTextGenerator : public RVNGTextInterface
 {
 public:
 	explicit RVNGHTMLTextGenerator(RVNGString &document);
--- a/inc/librevenge-generators/RVNGRawDrawingGenerator.h
+++ b/inc/librevenge-generators/RVNGRawDrawingGenerator.h
@@ -22,6 +22,8 @@
 #ifndef RVNGRAWDRAWINGGENERATOR_H
 #define RVNGRAWDRAWINGGENERATOR_H
 
+#include "librevenge-generators-api.h"
+
 #include <librevenge-stream/librevenge-stream.h>
 #include <librevenge/librevenge.h>
 
@@ -30,7 +32,7 @@ namespace librevenge
 
 struct RVNGRawDrawingGeneratorImpl;
 
-class RVNGRawDrawingGenerator : public RVNGDrawingInterface
+class REVENGE_GENERATORS_API RVNGRawDrawingGenerator : public RVNGDrawingInterface
 {
 	// disable copying
 	RVNGRawDrawingGenerator(const RVNGRawDrawingGenerator &other);
--- a/inc/librevenge-generators/RVNGRawPresentationGenerator.h
+++ b/inc/librevenge-generators/RVNGRawPresentationGenerator.h
@@ -15,6 +15,8 @@
 #ifndef RVNGRAWPRESENTATIONGENERATOR_H
 #define RVNGRAWPRESENTATIONGENERATOR_H
 
+#include "librevenge-generators-api.h"
+
 #include <librevenge/librevenge.h>
 #include <librevenge-stream/librevenge-stream.h>
 
@@ -23,7 +25,7 @@ namespace librevenge
 
 struct RVNGRawPresentationGeneratorImpl;
 
-class RVNGRawPresentationGenerator : public RVNGPresentationInterface
+class REVENGE_GENERATORS_API RVNGRawPresentationGenerator : public RVNGPresentationInterface
 {
 	// disable copying
 	RVNGRawPresentationGenerator(const RVNGRawPresentationGenerator &other);
--- a/inc/librevenge-generators/RVNGRawSpreadsheetGenerator.h
+++ b/inc/librevenge-generators/RVNGRawSpreadsheetGenerator.h
@@ -21,6 +21,8 @@
 #ifndef RVNGRAWSPREADSHEETGENERATOR_H
 #define RVNGRAWSPREADSHEETGENERATOR_H
 
+#include "librevenge-generators-api.h"
+
 #include <librevenge/librevenge.h>
 #include <librevenge-stream/librevenge-stream.h>
 
@@ -29,7 +31,7 @@ namespace librevenge
 
 struct RVNGRawSpreadsheetGeneratorImpl;
 
-class RVNGRawSpreadsheetGenerator : public RVNGSpreadsheetInterface
+class REVENGE_GENERATORS_API RVNGRawSpreadsheetGenerator : public RVNGSpreadsheetInterface
 {
 	// disable copying
 	RVNGRawSpreadsheetGenerator(const RVNGRawSpreadsheetGenerator &other);
--- a/inc/librevenge-generators/RVNGRawTextGenerator.h
+++ b/inc/librevenge-generators/RVNGRawTextGenerator.h
@@ -21,6 +21,8 @@
 #ifndef RVNGRAWTEXTGENERATOR_H
 #define RVNGRAWTEXTGENERATOR_H
 
+#include "librevenge-generators-api.h"
+
 #include <librevenge/librevenge.h>
 #include <librevenge-stream/librevenge-stream.h>
 
@@ -29,7 +31,7 @@ namespace librevenge
 
 struct RVNGRawTextGeneratorImpl;
 
-class RVNGRawTextGenerator : public RVNGTextInterface
+class REVENGE_GENERATORS_API RVNGRawTextGenerator : public RVNGTextInterface
 {
 	// disable copying
 	RVNGRawTextGenerator(const RVNGRawTextGenerator &other);
--- a/inc/librevenge-generators/RVNGSVGPresentationGenerator.h
+++ b/inc/librevenge-generators/RVNGSVGPresentationGenerator.h
@@ -15,6 +15,8 @@
 #ifndef RVNGSVGPRESENTATIONGENERATOR_H
 #define RVNGSVGPRESENTATIONGENERATOR_H
 
+#include "librevenge-generators-api.h"
+
 #include <librevenge/librevenge.h>
 #include <librevenge-stream/librevenge-stream.h>
 
@@ -23,7 +25,7 @@ namespace librevenge
 
 struct RVNGSVGPresentationGeneratorImpl;
 
-class RVNGSVGPresentationGenerator : public RVNGPresentationInterface
+class REVENGE_GENERATORS_API RVNGSVGPresentationGenerator : public RVNGPresentationInterface
 {
 	// disable copying
 	RVNGSVGPresentationGenerator(const RVNGSVGPresentationGenerator &other);
--- a/inc/librevenge-generators/RVNGTextDrawingGenerator.h
+++ b/inc/librevenge-generators/RVNGTextDrawingGenerator.h
@@ -15,6 +15,8 @@
 #ifndef RVNGTEXTDRAWINGGENERATOR_H
 #define RVNGTEXTDRAWINGGENERATOR_H
 
+#include "librevenge-generators-api.h"
+
 #include <librevenge-stream/librevenge-stream.h>
 #include <librevenge/librevenge.h>
 
@@ -23,7 +25,7 @@ namespace librevenge
 
 struct RVNGTextDrawingGeneratorImpl;
 
-class RVNGTextDrawingGenerator : public RVNGDrawingInterface
+class REVENGE_GENERATORS_API RVNGTextDrawingGenerator : public RVNGDrawingInterface
 {
 	// disable copying
 	RVNGTextDrawingGenerator(const RVNGTextDrawingGenerator &other);
--- a/inc/librevenge-generators/RVNGTextPresentationGenerator.h
+++ b/inc/librevenge-generators/RVNGTextPresentationGenerator.h
@@ -12,6 +12,11 @@
  * applicable instead of those above.
  */
 
+#ifndef RVNGTEXTPRESENTATIONGENERATOR_H
+#define RVNGTEXTPRESENTATIONGENERATOR_H
+
+#include "librevenge-generators-api.h"
+
 #include <librevenge/librevenge.h>
 #include <librevenge-stream/librevenge-stream.h>
 
@@ -20,7 +25,7 @@ namespace librevenge
 
 struct RVNGTextPresentationGeneratorImpl;
 
-class RVNGTextPresentationGenerator : public RVNGPresentationInterface
+class REVENGE_GENERATORS_API RVNGTextPresentationGenerator : public RVNGPresentationInterface
 {
 	// disable copying
 	RVNGTextPresentationGenerator(const RVNGTextPresentationGenerator &other);
@@ -124,4 +129,6 @@ private:
 
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
--- a/inc/librevenge-generators/RVNGTextSpreadsheetGenerator.h
+++ b/inc/librevenge-generators/RVNGTextSpreadsheetGenerator.h
@@ -21,6 +21,8 @@
 #ifndef RVNGTEXTSPREADSHEETGENERATOR_H
 #define RVNGTEXTSPREADSHEETGENERATOR_H
 
+#include "librevenge-generators-api.h"
+
 #include <librevenge/librevenge.h>
 #include <librevenge-stream/librevenge-stream.h>
 
@@ -32,7 +34,7 @@ struct RVNGTextSpreadsheetGeneratorImpl;
   *
   * See \c ::librevenge::RVNGSpreadsheetInterface for documentation of the basic interface.
   */
-class RVNGTextSpreadsheetGenerator : public RVNGSpreadsheetInterface
+class REVENGE_GENERATORS_API RVNGTextSpreadsheetGenerator : public RVNGSpreadsheetInterface
 {
 	//! unimplemented copy constructor to prevent copy
 	RVNGTextSpreadsheetGenerator(const RVNGTextSpreadsheetGenerator &other);
--- a/inc/librevenge-generators/RVNGTextTextGenerator.h
+++ b/inc/librevenge-generators/RVNGTextTextGenerator.h
@@ -21,6 +21,8 @@
 #ifndef RVNGTEXTTEXTGENERATOR_H
 #define RVNGTEXTTEXTGENERATOR_H
 
+#include "librevenge-generators-api.h"
+
 #include <librevenge/librevenge.h>
 #include <librevenge-stream/librevenge-stream.h>
 
@@ -29,7 +31,7 @@ namespace librevenge
 
 struct RVNGTextTextGeneratorImpl;
 
-class RVNGTextTextGenerator : public RVNGTextInterface
+class REVENGE_GENERATORS_API RVNGTextTextGenerator : public RVNGTextInterface
 {
 	// disable copying
 	RVNGTextTextGenerator(const RVNGTextTextGenerator &other);
--- /dev/null
+++ b/inc/librevenge-generators/librevenge-generators-api.h
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* librevenge
+ * Version: MPL 2.0 / LGPLv2.1+
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2002 William Lachance (wrlach@gmail.com)
+ * Copyright (C) 2002 Marc Maurer (uwog@uwog.net)
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms
+ * of the GNU Lesser General Public License Version 2.1 or later
+ * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
+ * applicable instead of those above.
+ */
+
+#ifndef INCLUDED_LIBREVENGE_GENERATORS_LIBREVENGE_GENERATORS_API_H
+#define INCLUDED_LIBREVENGE_GENERATORS_LIBREVENGE_GENERATORS_API_H
+
+#ifdef DLL_EXPORT
+#ifdef LIBREVENGE_GENERATORS_BUILD
+#define REVENGE_GENERATORS_API __declspec(dllexport)
+#else
+#define REVENGE_GENERATORS_API __declspec(dllimport)
+#endif
+#else
+#define REVENGE_GENERATORS_API
+#endif
+
+#endif /* INCLUDED_LIBREVENGE_GENERATORS_LIBREVENGE_GENERATORS_API_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
--- a/inc/librevenge-stream/Makefile.am
+++ b/inc/librevenge-stream/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST = \
 	librevenge-stream.h \
+	librevenge-stream-api.h \
 	RVNGDirectoryStream.h \
 	RVNGStream.h \
 	RVNGStreamImplementation.h
--- a/inc/librevenge-stream/RVNGDirectoryStream.h
+++ b/inc/librevenge-stream/RVNGDirectoryStream.h
@@ -22,6 +22,8 @@
 #ifndef RVNGDIRECTORYSTREAM_H_INCLUDED
 #define RVNGDIRECTORYSTREAM_H_INCLUDED
 
+#include "librevenge-stream-api.h"
+
 #include "RVNGStream.h"
 
 namespace librevenge
@@ -29,7 +31,7 @@ namespace librevenge
 
 struct RVNGDirectoryStreamImpl;
 
-class RVNGDirectoryStream : public RVNGInputStream
+class REVENGE_STREAM_API RVNGDirectoryStream : public RVNGInputStream
 {
 	// disable copying
 	RVNGDirectoryStream(const RVNGDirectoryStream &);
--- a/inc/librevenge-stream/RVNGStreamImplementation.h
+++ b/inc/librevenge-stream/RVNGStreamImplementation.h
@@ -20,6 +20,8 @@
 #ifndef RVNGSTREAMIMPLEMENTATION_H
 #define RVNGSTREAMIMPLEMENTATION_H
 
+#include "librevenge-stream-api.h"
+
 #include "RVNGStream.h"
 
 namespace librevenge
@@ -27,7 +29,7 @@ namespace librevenge
 
 class RVNGFileStreamPrivate;
 
-class RVNGFileStream: public RVNGInputStream
+class REVENGE_STREAM_API RVNGFileStream: public RVNGInputStream
 {
 public:
 	explicit RVNGFileStream(const char *filename);
@@ -53,7 +55,7 @@ private:
 
 class RVNGStringStreamPrivate;
 
-class RVNGStringStream: public RVNGInputStream
+class REVENGE_STREAM_API RVNGStringStream: public RVNGInputStream
 {
 public:
 	RVNGStringStream(const unsigned char *data, const unsigned int dataSize);
--- /dev/null
+++ b/inc/librevenge-stream/librevenge-stream-api.h
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* librevenge
+ * Version: MPL 2.0 / LGPLv2.1+
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2002 William Lachance (wrlach@gmail.com)
+ * Copyright (C) 2002 Marc Maurer (uwog@uwog.net)
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms
+ * of the GNU Lesser General Public License Version 2.1 or later
+ * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
+ * applicable instead of those above.
+ */
+
+#ifndef INCLUDED_LIBREVENGE_STREAM_LIBREVENGE_STREAM_API_H
+#define INCLUDED_LIBREVENGE_STREAM_LIBREVENGE_STREAM_API_H
+
+#ifdef DLL_EXPORT
+#ifdef LIBREVENGE_STREAM_BUILD
+#define REVENGE_STREAM_API __declspec(dllexport)
+#else
+#define REVENGE_STREAM_API __declspec(dllimport)
+#endif
+#else
+#define REVENGE_STREAM_API
+#endif
+
+#endif /* INCLUDED_LIBREVENGE_STREAM_LIBREVENGE_STREAM_API_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
--- a/inc/librevenge/Makefile.am
+++ b/inc/librevenge/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST = \
 	librevenge.h \
+	librevenge-api.h \
 	RVNGBinaryData.h \
 	RVNGDrawingInterface.h \
 	RVNGPresentationInterface.h \
--- a/inc/librevenge/RVNGBinaryData.h
+++ b/inc/librevenge/RVNGBinaryData.h
@@ -20,7 +20,10 @@
 #ifndef RVNGBINARYDATA_H
 #define RVNGBINARYDATA_H
 
+#include "librevenge-api.h"
+
 #include <librevenge-stream/librevenge-stream.h>
+
 #include "RVNGString.h"
 
 namespace librevenge
@@ -28,7 +31,7 @@ namespace librevenge
 
 struct RVNGBinaryDataImpl;
 
-class RVNGBinaryData
+class REVENGE_API RVNGBinaryData
 {
 public:
 	RVNGBinaryData();
--- a/inc/librevenge/RVNGProperty.h
+++ b/inc/librevenge/RVNGProperty.h
@@ -19,6 +19,9 @@
 
 #ifndef RVNGPROPERTY_H
 #define RVNGPROPERTY_H
+
+#include "librevenge-api.h"
+
 #include "RVNGString.h"
 
 namespace librevenge
@@ -26,7 +29,7 @@ namespace librevenge
 
 enum RVNGUnit { RVNG_INCH, RVNG_PERCENT, RVNG_POINT, RVNG_TWIP, RVNG_GENERIC, RVNG_UNIT_ERROR };
 
-class RVNGProperty
+class REVENGE_API RVNGProperty
 {
 public:
 	virtual ~RVNGProperty();
@@ -38,7 +41,7 @@ public:
 	virtual RVNGProperty *clone() const = 0;
 };
 
-class RVNGPropertyFactory
+class REVENGE_API RVNGPropertyFactory
 {
 public:
 	static RVNGProperty *newStringProp(const RVNGString &str);
--- a/inc/librevenge/RVNGPropertyList.h
+++ b/inc/librevenge/RVNGPropertyList.h
@@ -20,6 +20,9 @@
 
 #ifndef RVNGPROPERTYLIST_H
 #define RVNGPROPERTYLIST_H
+
+#include "librevenge-api.h"
+
 #include "RVNGProperty.h"
 
 namespace librevenge
@@ -32,7 +35,7 @@ class RVNGPropertyListImpl;
 class RVNGPropertyListIterImpl;
 class RVNGPropertyListVector;
 
-class RVNGPropertyList
+class REVENGE_API RVNGPropertyList
 {
 public:
 	RVNGPropertyList();
@@ -57,7 +60,7 @@ public:
 
 	RVNGString getPropString() const;
 
-	class Iter
+	class REVENGE_API Iter
 	{
 	public:
 		Iter(const RVNGPropertyList &propList);
--- a/inc/librevenge/RVNGPropertyListVector.h
+++ b/inc/librevenge/RVNGPropertyListVector.h
@@ -21,6 +21,8 @@
 #ifndef RVNGPROPERTYLISTVECTOR_H
 #define RVNGPROPERTYLISTVECTOR_H
 
+#include "librevenge-api.h"
+
 #include "RVNGPropertyList.h"
 
 namespace librevenge
@@ -29,7 +31,7 @@ namespace librevenge
 class RVNGPropertyListVectorImpl;
 class RVNGPropertyListVectorIterImpl;
 
-class RVNGPropertyListVector : public RVNGProperty
+class REVENGE_API RVNGPropertyListVector : public RVNGProperty
 {
 public:
 	RVNGPropertyListVector(const RVNGPropertyListVector &);
@@ -53,7 +55,7 @@ public:
 
 	RVNGString getPropString() const;
 
-	class Iter
+	class REVENGE_API Iter
 	{
 	public:
 		Iter(const RVNGPropertyListVector &vect);
--- a/inc/librevenge/RVNGSVGDrawingGenerator.h
+++ b/inc/librevenge/RVNGSVGDrawingGenerator.h
@@ -21,6 +21,8 @@
 #ifndef RVNGSVGDRAWINGGENERATOR_H
 #define RVNGSVGDRAWINGGENERATOR_H
 
+#include "librevenge-api.h"
+
 #include "RVNGDrawingInterface.h"
 #include "RVNGStringVector.h"
 
@@ -29,7 +31,7 @@ namespace librevenge
 
 struct RVNGSVGDrawingGeneratorPrivate;
 
-class RVNGSVGDrawingGenerator : public RVNGDrawingInterface
+class REVENGE_API RVNGSVGDrawingGenerator : public RVNGDrawingInterface
 {
 public:
 	RVNGSVGDrawingGenerator(RVNGStringVector &vec, const RVNGString &nmspace);
--- a/inc/librevenge/RVNGString.h
+++ b/inc/librevenge/RVNGString.h
@@ -21,12 +21,14 @@
 #ifndef RVNGSTRING_H
 #define RVNGSTRING_H
 
+#include "librevenge-api.h"
+
 namespace librevenge
 {
 
 class RVNGStringImpl;
 
-class RVNGString
+class REVENGE_API RVNGString
 {
 public:
 	RVNGString();
@@ -116,7 +118,7 @@ public:
 		return !operator<=(str);
 	}
 
-	class Iter
+	class REVENGE_API Iter
 	{
 	public:
 		Iter(const RVNGString &str);
--- a/inc/librevenge/RVNGStringVector.h
+++ b/inc/librevenge/RVNGStringVector.h
@@ -20,6 +20,8 @@
 #ifndef RVNGSTRINGVECTOR_H
 #define RVNGSTRINGVECTOR_H
 
+#include "librevenge-api.h"
+
 #include "RVNGString.h"
 
 namespace librevenge
@@ -27,7 +29,7 @@ namespace librevenge
 
 class RVNGStringVectorImpl;
 
-class RVNGStringVector
+class REVENGE_API RVNGStringVector
 {
 public:
 	RVNGStringVector();
--- /dev/null
+++ b/inc/librevenge/librevenge-api.h
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* librevenge
+ * Version: MPL 2.0 / LGPLv2.1+
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2002 William Lachance (wrlach@gmail.com)
+ * Copyright (C) 2002 Marc Maurer (uwog@uwog.net)
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms
+ * of the GNU Lesser General Public License Version 2.1 or later
+ * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
+ * applicable instead of those above.
+ */
+
+#ifndef INCLUDED_LIBREVENGE_LIBREVENGE_API_H
+#define INCLUDED_LIBREVENGE_LIBREVENGE_API_H
+
+#ifdef DLL_EXPORT
+#ifdef LIBREVENGE_BUILD
+#define REVENGE_API __declspec(dllexport)
+#else
+#define REVENGE_API __declspec(dllimport)
+#endif
+#else
+#define REVENGE_API
+#endif
+
+#endif /* INCLUDED_LIBREVENGE_LIBREVENGE_API_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1,5 @@
-SUBDIRS = lib test
+SUBDIRS = lib
+
+if ENABLE_TESTS
+SUBDIRS += test
+endif
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -19,6 +19,7 @@ lib_LTLIBRARIES = librevenge-@RVNG_MAJOR_VERSION@.@RVNG_MINOR_VERSION@.la
 librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_includedir = $(includedir)/librevenge-@RVNG_MAJOR_VERSION@.@RVNG_MINOR_VERSION@/librevenge
 librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_include_HEADERS = \
 	$(top_srcdir)/inc/librevenge/librevenge.h \
+	$(top_srcdir)/inc/librevenge/librevenge-api.h \
 	$(top_srcdir)/inc/librevenge/RVNGBinaryData.h \
 	$(top_srcdir)/inc/librevenge/RVNGDrawingInterface.h \
 	$(top_srcdir)/inc/librevenge/RVNGPresentationInterface.h \
@@ -31,8 +32,9 @@ librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_include_HEADERS = \
 	$(top_srcdir)/inc/librevenge/RVNGSVGDrawingGenerator.h \
 	$(top_srcdir)/inc/librevenge/RVNGTextInterface.h
 
-AM_CXXFLAGS = -I$(top_srcdir)/inc $(DEBUG_CXXFLAGS) $(ZLIB_CFLAGS) $(BOOST_CFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(DEBUG_CXXFLAGS) $(ZLIB_CFLAGS)
 
+librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_CPPFLAGS = -DLIBREVENGE_BUILD
 librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LIBADD  = @LIBREVENGE_WIN32_RESOURCE@
 librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_DEPENDENCIES = @LIBREVENGE_WIN32_RESOURCE@
 librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)
@@ -68,6 +70,7 @@ lib_LTLIBRARIES += librevenge-generators-@RVNG_MAJOR_VERSION@.@RVNG_MINOR_VERSIO
 librevenge_generators_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_includedir = $(includedir)/librevenge-@RVNG_MAJOR_VERSION@.@RVNG_MINOR_VERSION@/librevenge-generators
 librevenge_generators_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_include_HEADERS = \
 	$(top_srcdir)/inc/librevenge-generators/librevenge-generators.h \
+	$(top_srcdir)/inc/librevenge-generators/librevenge-generators-api.h \
 	$(top_srcdir)/inc/librevenge-generators/RVNGCSVSpreadsheetGenerator.h \
 	$(top_srcdir)/inc/librevenge-generators/RVNGHTMLTextGenerator.h \
 	$(top_srcdir)/inc/librevenge-generators/RVNGRawDrawingGenerator.h \
@@ -80,6 +83,7 @@ librevenge_generators_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_include_HEADERS
 	$(top_srcdir)/inc/librevenge-generators/RVNGTextSpreadsheetGenerator.h \
 	$(top_srcdir)/inc/librevenge-generators/RVNGTextTextGenerator.h
 
+librevenge_generators_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_CPPFLAGS = -DLIBREVENGE_GENERATORS_BUILD
 librevenge_generators_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LIBADD  = ./librevenge-@RVNG_MAJOR_VERSION@.@RVNG_MINOR_VERSION@.la @LIBREVENGE_GENERATORS_WIN32_RESOURCE@
 librevenge_generators_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_DEPENDENCIES = ./librevenge-@RVNG_MAJOR_VERSION@.@RVNG_MINOR_VERSION@.la @LIBREVENGE_GENERATORS_WIN32_RESOURCE@
 librevenge_generators_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)
@@ -123,13 +127,15 @@ lib_LTLIBRARIES += librevenge-stream-@RVNG_MAJOR_VERSION@.@RVNG_MINOR_VERSION@.l
 librevenge_stream_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_includedir = $(includedir)/librevenge-@RVNG_MAJOR_VERSION@.@RVNG_MINOR_VERSION@/librevenge-stream
 librevenge_stream_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_include_HEADERS = \
 	$(top_srcdir)/inc/librevenge-stream/librevenge-stream.h \
+	$(top_srcdir)/inc/librevenge-stream/librevenge-stream-api.h \
 	$(top_srcdir)/inc/librevenge-stream/RVNGDirectoryStream.h \
 	$(top_srcdir)/inc/librevenge-stream/RVNGStream.h \
 	$(top_srcdir)/inc/librevenge-stream/RVNGStreamImplementation.h
 
-librevenge_stream_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LIBADD  = $(ZLIB_LIBS) $(BOOST_FILESYSTEM_LIB) @LIBREVENGE_STREAM_WIN32_RESOURCE@
+librevenge_stream_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_CPPFLAGS  = -DLIBREVENGE_STREAM_BUILD
+librevenge_stream_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LIBADD  = $(ZLIB_LIBS) @LIBREVENGE_STREAM_WIN32_RESOURCE@
 librevenge_stream_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_DEPENDENCIES = @LIBREVENGE_STREAM_WIN32_RESOURCE@
-librevenge_stream_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = $(BOOST_LDGFLAGS) $(version_info) -export-dynamic $(no_undefined)
+librevenge_stream_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)
 librevenge_stream_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_SOURCES = \
 	RVNGStreamImplementation.cpp \
 	RVNGDirectoryStream.cpp \
--- a/src/lib/RVNGDirectoryStream.cpp
+++ b/src/lib/RVNGDirectoryStream.cpp
@@ -19,44 +19,100 @@
  * applicable instead of those above.
  */
 
-#ifndef BOOST_SYSTEM_NO_DEPRECATED
-#define BOOST_SYSTEM_NO_DEPRECATED 1
-#endif
-#include <boost/filesystem.hpp>
-
+#include <sys/stat.h>
+#include <string>
+#include <vector>
+#include <boost/algorithm/string.hpp>
 #include <librevenge-stream/librevenge-stream.h>
 
-namespace fs = boost::filesystem;
-
 namespace librevenge
 {
 
 namespace
 {
 
-struct NotADirectoryException
+static void sanitizePath(std::string &str)
 {
-};
+	boost::algorithm::replace_all(str, "\\", "/");
+	boost::algorithm::trim_right_if(str, boost::is_any_of("/ "));
+}
+
+static std::string composePath(const std::vector<std::string> &splitPath, std::vector<std::string>::size_type elementCount)
+{
+	std::string path;
+	for (std::vector<std::string>::size_type i=0; i < splitPath.size() && i < elementCount; ++i)
+	{
+		path.append(splitPath[i]);
+		path.append("/");
+	}
+	sanitizePath(path);
+	return path;
+}
+
+static bool isReg(const char *const path)
+{
+	struct stat statBuf;
+	if (stat(path, &statBuf))
+		return false;
+	if (S_ISREG(statBuf.st_mode))
+		return true;
+#ifndef _WIN32
+	else if (S_ISLNK(statBuf.st_mode))
+	{
+		if (lstat(path, &statBuf))
+			return false;
+		if (S_ISREG(statBuf.st_mode))
+			return true;
+	}
+#endif
+	return false;
+}
+
+static bool isDir(const char *const path)
+{
+	struct stat statBuf;
+	if (stat(path, &statBuf))
+		return false;
+	if (S_ISDIR(statBuf.st_mode))
+		return true;
+#ifndef _WIN32
+	else if (S_ISLNK(statBuf.st_mode))
+	{
+		if (lstat(path, &statBuf))
+			return false;
+		if (S_ISDIR(statBuf.st_mode))
+			return true;
+	}
+#endif
+	return false;
+}
 
 }
 
 struct RVNGDirectoryStreamImpl
 {
-	fs::path path;
+	std::vector<std::string> m_splitPath;
 
-	RVNGDirectoryStreamImpl(const char *path_);
+	RVNGDirectoryStreamImpl(const char *path);
 };
 
-RVNGDirectoryStreamImpl::RVNGDirectoryStreamImpl(const char *const path_)
-	: path(path_)
+RVNGDirectoryStreamImpl::RVNGDirectoryStreamImpl(const char *const path)
+	: m_splitPath()
 {
+	std::string pathName(path);
+	sanitizePath(pathName);
+	boost::algorithm::split(m_splitPath, pathName, boost::is_any_of("/"));
 }
 
 RVNGDirectoryStream::RVNGDirectoryStream(const char *const path)
-	: m_impl(new RVNGDirectoryStreamImpl(path))
+	: m_impl(0)
 {
-	if (!is_directory(m_impl->path))
+	if (isDir(path))
+		m_impl = new RVNGDirectoryStreamImpl(path);
+#if 0
+	else
 		throw NotADirectoryException();
+#endif
 }
 
 RVNGDirectoryStream::~RVNGDirectoryStream()
@@ -66,15 +122,18 @@ RVNGDirectoryStream::~RVNGDirectoryStream()
 
 RVNGDirectoryStream *RVNGDirectoryStream::createForParent(const char *const path)
 {
-	fs::path parent(path);
-	parent.remove_filename();
+	std::string parent(path);
+	sanitizePath(parent);
+	std::vector<std::string> splitParent;
+	boost::algorithm::split(splitParent, parent, boost::is_any_of("/"));
+	parent = composePath(splitParent, splitParent.size() ? splitParent.size() - 1 : 0);
 
-	return new RVNGDirectoryStream(parent.string().c_str());
+	return new RVNGDirectoryStream(parent.c_str());
 }
 
 bool RVNGDirectoryStream::isDirectory(const char *const path)
 {
-	return fs::is_directory(path);
+	return isDir(path);
 }
 
 bool RVNGDirectoryStream::isStructured()
@@ -97,21 +156,33 @@ const char *RVNGDirectoryStream::subStreamName(unsigned id)
 
 bool RVNGDirectoryStream::existsSubStream(const char *name)
 {
-	const fs::path path = m_impl->path / name;
+	if (!m_impl)
+		return false;
+	std::string path(name);
+	sanitizePath(path);
+	std::vector<std::string> splitPath;
+	boost::algorithm::split(splitPath, path, boost::is_any_of("/"));
+	splitPath.insert(splitPath.begin(), m_impl->m_splitPath.begin(), m_impl->m_splitPath.end());
+	path = composePath(splitPath, splitPath.size());
+	return isReg(path.c_str());
 
-	if (is_regular_file(path))
-		return true;
-	return false;
 }
 
 RVNGInputStream *RVNGDirectoryStream::getSubStreamByName(const char *const name)
 {
-	const fs::path path = m_impl->path / name;
-
-	if (is_regular_file(path))
-		return new RVNGFileStream(path.string().c_str());
-	else if (is_directory(path))
-		return new RVNGDirectoryStream(path.string().c_str());
+	if (!m_impl)
+		return 0;
+	std::string path(name);
+	sanitizePath(path);
+	std::vector<std::string> splitPath;
+	boost::algorithm::split(splitPath, path, boost::is_any_of("/"));
+	splitPath.insert(splitPath.begin(), m_impl->m_splitPath.begin(), m_impl->m_splitPath.end());
+	path = composePath(splitPath, splitPath.size());
+
+	if (isReg(path.c_str()))
+		return new RVNGFileStream(path.c_str());
+	else if (isDir(path.c_str()))
+		return new RVNGDirectoryStream(path.c_str());
 
 	return 0;
 }
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -2,15 +2,15 @@ target_test = test
 
 check_PROGRAMS = $(target_test)
 
-AM_CXXFLAGS = -I$(top_srcdir)/inc -I$(top_srcdir)/src/lib $(BOOST_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc -I$(top_srcdir)/src/lib $(CPPUNIT_CFLAGS) $(DEBUG_CXXFLAGS)
 
 test_CPPFLAGS = -DRVNG_DIRECTORY_STREAM_TEST_DIR=\"$(top_srcdir)/inc/librevenge-stream\"
-test_LDFLAGS = -L../lib `cppunit-config --libs` $(BOOST_LDGFLAGS)
+test_LDFLAGS = -L../lib
 test_LDADD = \
 	../lib/librevenge-@RVNG_MAJOR_VERSION@.@RVNG_MINOR_VERSION@.la \
 	../lib/librevenge-stream-@RVNG_MAJOR_VERSION@.@RVNG_MINOR_VERSION@.la \
-	$(LIBREVENGE_LIBS) \
-	$(BOOST_FILESYSTEM_LIB)
+	$(CPPUNIT_LIBS) \
+	$(LIBREVENGE_LIBS)
 
 test_SOURCES = \
 	RVNGBinaryDataTest.cpp \
--- a/src/test/RVNGBinaryDataTest.cpp
+++ b/src/test/RVNGBinaryDataTest.cpp
@@ -17,13 +17,13 @@
 #include <string>
 
 #include <librevenge/librevenge.h>
+#include <librevenge-stream/librevenge-stream.h>
 
 #include "librevenge_internal.h"
 
 #include "RVNGBinaryDataTest.h"
 
-using librevenge::RVNGBinaryData;
-using librevenge::RVNGString;
+using namespace librevenge;
 
 using std::equal;
 using std::strlen;
@@ -101,19 +101,19 @@ void RVNGBinaryDataTest::testConstruction()
 	const unsigned char input[] = "hello world";
 	const size_t len = RVNG_NUM_ELEMENTS(input);
 	RVNGBinaryData data(input, len);
-	CPPUNIT_ASSERT_EQUAL(len, data.size());
+	CPPUNIT_ASSERT_EQUAL(static_cast<unsigned long>(len), data.size());
 	CPPUNIT_ASSERT(!data.empty());
 	CPPUNIT_ASSERT(equal(input, input + len, data.getDataBuffer()));
 
 	{
 		// copy construction
 		RVNGBinaryData copy(data);
-		CPPUNIT_ASSERT_EQUAL(len, copy.size());
+		CPPUNIT_ASSERT_EQUAL(static_cast<unsigned long>(len), copy.size());
 		CPPUNIT_ASSERT(equal(input, input + len, copy.getDataBuffer()));
 	}
 	// COW: destruction of a copy does not touch the original
 	// this should be tested under valgrind
-	CPPUNIT_ASSERT_EQUAL(len, data.size());
+	CPPUNIT_ASSERT_EQUAL(static_cast<unsigned long>(len), data.size());
 	CPPUNIT_ASSERT(equal(input, input + len, data.getDataBuffer()));
 
 	// assignment
@@ -121,7 +121,7 @@ void RVNGBinaryDataTest::testConstruction()
 	CPPUNIT_ASSERT_EQUAL(0ul, assign.size());
 	CPPUNIT_ASSERT(assign.empty());
 	assign = data;
-	CPPUNIT_ASSERT_EQUAL(len, assign.size());
+	CPPUNIT_ASSERT_EQUAL(static_cast<unsigned long>(len), assign.size());
 	CPPUNIT_ASSERT(!assign.empty());
 	CPPUNIT_ASSERT(equal(input, input + len, assign.getDataBuffer()));
 
@@ -148,7 +148,7 @@ void RVNGBinaryDataTest::testAppend()
 	CPPUNIT_ASSERT_EQUAL(static_cast<unsigned char>('h'), data.getDataBuffer()[0]);
 
 	data2.append(input + 1, len - 1);
-	CPPUNIT_ASSERT_EQUAL(len, data2.size());
+	CPPUNIT_ASSERT_EQUAL(static_cast<unsigned long>(len), data2.size());
 	CPPUNIT_ASSERT(equal(input, input + len, data2.getDataBuffer()));
 	// again, the original is unchanged
 	CPPUNIT_ASSERT_EQUAL(1ul, data.size());
@@ -189,7 +189,44 @@ void RVNGBinaryDataTest::testBase64()
 
 void RVNGBinaryDataTest::testStream()
 {
-	// TODO: implement me
+	RVNGBinaryData data((const unsigned char *)("\1\2\3\4\0\5\6\7"), 8);
+	RVNGInputStream *input = const_cast<RVNGInputStream *>(data.getDataStream());
+	unsigned long numBytesRead = 0;
+
+	CPPUNIT_ASSERT_EQUAL(false, input->isStructured());
+	CPPUNIT_ASSERT_EQUAL((RVNGInputStream *) NULL, input->getSubStreamByName("foo"));
+
+	// test read()
+	input->seek(0, RVNG_SEEK_SET);
+	CPPUNIT_ASSERT(NULL == input->read(0, numBytesRead));
+	CPPUNIT_ASSERT_EQUAL((unsigned long) 0, numBytesRead);
+	CPPUNIT_ASSERT_EQUAL((long) 0 , input->tell());
+	CPPUNIT_ASSERT(NULL != input->read(1, numBytesRead));
+	CPPUNIT_ASSERT_EQUAL((long) 1 , input->tell());
+
+	input->seek(0, RVNG_SEEK_SET);
+	CPPUNIT_ASSERT(NULL != input->read(50, numBytesRead));
+	CPPUNIT_ASSERT_EQUAL((long) 8 , input->tell());
+
+	// test seek(), tell(), isEnd()
+	input->seek(1, RVNG_SEEK_SET);
+	CPPUNIT_ASSERT_EQUAL((long) 1 , input->tell());
+
+	input->seek(0, RVNG_SEEK_SET);
+	CPPUNIT_ASSERT_EQUAL((long) 0 , input->tell());
+
+	input->seek(8, RVNG_SEEK_SET);
+	CPPUNIT_ASSERT_EQUAL((long) 8 , input->tell());
+
+	input->seek(-1, RVNG_SEEK_SET);
+	CPPUNIT_ASSERT_EQUAL((long) 0, input->tell());
+
+	input->seek(8, RVNG_SEEK_SET);
+	CPPUNIT_ASSERT_EQUAL(true, input->isEnd());
+
+	input->seek(10000, RVNG_SEEK_SET);
+	CPPUNIT_ASSERT(10000 != input->tell());
+	CPPUNIT_ASSERT(input->isEnd());
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(RVNGBinaryDataTest);
--- a/src/test/RVNGDirectoryStreamTest.cpp
+++ b/src/test/RVNGDirectoryStreamTest.cpp
@@ -12,10 +12,10 @@
  * applicable instead of those above.
  */
 
-#ifndef BOOST_SYSTEM_NO_DEPRECATED
-#define BOOST_SYSTEM_NO_DEPRECATED 1
-#endif
-#include <boost/filesystem.hpp>
+#include <sys/stat.h>
+#include <string>
+#include <vector>
+
 #include <boost/scoped_ptr.hpp>
 
 #include <librevenge-stream/librevenge-stream.h>
@@ -40,8 +40,6 @@
     CPPUNIT_ASSERT_MESSAGE(#expression " did not throw an exception", thrown); \
 }
 
-namespace fs = boost::filesystem;
-
 using boost::scoped_ptr;
 
 using librevenge::RVNGDirectoryStream;
@@ -57,17 +55,67 @@ static const char TEST_DIR[] = RVNG_DIRECTORY_STREAM_TEST_DIR;
 static const char TEST_FILENAME[] = "RVNGDirectoryStream.h";
 static const char TEST_NONEXISTENT[] = "foobar";
 
+bool isReg(const char *const path)
+{
+	struct stat statBuf;
+	if (stat(path, &statBuf))
+		return false;
+	if (S_ISREG(statBuf.st_mode))
+		return true;
+#ifndef _WIN32
+	else if (S_ISLNK(statBuf.st_mode))
+	{
+		if (lstat(path, &statBuf))
+			return false;
+		if (S_ISREG(statBuf.st_mode))
+			return true;
+	}
+#endif
+	return false;
+}
+
+bool isDir(const char *const path)
+{
+	struct stat statBuf;
+	if (stat(path, &statBuf))
+		return false;
+	if (S_ISDIR(statBuf.st_mode))
+		return true;
+#ifndef _WIN32
+	else if (S_ISLNK(statBuf.st_mode))
+	{
+		if (lstat(path, &statBuf))
+			return false;
+		if (S_ISDIR(statBuf.st_mode))
+			return true;
+	}
+#endif
+	return false;
+}
+
+bool exists(const char *const path)
+{
+	struct stat statBuf;
+	if (stat(path, &statBuf))
+		return false;
+	return true;
+}
+
 }
 
 RVNGDirectoryStreamTest::RVNGDirectoryStreamTest()
 	: m_dir(TEST_DIR)
-	, m_file((fs::path(m_dir) / TEST_FILENAME).string())
-	, m_nonexistent((fs::path(m_dir) / TEST_NONEXISTENT).string())
+	, m_file(TEST_DIR)
+	, m_nonexistent(TEST_DIR)
 {
+	m_file.append("/");
+	m_file.append(TEST_FILENAME);
+	m_nonexistent.append("/");
+	m_nonexistent.append(TEST_NONEXISTENT);
 	// sanity check
-	assert(fs::is_directory(m_dir));
-	assert(fs::is_regular_file(m_file));
-	assert(!fs::exists(m_nonexistent));
+	assert(isDir(m_dir.c_str()));
+	assert(isReg(m_file.c_str()));
+	assert(!exists(m_nonexistent.c_str()));
 }
 
 void RVNGDirectoryStreamTest::setUp()
diff --git a/src/test/RVNGStreamTest.cpp b/src/test/RVNGStreamTest.cpp
index 52210ce..cea2886 100644
--- a/src/test/RVNGStreamTest.cpp
+++ b/src/test/RVNGStreamTest.cpp
@@ -92,47 +92,6 @@ void RVNGStreamTest::testFileStream()
 	CPPUNIT_ASSERT(input->isEnd());
 }
 
-void RVNGStreamTest::testMemoryInputStream()
-{
-	scoped_ptr<RVNGInputStream> input(new RVNGMemoryInputStream((unsigned char *)("\1\2\3\4\0\5\6\7"), 8));
-	unsigned long numBytesRead = 0;
-
-	CPPUNIT_ASSERT_EQUAL(false, input->isStructured());
-	CPPUNIT_ASSERT_EQUAL((RVNGInputStream *) NULL, input->getSubStreamByName("foo"));
-
-	// test read()
-	input->seek(0, RVNG_SEEK_SET);
-	CPPUNIT_ASSERT(NULL == input->read(0, numBytesRead));
-	CPPUNIT_ASSERT_EQUAL((unsigned long) 0, numBytesRead);
-	CPPUNIT_ASSERT_EQUAL((long) 0 , input->tell());
-	CPPUNIT_ASSERT(NULL != input->read(1, numBytesRead));
-	CPPUNIT_ASSERT_EQUAL((long) 1 , input->tell());
-
-	input->seek(0, RVNG_SEEK_SET);
-	CPPUNIT_ASSERT(NULL != input->read(50, numBytesRead));
-	CPPUNIT_ASSERT_EQUAL((long) 8 , input->tell());
-
-	// test seek(), tell(), isEnd()
-	input->seek(1, RVNG_SEEK_SET);
-	CPPUNIT_ASSERT_EQUAL((long) 1 , input->tell());
-
-	input->seek(0, RVNG_SEEK_SET);
-	CPPUNIT_ASSERT_EQUAL((long) 0 , input->tell());
-
-	input->seek(8, RVNG_SEEK_SET);
-	CPPUNIT_ASSERT_EQUAL((long) 8 , input->tell());
-
-	input->seek(-1, RVNG_SEEK_SET);
-	CPPUNIT_ASSERT_EQUAL((long) 0, input->tell());
-
-	input->seek(8, RVNG_SEEK_SET);
-	CPPUNIT_ASSERT_EQUAL(true, input->isEnd());
-
-	input->seek(10000, RVNG_SEEK_SET);
-	CPPUNIT_ASSERT(10000 != input->tell());
-	CPPUNIT_ASSERT(input->isEnd());
-}
-
 void RVNGStreamTest::testStringStream()
 {
 	scoped_ptr<RVNGInputStream> input(new RVNGStringStream((const unsigned char *)"\1\2\3\4\0\5\6\7", 8));
--- a/src/test/RVNGStreamTest.h
+++ b/src/test/RVNGStreamTest.h
@@ -30,7 +30,6 @@ public:
 private:
 	CPPUNIT_TEST_SUITE(RVNGStreamTest);
 	CPPUNIT_TEST(testFileStream);
-	CPPUNIT_TEST(testMemoryInputStream);
 	CPPUNIT_TEST(testStringStream);
 	CPPUNIT_TEST_SUITE_END();
 
--- a/src/test/RVNGStringTest.cpp
+++ b/src/test/RVNGStringTest.cpp
@@ -118,27 +118,27 @@ void RVNGStringTest::testConstruction()
 	const char input[] = "hello world";
 	const size_t len = RVNG_NUM_ELEMENTS(input) - 1;
 	RVNGString str(input);
-	CPPUNIT_ASSERT_EQUAL(len, str.size());
+	CPPUNIT_ASSERT_EQUAL(static_cast<unsigned long>(len), str.size());
 	CPPUNIT_ASSERT_EQUAL(int(len), str.len());
 	CPPUNIT_ASSERT(equal(input, input + len, str.cstr()));
 
 	// copy construction
 	RVNGString copy(str);
-	CPPUNIT_ASSERT_EQUAL(len, copy.size());
+	CPPUNIT_ASSERT_EQUAL(static_cast<unsigned long>(len), copy.size());
 	CPPUNIT_ASSERT_EQUAL(int(len), copy.len());
 	CPPUNIT_ASSERT(equal(input, input + len, copy.cstr()));
 
 	// assignment
 	RVNGString assign;
 	assign = str;
-	CPPUNIT_ASSERT_EQUAL(len, assign.size());
+	CPPUNIT_ASSERT_EQUAL(static_cast<unsigned long>(len), assign.size());
 	CPPUNIT_ASSERT_EQUAL(int(len), assign.len());
 	CPPUNIT_ASSERT(equal(input, input + len, assign.cstr()));
 
 	// assignment from C string
 	RVNGString assign2;
 	assign2 = input;
-	CPPUNIT_ASSERT_EQUAL(len, assign.size());
+	CPPUNIT_ASSERT_EQUAL(static_cast<unsigned long>(len), assign.size());
 	CPPUNIT_ASSERT_EQUAL(int(len), assign.len());
 	CPPUNIT_ASSERT(equal(input, input + len, assign.cstr()));
 }
@@ -164,7 +164,7 @@ void RVNGStringTest::testAppend()
 
 	// appending a C string
 	str2.append(input + 1);
-	CPPUNIT_ASSERT_EQUAL(len, str2.size());
+	CPPUNIT_ASSERT_EQUAL(static_cast<unsigned long>(len), str2.size());
 	CPPUNIT_ASSERT_EQUAL(int(len), str2.len());
 	CPPUNIT_ASSERT(equal(input, input + len, str2.cstr()));
 }

Places

File librevenge-0.0.0-cumulated.patch of Package mingw32-librevenge (Revision fef63f075c68f0e78b9aa0953867d051)

Places