Merge branch 'master' into v0.6.0

# Conflicts:
#	src/ifcconvert/IfcConvert.cpp
#	src/ifcgeom/IfcGeomRenderStyles.cpp
#	src/ifcgeom/IfcGeomWires.cpp
#	src/ifcparse/IfcLogger.cpp
#	src/ifcparse/IfcLogger.h
#	src/ifcparse/IfcParse.cpp
#	src/ifcparse/IfcUtil.cpp
#	src/serializers/ColladaSerializer.cpp
#	src/serializers/schema_dependent/XmlSerializer.cpp

src/serializers/ColladaSerializer.cpp

@@ -34,6 +34,8 @@
 #include <string>
 #include <cmath>
 
+#include "../ifcparse/utils.h"
+
 static std::string& collada_id(std::string& s)
 {
     IfcUtil::sanitate_material_name(s);

src/serializers/ColladaSerializer.h

@@ -198,7 +198,7 @@ private:
 		ColladaExporter(const std::string& scene_name, const std::string& fn, ColladaSerializer *_serializer,
             bool double_precision)
             : filename(fn)
-            , stream(filename, double_precision)
+            , stream(COLLADASW::NativeString(filename.c_str(), COLLADASW::NativeString::ENCODING_UTF8), double_precision)
 			, scene(scene_name, stream, _serializer)
 			, materials(stream, _serializer)
 			, geometries(stream, _serializer)

src/serializers/OpenCascadeBasedSerializer.cpp

@@ -17,6 +17,10 @@
  *                                                                              *
  ********************************************************************************/
 
+#include "OpenCascadeBasedSerializer.h"
+
+#include "../ifcparse/utils.h"
+
 #include <string>
 #include <fstream>
 #include <cstdio>
@@ -24,13 +28,11 @@
 #include <Standard_Version.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
 
-#include "OpenCascadeBasedSerializer.h"
-
 bool OpenCascadeBasedSerializer::ready() {
-	std::ofstream test_file(out_filename.c_str(), std::ios_base::binary);
+	std::ofstream test_file(IfcUtil::path::from_utf8(out_filename).c_str(), std::ios_base::binary);
 	bool succeeded = test_file.is_open();
 	test_file.close();
-	remove(out_filename.c_str());
+	IfcUtil::path::delete_file(out_filename);
 	return succeeded;
 }
 

src/serializers/SvgSerializer.h

@@ -25,6 +25,8 @@
 #include "../serializers/GeometrySerializer.h"
 #include "../serializers/util.h"
 
+#include "../ifcparse/utils.h"
+
 #include <sstream>
 #include <string>
 #include <limits>
@@ -46,7 +48,7 @@ protected:
 public:
 	SvgSerializer(const std::string& out_filename, const SerializerSettings& settings)
 		: GeometrySerializer(settings)
-		, svg_file(out_filename.c_str())
+		, svg_file(IfcUtil::path::from_utf8(out_filename).c_str())
 		, xmin(+std::numeric_limits<double>::infinity())
 		, ymin(+std::numeric_limits<double>::infinity())
 		, xmax(-std::numeric_limits<double>::infinity())

src/serializers/WavefrontObjSerializer.cpp

@@ -22,9 +22,22 @@
 
 #include "../ifcgeom_schema_agnostic/IfcGeomRenderStyles.h"
 
+#include "../ifcparse/utils.h"
+
 #include <boost/lexical_cast.hpp>
 #include <iomanip>
 
+WaveFrontOBJSerializer::WaveFrontOBJSerializer(const std::string& obj_filename, const std::string& mtl_filename, const SerializerSettings& settings)
+	: GeometrySerializer(settings)
+	, mtl_filename(mtl_filename)
+	, obj_stream(IfcUtil::path::from_utf8(obj_filename).c_str())
+	, mtl_stream(IfcUtil::path::from_utf8(mtl_filename).c_str())
+	, vcount_total(1)
+{
+	obj_stream << std::setprecision(settings.precision);
+	mtl_stream << std::setprecision(settings.precision);
+}
+
 bool WaveFrontOBJSerializer::ready() {
 	return obj_stream.is_open() && mtl_stream.is_open();
 }

src/serializers/WavefrontObjSerializer.h

@@ -35,17 +35,7 @@ private:
 	unsigned int vcount_total;
 	std::set<std::string> materials;
 public:
-	WaveFrontOBJSerializer(const std::string& obj_filename, const std::string& mtl_filename, const SerializerSettings& settings)
-		: GeometrySerializer(settings)
-		, mtl_filename(mtl_filename)
-		, obj_stream(obj_filename.c_str())
-		, mtl_stream(mtl_filename.c_str())
-		, vcount_total(1)
-    {
-        obj_stream << std::setprecision(settings.precision);
-        mtl_stream << std::setprecision(settings.precision);
-    }
-
+	WaveFrontOBJSerializer(const std::string& obj_filename, const std::string& mtl_filename, const SerializerSettings& settings);
 	virtual ~WaveFrontOBJSerializer() {}
 	bool ready();
 	void writeHeader();

src/serializers/schema_dependent/XmlSerializer.cpp

@@ -17,8 +17,6 @@
 *                                                                              *
 ********************************************************************************/
 
-#include <map>
-
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/version.hpp>
@@ -30,6 +28,7 @@
 
 #include "../../ifcparse/IfcSIPrefix.h"
 #include "../../ifcgeom/IfcGeom.h"
+#include "../../ifcparse/utils.h"
 
 using boost::property_tree::ptree;
 
@@ -549,5 +548,7 @@ void MAKE_TYPE_NAME(XmlSerializer)::finalize() {
 #else
 	boost::property_tree::xml_writer_settings<char> settings('\t', 1);
 #endif
-	boost::property_tree::write_xml(xml_filename, root, std::locale(), settings);
+	
+	std::ofstream f(IfcUtil::path::from_utf8(xml_filename).c_str());
+	boost::property_tree::write_xml(f, root, settings);
 }