[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26442] trunk/lib/windows/opencollada: lib /windows: updated w32 OpenCollada libs and headers to revision 721.

Arystanbek Dyussenov arystan.d at gmail.com
Sat Jan 30 18:58:56 CET 2010 

Revision: 26442
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26442
Author:   kazanbas
Date:     2010-01-30 18:58:55 +0100 (Sat, 30 Jan 2010)

Log Message:
-----------
lib/windows: updated w32 OpenCollada libs and headers to revision 721.

Patch for building libs is included.

Old patch and build instructions were very helpful. Thanks Andrea and Nathan!

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=721

Modified Paths:
--------------
    trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABU.h
    trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUHashFunctions.h
    trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUURI.h
    trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUUtils.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFW.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnimation.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWArray.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWCamera.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWColorOrTexture.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWEdge.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWEffect.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWFileInfo.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWFormula.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWGeometry.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWILoader.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWImage.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWInstanceCamera.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWInstanceController.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWInstanceGeometry.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWInstanceLight.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWInstanceNode.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWInstanceSceneGraph.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWInstanceVisualScene.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWJoint.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWKinematicsController.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWKinematicsModel.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWLibraryNodes.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWLight.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWLinestrips.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWMaterial.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWMeshPrimitive.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWMeshPrimitiveWithFaceVertexCount.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWMorphController.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWNode.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWObject.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWPolygons.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWRoot.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWSampler.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWScene.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWSkinControllerData.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWTexture.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWTriangles.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWTrifans.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWTristrips.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWTypes.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWUniqueId.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWVisualScene.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLDocumentProcessor.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLFileLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLFilePartLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLFormulasLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLGeometryLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLIFilePartLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLIParserImpl.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLInputUnshared.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLJointsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsIntermediateData.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsSceneCreator.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryAnimationsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryArticulatedSystemsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryCamerasLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryControllersLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryEffectsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryImagesLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryJointsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryKinematicsModelsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryLightsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryMaterialsLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLibraryNodesLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLMeshLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLNodeLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLRootParser14.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLRootParser15.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSaxFWLError.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSceneLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSource.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLTypes.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLVersionParser.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLVertices.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLVisualSceneLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/generated14/COLLADASaxFWLColladaParserAutoGen14Private.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWEffectProfile.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWExtraTechnique.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWInstanceMaterial.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWLibraryGeometries.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWLibraryMaterials.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWStreamWriter.h
    trunk/lib/windows/opencollada/include/COLLADAStreamWriter/include/COLLADASWTechnique.h
    trunk/lib/windows/opencollada/include/GeneratedSaxParser/include/GeneratedSaxParser.h
    trunk/lib/windows/opencollada/include/GeneratedSaxParser/include/GeneratedSaxParserExpatSaxParser.h
    trunk/lib/windows/opencollada/include/GeneratedSaxParser/include/GeneratedSaxParserLibxmlSaxParser.h
    trunk/lib/windows/opencollada/include/GeneratedSaxParser/include/GeneratedSaxParserParserTemplateBase.h
    trunk/lib/windows/opencollada/include/GeneratedSaxParser/include/GeneratedSaxParserSaxParser.h
    trunk/lib/windows/opencollada/lib/GeneratedSaxParser.lib
    trunk/lib/windows/opencollada/lib/GeneratedSaxParser_d.lib
    trunk/lib/windows/opencollada/lib/MathMLSolver.lib
    trunk/lib/windows/opencollada/lib/MathMLSolver_d.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADABaseUtils.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADABaseUtils_d.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADAFramework.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADAFramework_d.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADASaxFrameworkLoader_d.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADAStreamWriter.lib
    trunk/lib/windows/opencollada/lib/OpenCOLLADAStreamWriter_d.lib
    trunk/lib/windows/opencollada/lib/UTF.lib
    trunk/lib/windows/opencollada/lib/UTF_d.lib
    trunk/lib/windows/opencollada/lib/pcre.lib
    trunk/lib/windows/opencollada/lib/pcre_d.lib
    trunk/lib/windows/opencollada/lib/xml2.lib
    trunk/lib/windows/opencollada/lib/xml2_d.lib

