Merge pull request #29 from Tridify/win_build_script_improvements

Windows build script improvements

src/examples/IfcOpenHouse.cpp

@@ -41,6 +41,10 @@
 #include "../ifcparse/IfcHierarchyHelper.h"
 #include "../ifcgeom/IfcGeom.h"
 
+#if USE_VLD
+#include <vld.h>
+#endif
+
 // Some convenience typedefs and definitions. 
 typedef std::string S;
 typedef IfcParse::IfcGlobalId guid;

src/examples/IfcParseExamples.cpp

@@ -19,6 +19,10 @@
 
 #include "../ifcparse/IfcFile.h"
 
+#if USE_VLD
+#include <vld.h>
+#endif
+
 using namespace IfcSchema;
 
 int main(int argc, char** argv) {

src/ifcconvert/IfcConvert.cpp

@@ -46,6 +46,10 @@
 #include <IGESControl_Controller.hxx>
 #include <Standard_Version.hxx>
 
+#if USE_VLD
+#include <vld.h>
+#endif
+
 static std::string DEFAULT_EXTENSION = "obj";
 
 void printVersion() {

src/ifcgeom/IfcGeomFunctions.cpp

@@ -1275,8 +1275,7 @@ std::pair<std::string, double> IfcGeom::Kernel::initializeUnits(IfcSchema::IfcUn
 }
 
 const IfcSchema::IfcRepresentationItem* IfcGeom::Kernel::find_item_carrying_style(const IfcSchema::IfcRepresentationItem* item) {
-	IfcSchema::IfcStyledItem::list::ptr styles = item->StyledByItem();
-	if (styles->size()) {
+	if (item->StyledByItem()->size()) {
 		return item;
 	}
 
@@ -1284,9 +1283,7 @@ const IfcSchema::IfcRepresentationItem* IfcGeom::Kernel::find_item_carrying_styl
 		// All instantiations of IfcBooleanOperand (type of FirstOperand) are subtypes of
 		// IfcGeometricRepresentationItem
 		item = (IfcSchema::IfcGeometricRepresentationItem*) ((IfcSchema::IfcBooleanClippingResult*) item)->FirstOperand();
-
-		IfcSchema::IfcStyledItem::list::ptr styles = item->StyledByItem();
-		if (styles->size()) {
+		if (item->StyledByItem()->size()) {
 			return item;
 		}
 	}
@@ -1297,4 +1294,4 @@ const IfcSchema::IfcRepresentationItem* IfcGeom::Kernel::find_item_carrying_styl
 	// distinctly styled union operands.
 
 	return item;
-}
+}

src/ifcgeomserver/IfcGeomServer.cpp

@@ -37,6 +37,10 @@
 
 #include "../ifcgeom/IfcGeomIterator.h"
 
+#if USE_VLD
+#include <vld.h>
+#endif
+
 using namespace boost;
 
 template <typename T>

src/ifcparse/IfcCharacterDecoder.cpp

@@ -118,6 +118,7 @@ IfcCharacterDecoder::~IfcCharacterDecoder() {
   destination = 0;
   converter = 0;
   compatibility_converter = 0;
+  ucnv_flushCache();
 #endif
 }
 IfcCharacterDecoder::operator std::string() {

src/ifcparse/IfcParse.cpp

@@ -127,6 +127,11 @@ IfcSpfStream::IfcSpfStream(void* data, int l) {
 	len = l;	
 }
 
+IfcSpfStream::~IfcSpfStream()
+{
+	Close();
+}
+
 void IfcSpfStream::Close() {
 #ifdef BUF_SIZE
 	if ( paging ) fclose(stream);

src/ifcparse/IfcParse.h

@@ -248,7 +248,7 @@ namespace IfcParse {
 		unsigned int offset;		
 		Entity(unsigned int i, IfcFile* t);
 		Entity(unsigned int i, IfcFile* t, unsigned int o);
-		~Entity();
+		virtual ~Entity();
 		IfcEntityList::ptr getInverse(IfcSchema::Type::Enum type, int attribute_index);
 		void Load(std::vector<unsigned int>& ids, bool seek=false) const;
 		Argument* getArgument (unsigned int i);

src/ifcparse/IfcSpfHeader.h

@@ -43,7 +43,7 @@ protected:
 		}
 	}
 
-	~HeaderEntity() {
+	virtual ~HeaderEntity() {
 		delete _list;
 	}
 
@@ -166,7 +166,14 @@ public:
 		_file_name = new FileName();
 		_file_schema = new FileSchema();
 	}
-	
+
+	~IfcSpfHeader()
+	{
+		delete _file_schema;
+		delete _file_name;
+		delete _file_description;
+	}
+
 	IfcSpfLexer* lexer() { return _lexer; }
 	void lexer(IfcSpfLexer* l) { _lexer = l; }
 

src/ifcparse/IfcSpfStream.h

@@ -64,6 +64,7 @@ namespace IfcParse {
 		IfcSpfStream(const std::string& fn);
 		IfcSpfStream(std::istream& f, int len);
 		IfcSpfStream(void* data, int len);
+		~IfcSpfStream();
 		/// Returns the character at the cursor 
 		char Peek();
 		/// Returns the character at specified offset