[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35795] trunk/lib/darwin-9.x.universal: Add missing Collada includes for building with latest blender collada updates

Damien Plisson damien.plisson at yahoo.fr
Sat Mar 26 10:07:32 CET 2011


Revision: 35795
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35795
Author:   damien78
Date:     2011-03-26 09:07:31 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
Add missing Collada includes for building with latest blender collada updates
Update libsndfile to v1.0.24

Modified Paths:
--------------
    trunk/lib/darwin-9.x.universal/README
    trunk/lib/darwin-9.x.universal/sndfile/include/sndfile.h
    trunk/lib/darwin-9.x.universal/sndfile/lib/libsndfile.a

Added Paths:
-----------
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParser.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserCoutErrorHandler.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserExpatSaxParser.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserIErrorHandler.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserINamespaceHandler.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserIUnknownElementHandler.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserLibxmlSaxParser.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserNamespaceStack.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserParser.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserParserError.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserParserTemplate.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserParserTemplateBase.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserPrerequisites.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserRawUnknownElementHandler.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserSaxParser.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserStackMemoryManager.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserTypes.h
    trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserUtils.h

Modified: trunk/lib/darwin-9.x.universal/README
===================================================================
--- trunk/lib/darwin-9.x.universal/README	2011-03-26 08:41:21 UTC (rev 35794)
+++ trunk/lib/darwin-9.x.universal/README	2011-03-26 09:07:31 UTC (rev 35795)
@@ -23,7 +23,7 @@
 vorbis (version 1.3.2)
 theora (version 1.1.1)
 flac (1.2.1)
-sndfile (version 1.0.23)
+sndfile (version 1.0.24)
 lame (version 3.98.4)
 xvidcore (version 1.2.2)
 x264 (version 20101118)

Added: trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParser.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParser.h	                        (rev 0)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParser.h	2011-03-26 09:07:31 UTC (rev 35795)
@@ -0,0 +1,39 @@
+/*
+    Copyright (c) 2008-2009 NetAllied Systems GmbH
+
+    This file is part of GeneratedSaxParser.
+
+    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 __GENERATEDSAXPARSER_H__
+#define __GENERATEDSAXPARSER_H__
+
+
+// This header includes all headers needed to use this library.
+// note: you have to set one of these preprocessor flags:
+// - GENERATEDSAXPARSER_XMLPARSER_LIBXML
+// - GENERATEDSAXPARSER_XMLPARSER_EXPAT
+#include "GeneratedSaxParserPrerequisites.h"
+#include "GeneratedSaxParserStackMemoryManager.h"
+#include "GeneratedSaxParserTypes.h"
+#include "GeneratedSaxParserUtils.h"
+#include "GeneratedSaxParserIErrorHandler.h"
+#include "GeneratedSaxParserCoutErrorHandler.h"
+#include "GeneratedSaxParserIUnknownElementHandler.h"
+#include "GeneratedSaxParserINamespaceHandler.h"
+#include "GeneratedSaxParserNamespaceStack.h"
+#include "GeneratedSaxParserParserError.h"
+#include "GeneratedSaxParserParser.h"
+#include "GeneratedSaxParserSaxParser.h"
+#if defined(GENERATEDSAXPARSER_XMLPARSER_LIBXML)
+#include "GeneratedSaxParserLibxmlSaxParser.h"
+#elif defined(GENERATEDSAXPARSER_XMLPARSER_EXPAT)
+#include "GeneratedSaxParserExpatSaxParser.h"
+#endif
+#include "GeneratedSaxParserParserTemplateBase.h"
+#include "GeneratedSaxParserParserTemplate.h"
+
+#endif // __GENERATEDSAXPARSER_H__

Added: trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserCoutErrorHandler.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserCoutErrorHandler.h	                        (rev 0)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserCoutErrorHandler.h	2011-03-26 09:07:31 UTC (rev 35795)
@@ -0,0 +1,70 @@
+/*
+    Copyright (c) 2008-2009 NetAllied Systems GmbH
+
+    This file is part of GeneratedSaxParser.
+
+    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 __GENERATEDSAXPARSER_COUTERRORHANDLER_H__
+#define __GENERATEDSAXPARSER_COUTERRORHANDLER_H__
+
+#include "GeneratedSaxParserPrerequisites.h"
+#include "GeneratedSaxParserIErrorHandler.h"
+
+
+
+namespace GeneratedSaxParser
+{
+
+	class CoutErrorHandler 	: public IErrorHandler
+	{
+	private:
+		bool mHasErrors;
+		bool mHasCriticalError;
+
+	public:
+		CoutErrorHandler();
+		virtual ~CoutErrorHandler();
+
+		/** Notification of a parser error
+		@param error The error object with specific information.
+		@returns If true is returned, the parse stops parsing immediately, if false is returned and 
+		the severity of the error is not ERROR_CRITICAL, the parser will continue.
+		*/
+		bool handleError( const ParserError& error );
+
+		/** Notification sent before starting the problem detection process.
+		Typically, this would tell a problem collector to clear previously recorded problems.
+		*/
+		void beginReporting(){};
+
+		/** Notification sent after having completed problem detection process.
+		Typically, this would tell a problem collector that no more problems should be expected in this
+		iteration.
+		*/
+		void endReporting(){};
+
+		/** Signals that one or more errors have been accepted.
+		@return boolean - <code>true</code> if errors have been accepted, otherwise <code>false</code>
+		*/
+		bool hasErrors() const { return mHasErrors; };
+
+		/** Signals that a has been accepted.
+		@return boolean - <code>true</code> if a critical error has been accepted, otherwise <code>false</code>
+		*/
+		bool hasCriticalError() const { return mHasCriticalError; };
+
+
+	private:
+        /** Disable default copy ctor. */
+		CoutErrorHandler( const CoutErrorHandler& pre );
+        /** Disable default assignment operator. */
+		const CoutErrorHandler& operator= ( const CoutErrorHandler& pre );
+
+	};
+} // namespace GeneratedSaxParser
+
+#endif // __GENERATEDSAXPARSER_COUTERRORHANDLER_H__