Added Paths:
-----------
    trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWInstanceBase.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWInstanceBindingBase.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWMaterialBinding.h
    trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWTextureCoordinateBinding.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLExtraDataElementHandler.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLExtraDataLoader.h
    trunk/lib/windows/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLIExtraDataCallbackHandler.h
    trunk/lib/windows/opencollada/lib/buffer.lib
    trunk/lib/windows/opencollada/lib/buffer_d.lib
    trunk/lib/windows/opencollada/lib/ftoa.lib
    trunk/lib/windows/opencollada/lib/ftoa_d.lib
    trunk/lib/windows/opencollada/msvc_debug_r721.patch

Modified: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABU.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABU.h	2010-01-30 17:49:32 UTC (rev 26441)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABU.h	2010-01-30 17:58:55 UTC (rev 26442)
@@ -17,7 +17,7 @@
 #include "COLLADABU.h"
 #include "COLLADABUException.h"
 #include "COLLADABUHashFunctions.h"
-#include "COLLADABUHashMap.h"
+#include "COLLADABUhash_map.h"
 #include "COLLADABUIDList.h"
 #include "COLLADABUNativeString.h"
 #include "COLLADABUPcreCompiledPattern.h"

Modified: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUHashFunctions.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUHashFunctions.h	2010-01-30 17:49:32 UTC (rev 26441)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUHashFunctions.h	2010-01-30 17:58:55 UTC (rev 26442)
@@ -1,34 +1,74 @@
-/*
-    Copyright (c) 2008-2009 NetAllied Systems GmbH
-
-    This file is part of COLLADABaseUtils.
-
-    Licensed under the MIT Open Source License,
-    for details please see LICENSE file or the website
-    http://www.opensource.org/licenses/mit-license.php
-*/
-
-#ifndef __COLLADABU_HASHFUNCTIONS_H__
-#define __COLLADABU_HASHFUNCTIONS_H__
-
-#include "COLLADABUPrerequisites.h"
-
-
-
-namespace COLLADABU
-{
-	class URI;
-
-
-	unsigned long calculateHash(const String& str);
-
-	unsigned long calculateHash(const char* str);
-
-	unsigned long calculateHash(const URI& uri);
-
-
-
-
-} // namespace COLLADABU
-
-#endif // __COLLADABU_HASHFUNCTIONS_H__
+/*
+    Copyright (c) 2008-2009 NetAllied Systems GmbH
+
+    This file is part of COLLADABaseUtils.
+
+    Licensed under the MIT Open Source License,
+    for details please see LICENSE file or the website
+    http://www.opensource.org/licenses/mit-license.php
+*/
+
+#ifndef __COLLADABU_HASHFUNCTIONS_H__
+#define __COLLADABU_HASHFUNCTIONS_H__
+
+#include "COLLADABUPrerequisites.h"
+#include "COLLADABUhash_map.h"
+
+#ifdef COLLADABU_HAVE_TR1_UNORDERED_MAP
+//#  include 
+#else
+#  ifdef COLLADABU_OS_LINUX
+#	include <ext/hash_fun.h>
+#   include "COLLADABUURI.h"
+#  elif (defined COLLADABU_OS_MAC)
+#	include <ext/hash_fun.h>
+#   include "COLLADABUURI.h"
+#  endif
+#endif
+
+namespace COLLADABU
+{
+	class URI;
+
+
+	size_t calculateHash(const String& str);
+
+	size_t calculateHash(const char* str);
+
+	size_t calculateHash(const URI& uri);
+	inline size_t calculateHashU(const URI& uri){
+		return calculateHash(uri);
+	}
+
+} // namespace COLLADABU
+
+#if defined(COLLADABU_HAVE_TR1_UNORDERED_MAP) || defined(COLLADABU_OS_LINUX) || defined(COLLADABU_OS_MAC)
+#if defined(COLLADABU_HAVE_TR1_UNORDERED_MAP)
+namespace std { namespace tr1
+#else
+namespace __gnu_cxx
+#endif
+{
+	template<>
+	struct hash<COLLADABU::URI>
+	{
+		size_t
+			operator()(const COLLADABU::URI& uri) const
+		{ return COLLADABU::calculateHash(uri); }
+	};
+/*
+	template<>
+	struct hash<COLLADAFW::UniqueId>
+	{
+		size_t
+			operator()(const COLLADAFW::UniqueId& uniqueId) const { return uniqueId; }
+	};
+*/
+#if defined(COLLADABU_HAVE_TR1_UNORDERED_MAP)
+}
+#endif
+} // namespace __gnu_cxx
+#endif
+
+
+#endif // __COLLADABU_HASHFUNCTIONS_H__

Modified: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUURI.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUURI.h	2010-01-30 17:49:32 UTC (rev 26441)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUURI.h	2010-01-30 17:58:55 UTC (rev 26442)
@@ -348,6 +348,9 @@
 		/* Comparison operator for use in maps.*/
 		bool operator<(const URI& rhs)const;
 
+		/** Conversion to size_t for usage in a hash map.*/
+		operator size_t() const;
+
     private:
 
 		/**

Modified: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUUtils.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUUtils.h	2010-01-30 17:49:32 UTC (rev 26441)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUUtils.h	2010-01-30 17:58:55 UTC (rev 26442)
@@ -166,7 +166,7 @@
          * @param String & separators
          * @param std::vector<String> & words
          */
-        static void split ( String& text, String& separators, std::vector<String>& words );
+        static void split ( const String& text, const String& separators, std::vector<String>& words );
 
 
     };

Added: trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h	                        (rev 0)
+++ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h	2010-01-30 17:58:55 UTC (rev 26442)
@@ -0,0 +1,75 @@
+/*
+     Copyright (c) 2008-2009 NetAllied Systems GmbH
+ 
+     This file is part of COLLADABaseUtils.
+ 
+     Licensed under the MIT Open Source License, 
+     for details please see LICENSE file or the website
+     http://www.opensource.org/licenses/mit-license.php
+ */
+
+#ifndef __COLLADABU_HASH_MAP_H__
+#define __COLLADABU_HASH_MAP_H__
+
+#include "COLLADABUPrerequisites.h"
+#include "COLLADABUPlatform.h"
+#define COLLADABU_HAVE_TR1_UNORDERED_MAP
+#ifndef WIN32
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
+#undef COLLADABU_HAVE_TR1_UNORDERED_MAP
+#else
+  #include <tr1/unordered_map>
+  #include <tr1/unordered_set>
+#endif
+#else
+#  undef COLLADABU_HAVE_TR1_UNORDERED_MAP
+/*
+#  if defined(_MSC_VER) && (_MSC_VER >= 1500) \
+   && defined(_MSC_FULL_VER) && \
+   !defined(__SGI_STL_PORT) && \
+   !defined(_STLPORT_VERSION) && \
+   !defined(_RWSTD_VER_STR) && \
+   !defined(_RWSTD_VER)
+*/
+#  if 0
+#    define COLLADABU_HAVE_TR1_UNORDERED_MAP
+#    include <unordered_map>
+#    include <unordered_set>
+#  endif
+#endif
+#ifndef COLLADABU_HAVE_TR1_UNORDERED_MAP
+#  if defined(COLLADABU_OS_LINUX) || defined(COLLADABU_OS_MAC)
+#	include <ext/hash_map>
+#	include <ext/hash_set>
+#  else
+#	include <hash_map>
+#	include <hash_set>
+#  endif
+#endif
+// file to include the hash map platform independent
+
+namespace COLLADABU
+{
+
+
+//#ifdef COLLADABU_HAVE_TR1_UNORDERED_MAP
+#if 0
+    using namespace std::tr1;
+    template<class X, class Y > class hash_map:public std::tr1::unordered_map<X,Y>
+    { public:
+      hash_map(){}
+      hash_map(const hash_map&a):std::tr1::unordered_map<X,Y>(a){}
+      hash_map&operator=(const hash_map&a){std::tr1::unordered_map<X,Y>::operator=(*this,a);return this;}
+    };
+#else
+#  if defined(COLLADABU_OS_LINUX) || defined(COLLADABU_OS_MAC)
+        using namespace __gnu_cxx;
+#  else
+        using namespace stdext;
+#  endif
+#endif
+
+
+} // namespace COLLADABU
+
+#endif // __COLLADABU_HASH_MAP_H__