Added: trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserExpatSaxParser.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserExpatSaxParser.h	                        (rev 0)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserExpatSaxParser.h	2011-03-26 09:07:31 UTC (rev 35795)
@@ -0,0 +1,62 @@
+/*
+    Copyright (c) 2008-2009 NetAllied Systems GmbH
+
+    This file is part of GeneratedSaxParser.
+
+    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 __GENERATEDSAXPARSER_EXPATSAXPARSER_H__
+#define __GENERATEDSAXPARSER_EXPATSAXPARSER_H__
+
+#include "GeneratedSaxParserPrerequisites.h"
+#include "GeneratedSaxParserSaxParser.h"
+
+
+
+struct XML_ParserStruct;
+typedef struct XML_ParserStruct *XML_Parser;
+
+
+namespace GeneratedSaxParser 
+{
+	class Parser;
+
+	class ExpatSaxParser : public SaxParser
+	{
+
+	private:
+		typedef char XML_Char;
+	private:
+		XML_Parser mParser;
+		size_t mBufferSize;
+
+	public:
+		ExpatSaxParser(Parser* parser, size_t bufferSize);
+		virtual ~ExpatSaxParser();
+
+		bool parseFile(const char* fileName);
+		virtual bool parseBuffer(const char* uri, const char* buffer, int length);
+
+		size_t getLineNumer()const;
+		size_t getColumnNumer()const;
+
+	private:
+		/** Disable default copy ctor. */
+		ExpatSaxParser( const SaxParser& pre );
+		/** Disable default assignment operator. */
+		const ExpatSaxParser& operator= ( const SaxParser& pre );
+
+		static void startElement( void* user_data,	const XML_Char* name, const XML_Char** attrs);
+		static void endElement( void* user_data, const XML_Char* name);
+
+		static void characters( void* user_data, const XML_Char* name, int length );
+
+
+		void abortParsing();
+
+	};
+} // namespace GENERATEDSAXPARSER
+
+#endif // __GENERATEDSAXPARSER_EXPATSAXPARSER_H__

Added: trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserIErrorHandler.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserIErrorHandler.h	                        (rev 0)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserIErrorHandler.h	2011-03-26 09:07:31 UTC (rev 35795)
@@ -0,0 +1,77 @@
+/*
+    Copyright (c) 2008-2009 NetAllied Systems GmbH
+
+    This file is part of GeneratedSaxParser.
+
+    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 __GENERATEDSAXPARSER_IERRORHANDLER_H__
+#define __GENERATEDSAXPARSER_IERRORHANDLER_H__
+
+#include "GeneratedSaxParserPrerequisites.h"
+#include "GeneratedSaxParserParserError.h"
+
+
+namespace GeneratedSaxParser
+{
+	class ParserError;
+
+	class IErrorHandler 	
+	{
+	public:
+		IErrorHandler(){};
+		virtual ~IErrorHandler(){};
+
+		/** Notification of a parser error
+		@param error The error object with specific information.
+		@returns If true is returned, the parse stops parsing immediately, if false is returned and 
+		the severity of the error is not ERROR_CRITICAL, the parser will continue.
+		*/
+		virtual bool handleError( const ParserError& error ) = 0;
+
+		/** Notification sent before starting the problem detection process.
+		Typically, this would tell a problem collector to clear previously recorded problems.
+		*/
+		virtual void beginReporting() = 0;
+
+		/** Notification sent after having completed problem detection process.
+		Typically, this would tell a problem collector that no more problems should be expected in this
+		iteration.
+		*/
+		virtual void endReporting() = 0;
+
+		/** Predicate allowing the error handler to signal whether or not it is currently
+		interested by problem reports. When answering <code>false</code>, problem will
+		not be discovered any more until the next iteration.
+		@par 
+		This  predicate will be invoked once prior to each error detection iteration.
+
+		@return boolean - indicates whether the requestor is currently interested in problems.
+		*/
+	//	virtual bool isActive() const = 0;
+
+		/** Signals that one or more errors have been accepted.
+		@return boolean - <code>true</code> if errors have been accepted, otherwise <code>false</code>
+		*/
+		virtual bool hasErrors() const = 0;
+
+		/** Signals that a has been accepted.
+		@return boolean - <code>true</code> if a critical error has been accepted, otherwise <code>false</code>
+		*/
+		virtual bool hasCriticalError() const = 0;
+
+
+	private:
+        /** Disable default copy ctor. */
+		IErrorHandler( const IErrorHandler& pre );
+        /** Disable default assignment operator. */
+		const IErrorHandler& operator= ( const IErrorHandler& pre );
+
+	};
+
+} // namespace COLLADASAXPARSER
+
+#endif // __GENERATEDSAXPARSER_IERRORHANDLER_H__

Added: trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserINamespaceHandler.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/GeneratedSaxParser/GeneratedSaxParserINamespaceHandler.h	                        (rev 0)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list