Modified: trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFW.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFW.h	2010-01-30 17:49:32 UTC (rev 26441)
+++ trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFW.h	2010-01-30 17:58:55 UTC (rev 26442)
@@ -30,8 +30,6 @@
 #include "COLLADAFWEffect.h"
 #include "COLLADAFWEffectCommon.h"
 #include "COLLADAFWException.h"
-#include "COLLADAFWExtraData.h"
-#include "COLLADAFWExtraKeys.h"
 #include "COLLADAFWFileInfo.h"
 #include "COLLADAFWFloatOrDoubleArray.h"
 #include "COLLADAFWFloatOrParam.h"

Modified: trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnimation.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnimation.h	2010-01-30 17:49:32 UTC (rev 26441)
+++ trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnimation.h	2010-01-30 17:58:55 UTC (rev 26442)
@@ -13,7 +13,6 @@
 
 #include "COLLADAFWPrerequisites.h"
 #include "COLLADAFWObject.h"
-#include "COLLADAFWExtraData.h"
 
 
 namespace COLLADAFW
@@ -21,7 +20,7 @@
 
 	/** The base class for animation. Currently we only support animation curves, but in future probably 
 	formulas, too. */
-	class Animation : public ObjectTemplate<COLLADA_TYPE::ANIMATION>, public ExtraData
+	class Animation : public ObjectTemplate<COLLADA_TYPE::ANIMATION>
 	{
 	public:
 		enum AnimationType

Modified: trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWArray.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWArray.h	2010-01-30 17:49:32 UTC (rev 26441)
+++ trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWArray.h	2010-01-30 17:58:55 UTC (rev 26442)
@@ -12,6 +12,7 @@
 #define __COLLADAFW_ARRAY_H__
 
 #include "COLLADAFWPrerequisites.h"
+#include <cassert>
 
 
 namespace COLLADAFW
@@ -157,7 +158,7 @@
 		bool empty() const { return mCount == 0; }
 
 		/** Return s the index'th element in the array. No check is performed, if the index is out of bounds.*/
-        Type& operator[] ( size_t index ) { return mData[index]; }
+        Type& operator[] ( size_t index ) { assert(index < mCapacity); return mData[index]; }
 
         /** Return s the index'th element in the array. No check is performed, if the index is out of bounds.*/
         const Type& operator[] ( size_t index ) const { return mData[index]; }

Modified: trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWCamera.h
===================================================================
--- trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWCamera.h	2010-01-30 17:49:32 UTC (rev 26441)
+++ trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWCamera.h	2010-01-30 17:58:55 UTC (rev 26442)
@@ -13,7 +13,6 @@
 
 #include "COLLADAFWPrerequisites.h"
 #include "COLLADAFWObject.h"
-#include "COLLADAFWExtraData.h"
 #include "COLLADAFWAnimatableFloat.h"
 
 
@@ -24,7 +23,7 @@
 	The CameraType indicates of which type the camera is which. 
 	For perspective cameras mXFovOrXMag and mYFovOrYMag store the horizontal or vertical field of view,

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list