Release v1.2.2

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/tags/libebml/libebml-1.2.2@813 a6f86f6d-0131-4f8e-9e7b-e335508773d5

debian/changelog

@@ -1,3 +1,27 @@
+libebml (1.2.2-1) natty; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Fri, 23 Sep 2011 13:22:24 +0200
+
+libebml (1.2.1-1) natty; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Wed, 15 Jun 2011 13:55:50 +0200
+
+libebml (1.2.0-1) lucid; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Sun, 30 Jan 2011 15:30:00 +0200
+
+libebml (1.0.0-1) lucid; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Sat, 05 Jun 2010 10:39:00 +0200
+
 libebml (0.8.0-1) karmic; urgency=low
 
   * New version.

debian/control

@@ -3,9 +3,10 @@ Priority: optional
 Maintainer: Moritz Bunkus <moritz@bunkus.org>
 Build-Depends: debhelper (>> 3.0.0)
 Standards-Version: 3.5.8
+Section: libs
 
 Package: libebml-dev
-Section: devel
+Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Extensible Binary Meta Language access library

ebml/Debug.h

@@ -52,7 +52,7 @@ START_LIBEBML_NAMESPACE
 
 static const int MAX_PREFIX_LENGTH = 128;
 
-#if !defined(NDEBUG)
+#if defined(LIBEBML_DEBUG)
 // define the working debugging class
 
 class EBML_DLL_API ADbg  
@@ -102,7 +102,7 @@ private:
 #endif // WIN32
 };
 
-#else // !defined(NDEBUG)
+#else // defined(LIBEBML_DEBUG)
 
 // define a class that does nothing (no output)
 
@@ -145,7 +145,7 @@ public:
 	}
 };
 
-#endif // !defined(NDEBUG)
+#endif // defined(LIBEBML_DEBUG)
 
 extern class EBML_DLL_API ADbg globalDebug;
 

ebml/EbmlBinary.h

@@ -1,106 +1,106 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlBinary.h 1298 2008-02-21 22:14:18Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Julien Coloos	<suiryc @ users.sf.net>
-*/
-#ifndef LIBEBML_BINARY_H
-#define LIBEBML_BINARY_H
-
-#include <cstring>
-
-#include "EbmlTypes.h"
-#include "EbmlElement.h"
-
-// ----- Added 10/15/2003 by jcsston from Zen -----
-#if defined (__BORLANDC__) //Maybe other compilers?
-  #include <mem.h>
-#endif //__BORLANDC__
-// ------------------------------------------------
-
-START_LIBEBML_NAMESPACE
-
-/*!
-    \class EbmlBinary
-    \brief Handle all operations on an EBML element that contains "unknown" binary data
-
-	\todo handle fix sized elements (like UID of CodecID)
-*/
-class EBML_DLL_API EbmlBinary : public EbmlElement {
-	public:
-		EbmlBinary();
-		EbmlBinary(const EbmlBinary & ElementToClone);
-		virtual ~EbmlBinary(void);
-	
-		virtual bool ValidateSize() const {return true;} // we don't mind about what's inside
-
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
-		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
-		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
-	
-		void SetBuffer(const binary *Buffer, const uint32 BufferSize) {
-			Data = (binary *) Buffer;
-			SetSize_(BufferSize);
-			SetValueIsSet();
-		}
-
-		binary *GetBuffer() const {return Data;}
-		
-		void CopyBuffer(const binary *Buffer, const uint32 BufferSize) {
-			if (Data != NULL)
-				free(Data);
-			Data = (binary *)malloc(BufferSize * sizeof(binary));
-			memcpy(Data, Buffer, BufferSize);
-			SetSize_(BufferSize);
-			SetValueIsSet();
-		}
-		
-		operator const binary &() const {return *Data;}
-	
-		bool IsDefaultValue() const {
-			return false;
-		}
-
-		bool operator==(const EbmlBinary & ElementToCompare) const;
-
-#if defined(EBML_STRICT_API)
-	private:
-#else
-	protected:
-#endif
-		binary *Data; // the binary data inside the element
-};
-
-END_LIBEBML_NAMESPACE
-
-#endif // LIBEBML_BINARY_H
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id$
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+	\author Julien Coloos	<suiryc @ users.sf.net>
+*/
+#ifndef LIBEBML_BINARY_H
+#define LIBEBML_BINARY_H
+
+#include <cstring>
+
+#include "EbmlTypes.h"
+#include "EbmlElement.h"
+
+// ----- Added 10/15/2003 by jcsston from Zen -----
+#if defined (__BORLANDC__) //Maybe other compilers?
+  #include <mem.h>
+#endif //__BORLANDC__
+// ------------------------------------------------
+
+START_LIBEBML_NAMESPACE
+
+/*!
+    \class EbmlBinary
+    \brief Handle all operations on an EBML element that contains "unknown" binary data
+
+	\todo handle fix sized elements (like UID of CodecID)
+*/
+class EBML_DLL_API EbmlBinary : public EbmlElement {
+	public:
+		EbmlBinary();
+		EbmlBinary(const EbmlBinary & ElementToClone);
+		virtual ~EbmlBinary(void);
+	
+		virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() < 0x7FFFFFFF;} // we don't mind about what's inside
+
+		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
+		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
+	
+		void SetBuffer(const binary *Buffer, const uint32 BufferSize) {
+			Data = (binary *) Buffer;
+			SetSize_(BufferSize);
+			SetValueIsSet();
+		}
+
+		binary *GetBuffer() const {return Data;}
+		
+		void CopyBuffer(const binary *Buffer, const uint32 BufferSize) {
+			if (Data != NULL)
+				free(Data);
+			Data = (binary *)malloc(BufferSize * sizeof(binary));
+			memcpy(Data, Buffer, BufferSize);
+			SetSize_(BufferSize);
+			SetValueIsSet();
+		}
+		
+		operator const binary &() const;
+	
+		bool IsDefaultValue() const {
+			return false;
+		}
+
+		bool operator==(const EbmlBinary & ElementToCompare) const;
+
+#if defined(EBML_STRICT_API)
+	private:
+#else
+	protected:
+#endif
+		binary *Data; // the binary data inside the element
+};
+
+END_LIBEBML_NAMESPACE
+
+#endif // LIBEBML_BINARY_H

ebml/EbmlConfig.h

@@ -96,7 +96,7 @@
 
 // The LIBEBML_DEBUG symbol is defined, when we are creating a debug build. In this
 // case the debug logging code is compiled in.
-#if (defined(DEBUG)||defined(_DEBUG))&&!defined(LIBEBML_DEBUG)
+#if (defined(DEBUG)||defined(_DEBUG)) && !defined(LIBEBML_DEBUG)
 #define LIBEBML_DEBUG
 #endif
 

ebml/EbmlCrc32.h

@@ -1,156 +1,141 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlCrc32.h 1326 2009-08-23 00:47:52Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Jory Stone       <jcsston @ toughguy.net>
-*/
-#ifndef LIBEBML_CRC32_H
-#define LIBEBML_CRC32_H
-
-#include <cassert>
-
-#include "EbmlTypes.h"
-#include "EbmlBinary.h"
-
-START_LIBEBML_NAMESPACE
-
-const uint32 CRC32_NEGL = 0xffffffffL;
-
-#ifdef WORDS_BIGENDIAN
-# define CRC32_INDEX(c) (c >> 24)
-# define CRC32_SHIFTED(c) (c << 8)
-#else
-# define CRC32_INDEX(c) (c & 0xff)
-# define CRC32_SHIFTED(c) (c >> 8)
-#endif
-
-DECLARE_EBML_BINARY(EbmlCrc32)
-	public:
-		EbmlCrc32(const EbmlCrc32 & ElementToClone);
-		virtual bool ValidateSize() const {return (GetSize() == 4);}
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
-		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
-//		filepos_t UpdateSize(bool bWithDefault = false);
-		
-		bool IsDefaultValue() const {
-			return false;
-		}
-
-		void AddElementCRC32(EbmlElement &ElementToCRC);
-		bool CheckElementCRC32(EbmlElement &ElementToCRC);
-		
-		/*!
-			CRC Checksum Calculation
-		*/
-		enum {DIGESTSIZE = 4};
-		
-		/*!
-			Use this to quickly check a CRC32 with some data
-			\return True if inputCRC matches CRC32 generated from input data
-		*/
-		static bool CheckCRC(uint32 inputCRC, const binary *input, uint32 length);
-		/*!
-			Calls Update() and Finalize(), use to create a CRC32 in one go
-		*/
-		void FillCRC32(const binary *input, uint32 length);
-		/*!
-			Add data to the CRC table, in other words process some data bit by bit
-		*/
-		void Update(const binary *input, uint32 length);
-		/*!
-			Use this with Update() to Finalize() or Complete the CRC32
-		*/
-		void Finalize();
-		/*!
-			Returns a uint32 that has the value of the CRC32
-		*/
-		uint32 GetCrc32() const {
-			return m_crc_final;
-		};
-	
-		void ForceCrc32(uint32 NewValue) { m_crc_final = NewValue; SetValueIsSet();}
-
-#if defined(EBML_STRICT_API)
-    private:
-#else
-    protected:
-#endif
-		void ResetCRC() {m_crc = CRC32_NEGL;}
-		void UpdateByte(binary b) {m_crc = m_tab[CRC32_INDEX(m_crc) ^ b] ^ CRC32_SHIFTED(m_crc);}
-
-		static const uint32 m_tab[256];
-		uint32 m_crc;
-		uint32 m_crc_final;
-        
-        EBML_CONCRETE_CLASS(EbmlCrc32)
-};
-
-template <class T>
-inline unsigned int GetAlignment(T *dummy=NULL) // VC60 workaround
-{
-#if (_MSC_VER >= 1300)
-	return __alignof(T);
-#elif defined(__GNUC__)
-	return __alignof__(T);
-#else
-	return sizeof(T);
-#endif
-}
-
-template <class T>
-inline bool IsPowerOf2(T n)
-{
-	return n > 0 && (n & (n-1)) == 0;
-}
-
-template <class T1, class T2>
-inline T2 ModPowerOf2(T1 a, T2 b)
-{
-	assert(IsPowerOf2(b));
-	return T2(a) & (b-1);
-}
-
-inline bool IsAlignedOn(const void *p, unsigned int alignment)
-{
-	return IsPowerOf2(alignment) ? ModPowerOf2((uintptr_t)p, alignment) == 0 : (uintptr_t)p % alignment == 0;
-}
-
-template <class T>
-inline bool IsAligned(const void *p, T *dummy=NULL)	// VC60 workaround
-{
-	return IsAlignedOn(p, GetAlignment<T>());
-}
-
-END_LIBEBML_NAMESPACE
-
-#endif // LIBEBML_CRC32_H
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id$
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+	\author Jory Stone       <jcsston @ toughguy.net>
+*/
+#ifndef LIBEBML_CRC32_H
+#define LIBEBML_CRC32_H
+
+#include <cassert>
+
+#include "EbmlTypes.h"
+#include "EbmlBinary.h"
+
+START_LIBEBML_NAMESPACE
+
+DECLARE_EBML_BINARY(EbmlCrc32)
+	public:
+		EbmlCrc32(const EbmlCrc32 & ElementToClone);
+		virtual bool ValidateSize() const {return IsFiniteSize() && (GetSize() == 4);}
+		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
+//		filepos_t UpdateSize(bool bWithDefault = false);
+		
+		bool IsDefaultValue() const {
+			return false;
+		}
+
+		void AddElementCRC32(EbmlElement &ElementToCRC);
+		bool CheckElementCRC32(EbmlElement &ElementToCRC);
+		
+		/*!
+			Use this to quickly check a CRC32 with some data
+			\return True if inputCRC matches CRC32 generated from input data
+		*/
+		static bool CheckCRC(uint32 inputCRC, const binary *input, uint32 length);
+		/*!
+			Calls Update() and Finalize(), use to create a CRC32 in one go
+		*/
+		void FillCRC32(const binary *input, uint32 length);
+		/*!
+			Add data to the CRC table, in other words process some data bit by bit
+		*/
+		void Update(const binary *input, uint32 length);
+		/*!
+			Use this with Update() to Finalize() or Complete the CRC32
+		*/
+		void Finalize();
+		/*!
+			Returns a uint32 that has the value of the CRC32
+		*/
+		uint32 GetCrc32() const {
+			return m_crc_final;
+		};
+	
+		void ForceCrc32(uint32 NewValue) { m_crc_final = NewValue; SetValueIsSet();}
+
+#if defined(EBML_STRICT_API)
+    private:
+#else
+    protected:
+#endif
+		void ResetCRC();
+		void UpdateByte(binary b);
+
+		static const uint32 m_tab[256];
+		uint32 m_crc;
+		uint32 m_crc_final;
+        
+        EBML_CONCRETE_CLASS(EbmlCrc32)
+};
+
+template <class T>
+inline unsigned int GetAlignment(T *dummy=NULL) // VC60 workaround
+{
+#if (_MSC_VER >= 1300)
+	return __alignof(T);
+#elif defined(__GNUC__)
+	return __alignof__(T);
+#else
+	return sizeof(T);
+#endif
+}
+
+template <class T>
+inline bool IsPowerOf2(T n)
+{
+	return n > 0 && (n & (n-1)) == 0;
+}
+
+template <class T1, class T2>
+inline T2 ModPowerOf2(T1 a, T2 b)
+{
+	assert(IsPowerOf2(b));
+	return T2(a) & (b-1);
+}
+
+inline bool IsAlignedOn(const void *p, unsigned int alignment)
+{
+	return IsPowerOf2(alignment) ? ModPowerOf2((uintptr_t)p, alignment) == 0 : (uintptr_t)p % alignment == 0;
+}
+
+template <class T>
+inline bool IsAligned(const void *p, T *dummy=NULL)	// VC60 workaround
+{
+	return IsAlignedOn(p, GetAlignment<T>());
+}
+
+END_LIBEBML_NAMESPACE
+
+#endif // LIBEBML_CRC32_H

ebml/EbmlDate.h

@@ -28,7 +28,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlDate.h 1079 2005-03-03 13:18:14Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_DATE_H
@@ -60,7 +60,7 @@ class EBML_DLL_API EbmlDate : public EbmlElement {
 		*/
 		int32 GetEpochDate() const {return int32(myDate/1000000000 + UnixEpochDelay);}
 
-		virtual bool ValidateSize() const {return ((GetSize() == 8) || (GetSize() == 0));}
+		virtual bool ValidateSize() const {return IsFiniteSize() && ((GetSize() == 8) || (GetSize() == 0));}
 
 		/*!
 			\note no Default date handled

ebml/EbmlDummy.h

@@ -1,65 +1,69 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlDummy.h 639 2004-07-09 20:59:14Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#ifndef LIBEBML_DUMMY_H
-#define LIBEBML_DUMMY_H
-
-#include "EbmlBinary.h"
-
-START_LIBEBML_NAMESPACE
-
-class EBML_DLL_API EbmlDummy : public EbmlBinary {
-	public:
-		EbmlDummy() :DummyId(DummyRawId)  {}
-		EbmlDummy(const EbmlId & aId) :EbmlBinary(), DummyId(aId) {}
-		EbmlDummy(const EbmlDummy & ElementToClone):EbmlBinary(ElementToClone), DummyId(ElementToClone.DummyId) {}
-
-		bool IsDummy() const {return true;}
-		bool IsDefaultValue() const {return true;}
-
-#if defined(EBML_STRICT_API)
-    private:
-#else
-    protected:
-#endif
-		const EbmlId DummyId;
-		static const EbmlId DummyRawId;
-
-        EBML_CONCRETE_CLASS(EbmlDummy)
-};
-
-END_LIBEBML_NAMESPACE
-
-#endif // LIBEBML_DUMMY_H
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id$
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+*/
+#ifndef LIBEBML_DUMMY_H
+#define LIBEBML_DUMMY_H
+
+#include "EbmlBinary.h"
+
+START_LIBEBML_NAMESPACE
+
+class EBML_DLL_API EbmlDummy : public EbmlBinary {
+	public:
+		EbmlDummy() :DummyId(DummyRawId) {}
+		EbmlDummy(const EbmlId & aId) :EbmlBinary(), DummyId(aId) {}
+		EbmlDummy(const EbmlDummy & ElementToClone):EbmlBinary(ElementToClone), DummyId(ElementToClone.DummyId) {}
+
+		bool IsDummy() const {return true;}
+		bool IsDefaultValue() const {return true;}
+
+        virtual operator const EbmlId &() const {
+            return DummyId;
+        }
+
+#if defined(EBML_STRICT_API)
+    private:
+#else
+    protected:
+#endif
+		const EbmlId DummyId;
+		static const EbmlId DummyRawId;
+
+        EBML_CONCRETE_DUMMY_CLASS(EbmlDummy)
+};
+
+END_LIBEBML_NAMESPACE
+
+#endif // LIBEBML_DUMMY_H

ebml/EbmlElement.h

@@ -1,484 +1,512 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-**
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlElement.h 1232 2005-10-15 15:56:52Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#ifndef LIBEBML_ELEMENT_H
-#define LIBEBML_ELEMENT_H
-
-#include "EbmlTypes.h"
-#include "EbmlId.h"
-#include "IOCallback.h"
-
-START_LIBEBML_NAMESPACE
-
-/*!
-	\brief The size of the EBML-coded length
-*/
-int EBML_DLL_API CodedSizeLength(uint64 Length, unsigned int SizeLength, bool bSizeIsFinite = true);
-
-/*!
-	\brief The coded value of the EBML-coded length
-	\note The size of OutBuffer must be 8 octets at least
-*/
-int EBML_DLL_API CodedValueLength(uint64 Length, int CodedSize, binary * OutBuffer);
-
-/*!
-	\brief Read an EBML-coded value from a buffer
-	\return the value read
-*/
-uint64 EBML_DLL_API ReadCodedSizeValue(const binary * InBuffer, uint32 & BufferSize, uint64 & SizeUnknown);
-
-/*!
-	\brief The size of the EBML-coded signed length
-*/
-int EBML_DLL_API CodedSizeLengthSigned(int64 Length, unsigned int SizeLength);
-
-/*!
-	\brief The coded value of the EBML-coded signed length
-	\note the size of OutBuffer must be 8 octets at least
-*/
-int EBML_DLL_API CodedValueLengthSigned(int64 Length, int CodedSize, binary * OutBuffer);
-
-/*!
-	\brief Read a signed EBML-coded value from a buffer
-	\return the value read
-*/
-int64 EBML_DLL_API ReadCodedSizeSignedValue(const binary * InBuffer, uint32 & BufferSize, uint64 & SizeUnknown);
-
-class EbmlStream;
-class EbmlSemanticContext;
-class EbmlElement;
-
-extern const EbmlSemanticContext Context_EbmlGlobal;
-
-#define DEFINE_xxx_CONTEXT(x,global) \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(countof(ContextList_##x), ContextList_##x, NULL, global, NULL); \
-
-#define DEFINE_xxx_MASTER(x,id,idl,parent,name,global) \
-    const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(countof(ContextList_##x), ContextList_##x, &Context_##parent, global, &EBML_INFO(x)); \
-    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
-    x::x() :EbmlMaster(Context_##x) {}
-
-#define DEFINE_xxx_MASTER_CONS(x,id,idl,parent,name,global) \
-    const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(countof(ContextList_##x), ContextList_##x, &Context_##parent, global, &EBML_INFO(x)); \
-    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x);
-
-#define DEFINE_xxx_MASTER_ORPHAN(x,id,idl,name,global) \
-    const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(countof(ContextList_##x), ContextList_##x, NULL, global, &EBML_INFO(x)); \
-    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
-
-#define DEFINE_xxx_CLASS(x,id,idl,parent,name,global) \
-    const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
-    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
-    x::x() {}
-
-#define DEFINE_xxx_CLASS_CONS(x,id,idl,parent,name,global) \
-    const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
-    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x);
-
-#define DEFINE_xxx_UINTEGER_DEF(x,id,idl,parent,name,global,defval) \
-    const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
-    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
-    x::x() :EbmlUInteger(defval) {}
-
-#define DEFINE_xxx_STRING_DEF(x,id,idl,parent,name,global,defval) \
-    const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
-    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
-    x::x() :EbmlString(defval) {}
-
-#define DEFINE_xxx_FLOAT_DEF(x,id,idl,parent,name,global,defval) \
-    const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
-    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
-    x::x() :EbmlFloat(defval) {}
-
-#define DEFINE_xxx_CLASS_GLOBAL(x,id,idl,name,global) \
-    const EbmlId Id_##x    (id, idl); \
-    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_EbmlGlobal); \
-
-#define DEFINE_xxx_CLASS_ORPHAN(x,id,idl,name,global) \
-    const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, NULL, global, &EBML_INFO(x)); \
-    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
-
-#define DEFINE_EBML_CONTEXT(x)                             DEFINE_xxx_CONTEXT(x,*GetEbmlGlobal_Context)
-#define DEFINE_EBML_MASTER(x,id,idl,parent,name)           DEFINE_xxx_MASTER(x,id,idl,parent,name,*GetEbmlGlobal_Context)
-#define DEFINE_EBML_MASTER_ORPHAN(x,id,idl,name)           DEFINE_xxx_MASTER_ORPHAN(x,id,idl,name,*GetEbmlGlobal_Context)
-#define DEFINE_EBML_CLASS(x,id,idl,parent,name)            DEFINE_xxx_CLASS(x,id,idl,parent,name,*GetEbmlGlobal_Context)
-#define DEFINE_EBML_CLASS_GLOBAL(x,id,idl,name)            DEFINE_xxx_CLASS_GLOBAL(x,id,idl,name,*GetEbmlGlobal_Context)
-#define DEFINE_EBML_CLASS_ORPHAN(x,id,idl,name)            DEFINE_xxx_CLASS_ORPHAN(x,id,idl,name,*GetEbmlGlobal_Context)
-#define DEFINE_EBML_UINTEGER_DEF(x,id,idl,parent,name,val) DEFINE_xxx_UINTEGER_DEF(x,id,idl,parent,name,*GetEbmlGlobal_Context,val)
-#define DEFINE_EBML_STRING_DEF(x,id,idl,parent,name,val)   DEFINE_xxx_STRING_DEF(x,id,idl,parent,name,*GetEbmlGlobal_Context,val)
-#define DEFINE_EBML_BINARY_CONS(x,id,idl,parent,name)      DEFINE_xxx_CLASS_CONS(x,id,idl,parent,name,*GetEbmlGlobal_Context)
-
-#define DEFINE_SEMANTIC_CONTEXT(x)
-#define DEFINE_START_SEMANTIC(x)     static const EbmlSemantic ContextList_##x[] = {
-#define DEFINE_END_SEMANTIC(x)       };
-#define DEFINE_SEMANTIC_ITEM(m,u,c)  EbmlSemantic(m, u, EBML_INFO(c)),
-
-#define DECLARE_EBML_MASTER(x)  class EBML_DLL_API x : public EbmlMaster { \
-  public: \
-    x();
-#define DECLARE_EBML_UINTEGER(x)  class EBML_DLL_API x : public EbmlUInteger { \
-  public: \
-    x();
-#define DECLARE_EBML_STRING(x)    class EBML_DLL_API x : public EbmlString { \
-  public: \
-    x();
-#define DECLARE_EBML_BINARY(x)    class EBML_DLL_API x : public EbmlBinary { \
-  public: \
-    x();
-
-#if defined(EBML_STRICT_API)
-#define EBML_CONCRETE_CLASS(Type) \
-    public: \
-        virtual const EbmlSemanticContext &Context() const {return ClassInfos.GetContext();} \
-        virtual const char *DebugName() const {return ClassInfos.GetName();} \
-		virtual operator const EbmlId &() const {return ClassInfos.ClassId();} \
-        virtual EbmlElement & CreateElement() const {return Create();} \
-        virtual EbmlElement * Clone() const { return new Type(*this); } \
-		static EbmlElement & Create() {return *(new Type);} \
-        static const EbmlCallbacks & ClassInfo() {return ClassInfos;} \
-        static const EbmlId & ClassId() {return ClassInfos.ClassId();} \
-    private: \
-		static const EbmlCallbacks ClassInfos; \
-
-
-#define EBML_INFO(ref)             ref::ClassInfo()
-#define EBML_ID(ref)               ref::ClassId()
-#define EBML_CLASS_SEMCONTEXT(ref) Context_##ref
-#define EBML_CLASS_CONTEXT(ref)    ref::ClassInfo().GetContext()
-#define EBML_CLASS_CALLBACK(ref)   ref::ClassInfo()
-#define EBML_CONTEXT(e) (e)->Context()
-#define EBML_NAME(e)    (e)->DebugName()
-
-#define EBML_INFO_ID(cb)      (cb).ClassId()
-#define EBML_INFO_NAME(cb)    (cb).GetName()
-#define EBML_INFO_CREATE(cb)  (cb).NewElement()
-#define EBML_INFO_CONTEXT(cb) (cb).GetContext()
-
-#define EBML_SEM_UNIQUE(s)  (s).IsUnique()
-#define EBML_SEM_CONTEXT(s) ((const EbmlCallbacks &)(s)).GetContext()
-#define EBML_SEM_CREATE(s)  (s).Create()
-
-#define EBML_CTX_SIZE(c)       (c).GetSize()
-#define EBML_CTX_MASTER(c)     (c).GetMaster()
-#define EBML_CTX_PARENT(c)     (c).Parent()
-#define EBML_CTX_IDX(c,i)      (c).GetSemantic(i)
-#define EBML_CTX_IDX_INFO(c,i) (const EbmlCallbacks &)((c).GetSemantic(i))
-#define EBML_CTX_IDX_ID(c,i)   ((const EbmlCallbacks &)((c).GetSemantic(i))).ClassId()
-#else
-#define EBML_CONCRETE_CLASS(Type) \
-    public: \
-		virtual const EbmlCallbacks & Generic() const {return ClassInfos;} \
-		virtual operator const EbmlId &() const {return ClassInfos.GlobalId;} \
-        virtual EbmlElement & CreateElement() const {return Create();} \
-        virtual EbmlElement * Clone() const { return new Type(*this); } \
-		static EbmlElement & Create() {return *(new Type);} \
-		static const EbmlCallbacks ClassInfos; \
-
-#define EBML_INFO(ref)             ref::ClassInfos
-#define EBML_ID(ref)               ref::ClassInfos.GlobalId
-#define EBML_CLASS_SEMCONTEXT(ref) Context_##ref
-#define EBML_CLASS_CONTEXT(ref)    ref::ClassInfos.Context
-#define EBML_CLASS_CALLBACK(ref)   ref::ClassInfos
-#define EBML_CONTEXT(e)            (e)->Generic().Context
-#define EBML_NAME(e)               (e)->Generic().DebugName
-
-#define EBML_INFO_ID(cb)      (cb).GlobalId
-#define EBML_INFO_NAME(cb)    (cb).DebugName
-#define EBML_INFO_CREATE(cb)  (cb).Create()
-#define EBML_INFO_CONTEXT(cb) (cb).Context
-
-#define EBML_SEM_UNIQUE(s)  (s).Unique
-#define EBML_SEM_CONTEXT(s) (s).GetCallbacks.Context
-#define EBML_SEM_CREATE(s)  (s).Create()
-
-#define EBML_CTX_SIZE(c)       (c).Size
-#define EBML_CTX_MASTER(c)     (c).MasterElt
-#define EBML_CTX_PARENT(c)     (c).UpTable
-#define EBML_CTX_IDX(c,i)      (c).MyTable[(i)]
-#define EBML_CTX_IDX_INFO(c,i) (c).MyTable[(i)].GetCallbacks
-#define EBML_CTX_IDX_ID(c,i)   (c).MyTable[(i)].GetCallbacks.GlobalId
-#endif
-
-#if !defined(INVALID_FILEPOS_T)
-#define INVALID_FILEPOS_T 0
-#endif
-
-#define EBML_DEF_CONS
-#define EBML_DEF_SEP
-#define EBML_DEF_PARAM
-#define EBML_DEF_BINARY_INIT
-#define EBML_DEF_BINARY_CTX(x)
-#define EBML_DEF_SINTEGER(x)
-#define EBML_DEF_BINARY(x)
-#define EBML_EXTRA_PARAM
-#define EBML_EXTRA_CALL
-#define EBML_EXTRA_DEF
-
-// functions for generic handling of data (should be static to all classes)
-/*!
-	\todo Handle default value
-*/
-class EBML_DLL_API EbmlCallbacks {
-	public:
-		EbmlCallbacks(EbmlElement & (*Creator)(), const EbmlId & aGlobalId, const char * aDebugName, const EbmlSemanticContext & aContext);
-
-        inline const EbmlId & ClassId() const { return GlobalId; }
-        inline const EbmlSemanticContext & GetContext() const { return Context; }
-        inline const char * GetName() const { return DebugName; }
-        inline EbmlElement & NewElement() const { return Create(); }
-
-#if defined(EBML_STRICT_API)
-    private:
-#endif
-		EbmlElement & (*Create)();
-		const EbmlId & GlobalId;
-		const char * DebugName;
-		const EbmlSemanticContext & Context;
-};
-
-/*!
-	\brief contains the semantic informations for a given level and all sublevels
-	\todo move the ID in the element class
-*/
-class EBML_DLL_API EbmlSemantic {
-	public:
-		EbmlSemantic(bool aMandatory, bool aUnique, const EbmlCallbacks & aGetCallbacks)
-			:Mandatory(aMandatory), Unique(aUnique), GetCallbacks(aGetCallbacks) {}
-
-        inline bool IsMandatory() const { return Mandatory; }
-        inline bool IsUnique() const { return Unique; }
-        inline EbmlElement & Create() const { return EBML_INFO_CREATE(GetCallbacks); }
-        inline operator const EbmlCallbacks &() const { return GetCallbacks; }
-
-#if defined(EBML_STRICT_API)
-    private:
-#endif
-		bool Mandatory; ///< wether the element is mandatory in the context or not
-		bool Unique;
-		const EbmlCallbacks & GetCallbacks;
-};
-
-typedef const class EbmlSemanticContext & (*_GetSemanticContext)();
-
-/*!
-	Context of the element
-	\todo allow more than one parent ?
-*/
-class EBML_DLL_API EbmlSemanticContext {
-	public:
-		EbmlSemanticContext(size_t aSize,
-			const EbmlSemantic *aMyTable,
-			const EbmlSemanticContext *aUpTable,
-			const _GetSemanticContext aGetGlobalContext,
-			const EbmlCallbacks *aMasterElt)
-			: GetGlobalContext(aGetGlobalContext), MyTable(aMyTable), Size(aSize),
-			  UpTable(aUpTable), MasterElt(aMasterElt) {}
-
-		bool operator!=(const EbmlSemanticContext & aElt) const {
-			return ((Size != aElt.Size) || (MyTable != aElt.MyTable) ||
-				(UpTable != aElt.UpTable) || (GetGlobalContext != aElt.GetGlobalContext) |
-				(MasterElt != aElt.MasterElt));
-		}
-
-        inline size_t GetSize() const { return Size; }
-        inline const EbmlCallbacks* GetMaster() const { return MasterElt; }
-        inline const EbmlSemanticContext* Parent() const { return UpTable; }
-        const EbmlSemantic & GetSemantic(size_t i) const;
-
-		const _GetSemanticContext GetGlobalContext; ///< global elements supported at this level
-
-#if defined(EBML_STRICT_API)
-    private:
-#endif
-        const EbmlSemantic *MyTable; ///< First element in the table
-		size_t Size;          ///< number of elements in the table
-		const EbmlSemanticContext *UpTable; ///< Parent element
-		/// \todo replace with the global context directly
-		const EbmlCallbacks *MasterElt;
-};
-
-/*!
-	\class EbmlElement
-	\brief Hold basic informations about an EBML element (ID + length)
-*/
-class EBML_DLL_API EbmlElement {
-	public:
-		EbmlElement(uint64 aDefaultSize, bool bValueSet = false);
-		virtual ~EbmlElement();
-
-		/// Set the minimum length that will be used to write the element size (-1 = optimal)
-		void SetSizeLength(int NewSizeLength) {SizeLength = NewSizeLength;}
-		int GetSizeLength() const {return SizeLength;}
-
-		static EbmlElement * FindNextElement(IOCallback & DataStream, const EbmlSemanticContext & Context, int & UpperLevel, uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel = 1);
-		static EbmlElement * FindNextID(IOCallback & DataStream, const EbmlCallbacks & ClassInfos, const uint64 MaxDataSize);
-
-		/*!
-			\brief find the next element with the same ID
-		*/
-		EbmlElement * FindNext(IOCallback & DataStream, const uint64 MaxDataSize);
-
-		EbmlElement * SkipData(EbmlStream & DataStream, const EbmlSemanticContext & Context, EbmlElement * TestReadElt = NULL, bool AllowDummyElt = false);
-
-		/*!
-			\brief Give a copy of the element, all data inside the element is copied
-			\return NULL if there is not enough memory
-		*/
-		virtual EbmlElement * Clone() const = 0;
-
-		virtual operator const EbmlId &() const = 0;
-#if defined(EBML_STRICT_API)
-        virtual const char *DebugName() const = 0;
-        virtual const EbmlSemanticContext &Context() const = 0;
-#else
-		/// return the generic callback to monitor a derived class
-		virtual const EbmlCallbacks & Generic() const = 0;
-#endif
-        virtual EbmlElement & CreateElement() const = 0;
-
-		// by default only allow to set element as finite (override when needed)
-		virtual bool SetSizeInfinite(bool bIsInfinite = true) {return !bIsInfinite;}
-
-		virtual bool ValidateSize() const = 0;
-
-		uint64 GetElementPosition() const {
-			return ElementPosition;
-		}
-
-		uint64 ElementSize(bool bWithDefault = false) const; /// return the size of the header+data, before writing
-
-		filepos_t Render(IOCallback & output, bool bWithDefault = false, bool bKeepPosition = false, bool bForceRender = false);
-
-		virtual filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false) = 0; /// update the Size of the Data stored
-		virtual filepos_t GetSize() const {return Size;} /// return the size of the data stored in the element, on reading
-
-		virtual filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA) = 0;
-		virtual void Read(EbmlStream & inDataStream, const EbmlSemanticContext & Context, int & UpperEltFound, EbmlElement * & FoundElt, bool AllowDummyElt = false, ScopeMode ReadFully = SCOPE_ALL_DATA);
-
-		bool IsLocked() const {return bLocked;}
-		void Lock(bool bLock = true) { bLocked = bLock;}
-
-		/*!
-			\brief default comparison for elements that can't be compared
-		*/
-		virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
-		static bool CompareElements(const EbmlElement *A, const EbmlElement *B);
-
-		virtual bool IsDummy() const {return false;}
-		virtual bool IsMaster() const {return false;}
-
-		uint8 HeadSize() const {
-			return EBML_ID_LENGTH((const EbmlId&)*this) + CodedSizeLength(Size, SizeLength, bSizeIsFinite);
-		} /// return the size of the head, on reading/writing
-
-		/*!
-			\brief Force the size of an element
-			\warning only possible if the size is "undefined"
-		*/
-		bool ForceSize(uint64 NewSize);
-
-		filepos_t OverwriteHead(IOCallback & output, bool bKeepPosition = false);
-
-		/*!
-			\brief void the content of the element (replace by EbmlVoid)
-		*/
-		uint32 VoidMe(IOCallback & output, bool bWithDefault = false);
-
-		bool DefaultISset() const {return DefaultIsSet;}
-		virtual bool IsDefaultValue() const = 0;
-		bool IsFiniteSize() const {return bSizeIsFinite;}
-
-		/*!
-			\brief set the default size of an element
-		*/
-		virtual void SetDefaultSize(uint64 aDefaultSize) {DefaultSize = aDefaultSize;}
-
-		bool ValueIsSet() const {return bValueIsSet;}
-
-		inline uint64 GetEndPosition() const {
-			return SizePosition + CodedSizeLength(Size, SizeLength, bSizeIsFinite) + Size;
-		}
-
-	protected:
-		/*!
-			\brief find any element in the stream
-			\return a DummyRawElement if the element is unknown or NULL if the element dummy is not allowed
-		*/
-		static EbmlElement *CreateElementUsingContext(const EbmlId & aID, const EbmlSemanticContext & Context, int & LowLevel, bool IsGlobalContext, bool bAllowDummy = false, unsigned int MaxLowerLevel = 1);
-
-		filepos_t RenderHead(IOCallback & output, bool bForceRender, bool bWithDefault = false, bool bKeepPosition = false);
-		filepos_t MakeRenderHead(IOCallback & output, bool bKeepPosition);
-
-		/*!
-			\brief prepare the data before writing them (in case it's not already done by default)
-		*/
-		virtual filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false) = 0;
-
-		/*!
-			\brief special constructor for cloning
-		*/
-		EbmlElement(const EbmlElement & ElementToClone);
-
-        inline uint64 GetDefaultSize() const {return DefaultSize;}
-        inline void SetSize_(uint64 aSize) {Size = aSize;}
-        inline void SetValueIsSet(bool Set = true) {bValueIsSet = Set;}
-        inline void SetDefaultIsSet(bool Set = true) {DefaultIsSet = Set;}
-        inline void SetSizeIsFinite(bool Set = true) {bSizeIsFinite = Set;}
-        inline uint64 GetSizePosition() const {return SizePosition;}
-
-#if defined(EBML_STRICT_API)
-	private:
-#endif
-		uint64 Size;        ///< the size of the data to write
-		uint64 DefaultSize; ///< Minimum data size to fill on rendering (0 = optimal)
-		int SizeLength; /// the minimum size on which the size will be written (0 = optimal)
-		bool bSizeIsFinite;
-		uint64 ElementPosition;
-		uint64 SizePosition;
-		bool bValueIsSet;
-		bool DefaultIsSet;
-		bool bLocked;
-};
-
-END_LIBEBML_NAMESPACE
-
-#endif // LIBEBML_ELEMENT_H
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id$
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+*/
+#ifndef LIBEBML_ELEMENT_H
+#define LIBEBML_ELEMENT_H
+
+#include "EbmlTypes.h"
+#include "EbmlId.h"
+#include "IOCallback.h"
+
+START_LIBEBML_NAMESPACE
+
+/*!
+	\brief The size of the EBML-coded length
+*/
+int EBML_DLL_API CodedSizeLength(uint64 Length, unsigned int SizeLength, bool bSizeIsFinite = true);
+
+/*!
+	\brief The coded value of the EBML-coded length
+	\note The size of OutBuffer must be 8 octets at least
+*/
+int EBML_DLL_API CodedValueLength(uint64 Length, int CodedSize, binary * OutBuffer);
+
+/*!
+	\brief Read an EBML-coded value from a buffer
+	\return the value read
+*/
+uint64 EBML_DLL_API ReadCodedSizeValue(const binary * InBuffer, uint32 & BufferSize, uint64 & SizeUnknown);
+
+/*!
+	\brief The size of the EBML-coded signed length
+*/
+int EBML_DLL_API CodedSizeLengthSigned(int64 Length, unsigned int SizeLength);
+
+/*!
+	\brief The coded value of the EBML-coded signed length
+	\note the size of OutBuffer must be 8 octets at least
+*/
+int EBML_DLL_API CodedValueLengthSigned(int64 Length, int CodedSize, binary * OutBuffer);
+
+/*!
+	\brief Read a signed EBML-coded value from a buffer
+	\return the value read
+*/
+int64 EBML_DLL_API ReadCodedSizeSignedValue(const binary * InBuffer, uint32 & BufferSize, uint64 & SizeUnknown);
+
+class EbmlStream;
+class EbmlSemanticContext;
+class EbmlElement;
+
+extern const EbmlSemanticContext Context_EbmlGlobal;
+
+#define DEFINE_xxx_CONTEXT(x,global) \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(countof(ContextList_##x), ContextList_##x, NULL, global, NULL); \
+
+#define DEFINE_xxx_MASTER(x,id,idl,parent,name,global) \
+    const EbmlId Id_##x    (id, idl); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(countof(ContextList_##x), ContextList_##x, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
+    x::x() :EbmlMaster(Context_##x) {}
+
+#define DEFINE_xxx_MASTER_CONS(x,id,idl,parent,name,global) \
+    const EbmlId Id_##x    (id, idl); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(countof(ContextList_##x), ContextList_##x, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x);
+
+#define DEFINE_xxx_MASTER_ORPHAN(x,id,idl,name,global) \
+    const EbmlId Id_##x    (id, idl); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(countof(ContextList_##x), ContextList_##x, NULL, global, &EBML_INFO(x)); \
+    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
+
+#define DEFINE_xxx_CLASS(x,id,idl,parent,name,global) \
+    const EbmlId Id_##x    (id, idl); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
+    x::x() {}
+
+#define DEFINE_xxx_CLASS_CONS(x,id,idl,parent,name,global) \
+    const EbmlId Id_##x    (id, idl); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x);
+
+#define DEFINE_xxx_UINTEGER_DEF(x,id,idl,parent,name,global,defval) \
+    const EbmlId Id_##x    (id, idl); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
+    x::x() :EbmlUInteger(defval) {}
+
+#define DEFINE_xxx_SINTEGER_DEF(x,id,idl,parent,name,global,defval) \
+    const EbmlId Id_##x    (id, idl); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
+    x::x() :EbmlSInteger(defval) {}
+
+#define DEFINE_xxx_STRING_DEF(x,id,idl,parent,name,global,defval) \
+    const EbmlId Id_##x    (id, idl); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
+    x::x() :EbmlString(defval) {}
+
+#define DEFINE_xxx_FLOAT_DEF(x,id,idl,parent,name,global,defval) \
+    const EbmlId Id_##x    (id, idl); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
+    x::x() :EbmlFloat(defval) {}
+
+#define DEFINE_xxx_CLASS_GLOBAL(x,id,idl,name,global) \
+    const EbmlId Id_##x    (id, idl); \
+    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_EbmlGlobal); \
+
+#define DEFINE_xxx_CLASS_ORPHAN(x,id,idl,name,global) \
+    const EbmlId Id_##x    (id, idl); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, NULL, global, NULL); \
+    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
+
+#define DEFINE_EBML_CONTEXT(x)                             DEFINE_xxx_CONTEXT(x,*GetEbmlGlobal_Context)
+#define DEFINE_EBML_MASTER(x,id,idl,parent,name)           DEFINE_xxx_MASTER(x,id,idl,parent,name,*GetEbmlGlobal_Context)
+#define DEFINE_EBML_MASTER_ORPHAN(x,id,idl,name)           DEFINE_xxx_MASTER_ORPHAN(x,id,idl,name,*GetEbmlGlobal_Context)
+#define DEFINE_EBML_CLASS(x,id,idl,parent,name)            DEFINE_xxx_CLASS(x,id,idl,parent,name,*GetEbmlGlobal_Context)
+#define DEFINE_EBML_CLASS_GLOBAL(x,id,idl,name)            DEFINE_xxx_CLASS_GLOBAL(x,id,idl,name,*GetEbmlGlobal_Context)
+#define DEFINE_EBML_CLASS_ORPHAN(x,id,idl,name)            DEFINE_xxx_CLASS_ORPHAN(x,id,idl,name,*GetEbmlGlobal_Context)
+#define DEFINE_EBML_UINTEGER_DEF(x,id,idl,parent,name,val) DEFINE_xxx_UINTEGER_DEF(x,id,idl,parent,name,*GetEbmlGlobal_Context,val)
+#define DEFINE_EBML_STRING_DEF(x,id,idl,parent,name,val)   DEFINE_xxx_STRING_DEF(x,id,idl,parent,name,*GetEbmlGlobal_Context,val)
+#define DEFINE_EBML_BINARY_CONS(x,id,idl,parent,name)      DEFINE_xxx_CLASS_CONS(x,id,idl,parent,name,*GetEbmlGlobal_Context)
+
+#define DEFINE_SEMANTIC_CONTEXT(x)
+#define DEFINE_START_SEMANTIC(x)     static const EbmlSemantic ContextList_##x[] = {
+#define DEFINE_END_SEMANTIC(x)       };
+#define DEFINE_SEMANTIC_ITEM(m,u,c)  EbmlSemantic(m, u, EBML_INFO(c)),
+
+#define DECLARE_EBML_MASTER(x)  class EBML_DLL_API x : public EbmlMaster { \
+  public: \
+    x();
+#define DECLARE_EBML_UINTEGER(x)  class EBML_DLL_API x : public EbmlUInteger { \
+  public: \
+    x();
+#define DECLARE_EBML_STRING(x)    class EBML_DLL_API x : public EbmlString { \
+  public: \
+    x();
+#define DECLARE_EBML_BINARY(x)    class EBML_DLL_API x : public EbmlBinary { \
+  public: \
+    x();
+
+#if defined(EBML_STRICT_API)
+#define EBML_CONCRETE_CLASS(Type) \
+    public: \
+        virtual const EbmlSemanticContext &Context() const {return ClassInfos.GetContext();} \
+        virtual const char *DebugName() const {return ClassInfos.GetName();} \
+		virtual operator const EbmlId &() const {return ClassInfos.ClassId();} \
+        virtual EbmlElement & CreateElement() const {return Create();} \
+        virtual EbmlElement * Clone() const { return new Type(*this); } \
+		static EbmlElement & Create() {return *(new Type);} \
+        static const EbmlCallbacks & ClassInfo() {return ClassInfos;} \
+        static const EbmlId & ClassId() {return ClassInfos.ClassId();} \
+    private: \
+		static const EbmlCallbacks ClassInfos; \
+
+#define EBML_CONCRETE_DUMMY_CLASS(Type) \
+    public: \
+        virtual const EbmlSemanticContext &Context() const {return *static_cast<EbmlSemanticContext*>(NULL);} \
+        virtual const char *DebugName() const {return "DummyElement";} \
+		virtual operator const EbmlId &(); \
+        virtual EbmlElement & CreateElement() const {return Create();} \
+        virtual EbmlElement * Clone() const { return new Type(*this); } \
+		static EbmlElement & Create() {return *(new Type);} \
+        static const EbmlId & ClassId(); \
+		static const EbmlCallbacks ClassInfos; \
+
+
+#define EBML_INFO(ref)             ref::ClassInfo()
+#define EBML_ID(ref)               ref::ClassId()
+#define EBML_CLASS_SEMCONTEXT(ref) Context_##ref
+#define EBML_CLASS_CONTEXT(ref)    ref::ClassInfo().GetContext()
+#define EBML_CLASS_CALLBACK(ref)   ref::ClassInfo()
+#define EBML_CONTEXT(e) (e)->Context()
+#define EBML_NAME(e)    (e)->DebugName()
+
+#define EBML_INFO_ID(cb)      (cb).ClassId()
+#define EBML_INFO_NAME(cb)    (cb).GetName()
+#define EBML_INFO_CREATE(cb)  (cb).NewElement()
+#define EBML_INFO_CONTEXT(cb) (cb).GetContext()
+
+#define EBML_SEM_UNIQUE(s)  (s).IsUnique()
+#define EBML_SEM_CONTEXT(s) ((const EbmlCallbacks &)(s)).GetContext()
+#define EBML_SEM_CREATE(s)  (s).Create()
+
+#define EBML_CTX_SIZE(c)       (c).GetSize()
+#define EBML_CTX_MASTER(c)     (c).GetMaster()
+#define EBML_CTX_PARENT(c)     (c).Parent()
+#define EBML_CTX_IDX(c,i)      (c).GetSemantic(i)
+#define EBML_CTX_IDX_INFO(c,i) (const EbmlCallbacks &)((c).GetSemantic(i))
+#define EBML_CTX_IDX_ID(c,i)   ((const EbmlCallbacks &)((c).GetSemantic(i))).ClassId()
+#else
+#define EBML_CONCRETE_CLASS(Type) \
+    public: \
+		virtual const EbmlCallbacks & Generic() const {return ClassInfos;} \
+		virtual operator const EbmlId &() const {return ClassInfos.GlobalId;} \
+        virtual EbmlElement & CreateElement() const {return Create();} \
+        virtual EbmlElement * Clone() const { return new Type(*this); } \
+		static EbmlElement & Create() {return *(new Type);} \
+		static const EbmlCallbacks ClassInfos; \
+
+#define EBML_CONCRETE_DUMMY_CLASS(Type) \
+    public: \
+		virtual const EbmlCallbacks & Generic() const {return ClassInfos;} \
+		virtual operator const EbmlId &(); \
+        virtual EbmlElement & CreateElement() const {return Create();} \
+        virtual EbmlElement * Clone() const { return new Type(*this); } \
+		static EbmlElement & Create() {return *(new Type);} \
+		static const EbmlCallbacks ClassInfos; \
+
+
+#define EBML_INFO(ref)             ref::ClassInfos
+#define EBML_ID(ref)               ref::ClassInfos.GlobalId
+#define EBML_CLASS_SEMCONTEXT(ref) Context_##ref
+#define EBML_CLASS_CONTEXT(ref)    ref::ClassInfos.Context
+#define EBML_CLASS_CALLBACK(ref)   ref::ClassInfos
+#define EBML_CONTEXT(e)            (e)->Generic().Context
+#define EBML_NAME(e)               (e)->Generic().DebugName
+
+#define EBML_INFO_ID(cb)      (cb).GlobalId
+#define EBML_INFO_NAME(cb)    (cb).DebugName
+#define EBML_INFO_CREATE(cb)  (cb).Create()
+#define EBML_INFO_CONTEXT(cb) (cb).Context
+
+#define EBML_SEM_UNIQUE(s)  (s).Unique
+#define EBML_SEM_CONTEXT(s) (s).GetCallbacks.Context
+#define EBML_SEM_CREATE(s)  (s).Create()
+
+#define EBML_CTX_SIZE(c)       (c).Size
+#define EBML_CTX_MASTER(c)     (c).MasterElt
+#define EBML_CTX_PARENT(c)     (c).UpTable
+#define EBML_CTX_IDX(c,i)      (c).MyTable[(i)]
+#define EBML_CTX_IDX_INFO(c,i) (c).MyTable[(i)].GetCallbacks
+#define EBML_CTX_IDX_ID(c,i)   (c).MyTable[(i)].GetCallbacks.GlobalId
+#endif
+
+#if !defined(INVALID_FILEPOS_T)
+#define INVALID_FILEPOS_T 0
+#endif
+
+#define EBML_DEF_CONS
+#define EBML_DEF_SEP
+#define EBML_DEF_PARAM
+#define EBML_DEF_BINARY_INIT
+#define EBML_DEF_BINARY_CTX(x)
+#define EBML_DEF_SINTEGER(x)
+#define EBML_DEF_BINARY(x)
+#define EBML_EXTRA_PARAM
+#define EBML_EXTRA_CALL
+#define EBML_EXTRA_DEF
+
+// functions for generic handling of data (should be static to all classes)
+/*!
+	\todo Handle default value
+*/
+class EBML_DLL_API EbmlCallbacks {
+	public:
+		EbmlCallbacks(EbmlElement & (*Creator)(), const EbmlId & aGlobalId, const char * aDebugName, const EbmlSemanticContext & aContext);
+
+        inline const EbmlId & ClassId() const { return GlobalId; }
+        inline const EbmlSemanticContext & GetContext() const { return Context; }
+        inline const char * GetName() const { return DebugName; }
+        inline EbmlElement & NewElement() const { return Create(); }
+
+#if defined(EBML_STRICT_API)
+    private:
+#endif
+		EbmlElement & (*Create)();
+		const EbmlId & GlobalId;
+		const char * DebugName;
+		const EbmlSemanticContext & Context;
+};
+
+/*!
+	\brief contains the semantic informations for a given level and all sublevels
+	\todo move the ID in the element class
+*/
+class EBML_DLL_API EbmlSemantic {
+	public:
+		EbmlSemantic(bool aMandatory, bool aUnique, const EbmlCallbacks & aGetCallbacks)
+			:Mandatory(aMandatory), Unique(aUnique), GetCallbacks(aGetCallbacks) {}
+
+        inline bool IsMandatory() const { return Mandatory; }
+        inline bool IsUnique() const { return Unique; }
+        inline EbmlElement & Create() const { return EBML_INFO_CREATE(GetCallbacks); }
+        inline operator const EbmlCallbacks &() const { return GetCallbacks; }
+
+#if defined(EBML_STRICT_API)
+    private:
+#endif
+		bool Mandatory; ///< wether the element is mandatory in the context or not
+		bool Unique;
+		const EbmlCallbacks & GetCallbacks;
+};
+
+typedef const class EbmlSemanticContext & (*_GetSemanticContext)();
+
+/*!
+	Context of the element
+	\todo allow more than one parent ?
+*/
+class EBML_DLL_API EbmlSemanticContext {
+	public:
+		EbmlSemanticContext(size_t aSize,
+			const EbmlSemantic *aMyTable,
+			const EbmlSemanticContext *aUpTable,
+			const _GetSemanticContext aGetGlobalContext,
+			const EbmlCallbacks *aMasterElt)
+			: GetGlobalContext(aGetGlobalContext), MyTable(aMyTable), Size(aSize),
+			  UpTable(aUpTable), MasterElt(aMasterElt) {}
+
+		bool operator!=(const EbmlSemanticContext & aElt) const {
+			return ((Size != aElt.Size) || (MyTable != aElt.MyTable) ||
+				(UpTable != aElt.UpTable) || (GetGlobalContext != aElt.GetGlobalContext) |
+				(MasterElt != aElt.MasterElt));
+		}
+
+        inline size_t GetSize() const { return Size; }
+        inline const EbmlCallbacks* GetMaster() const { return MasterElt; }
+        inline const EbmlSemanticContext* Parent() const { return UpTable; }
+        const EbmlSemantic & GetSemantic(size_t i) const;
+
+		const _GetSemanticContext GetGlobalContext; ///< global elements supported at this level
+
+#if defined(EBML_STRICT_API)
+    private:
+#endif
+        const EbmlSemantic *MyTable; ///< First element in the table
+		size_t Size;          ///< number of elements in the table
+		const EbmlSemanticContext *UpTable; ///< Parent element
+		/// \todo replace with the global context directly
+		const EbmlCallbacks *MasterElt;
+};
+
+/*!
+	\class EbmlElement
+	\brief Hold basic informations about an EBML element (ID + length)
+*/
+class EBML_DLL_API EbmlElement {
+	public:
+		EbmlElement(uint64 aDefaultSize, bool bValueSet = false);
+		virtual ~EbmlElement();
+
+		/// Set the minimum length that will be used to write the element size (-1 = optimal)
+		void SetSizeLength(int NewSizeLength) {SizeLength = NewSizeLength;}
+		int GetSizeLength() const {return SizeLength;}
+
+		static EbmlElement * FindNextElement(IOCallback & DataStream, const EbmlSemanticContext & Context, int & UpperLevel, uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel = 1);
+		static EbmlElement * FindNextID(IOCallback & DataStream, const EbmlCallbacks & ClassInfos, uint64 MaxDataSize);
+
+		/*!
+			\brief find the next element with the same ID
+		*/
+		EbmlElement * FindNext(IOCallback & DataStream, uint64 MaxDataSize);
+
+		EbmlElement * SkipData(EbmlStream & DataStream, const EbmlSemanticContext & Context, EbmlElement * TestReadElt = NULL, bool AllowDummyElt = false);
+
+		/*!
+			\brief Give a copy of the element, all data inside the element is copied
+			\return NULL if there is not enough memory
+		*/
+		virtual EbmlElement * Clone() const = 0;
+
+		virtual operator const EbmlId &() const = 0;
+#if defined(EBML_STRICT_API)
+        virtual const char *DebugName() const = 0;
+        virtual const EbmlSemanticContext &Context() const = 0;
+#else
+		/// return the generic callback to monitor a derived class
+		virtual const EbmlCallbacks & Generic() const = 0;
+#endif
+        virtual EbmlElement & CreateElement() const = 0;
+
+		// by default only allow to set element as finite (override when needed)
+		virtual bool SetSizeInfinite(bool bIsInfinite = true) {return !bIsInfinite;}
+
+		virtual bool ValidateSize() const = 0;
+
+		uint64 GetElementPosition() const {
+			return ElementPosition;
+		}
+
+		uint64 ElementSize(bool bWithDefault = false) const; /// return the size of the header+data, before writing
+
+		filepos_t Render(IOCallback & output, bool bWithDefault = false, bool bKeepPosition = false, bool bForceRender = false);
+
+		virtual filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false) = 0; /// update the Size of the Data stored
+		virtual filepos_t GetSize() const {return Size;} /// return the size of the data stored in the element, on reading
+
+		virtual filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA) = 0;
+		virtual void Read(EbmlStream & inDataStream, const EbmlSemanticContext & Context, int & UpperEltFound, EbmlElement * & FoundElt, bool AllowDummyElt = false, ScopeMode ReadFully = SCOPE_ALL_DATA);
+
+		bool IsLocked() const {return bLocked;}
+		void Lock(bool bLock = true) { bLocked = bLock;}
+
+		/*!
+			\brief default comparison for elements that can't be compared
+		*/
+		virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
+		static bool CompareElements(const EbmlElement *A, const EbmlElement *B);
+
+		virtual bool IsDummy() const {return false;}
+		virtual bool IsMaster() const {return false;}
+
+		uint8 HeadSize() const {
+			return EBML_ID_LENGTH((const EbmlId&)*this) + CodedSizeLength(Size, SizeLength, bSizeIsFinite);
+		} /// return the size of the head, on reading/writing
+
+		/*!
+			\brief Force the size of an element
+			\warning only possible if the size is "undefined"
+		*/
+		bool ForceSize(uint64 NewSize);
+
+		filepos_t OverwriteHead(IOCallback & output, bool bKeepPosition = false);
+
+		/*!
+			\brief void the content of the element (replace by EbmlVoid)
+		*/
+		uint64 VoidMe(IOCallback & output, bool bWithDefault = false);
+
+		bool DefaultISset() const {return DefaultIsSet;}
+		virtual bool IsDefaultValue() const = 0;
+		bool IsFiniteSize() const {return bSizeIsFinite;}
+
+		/*!
+			\brief set the default size of an element
+		*/
+		virtual void SetDefaultSize(uint64 aDefaultSize) {DefaultSize = aDefaultSize;}
+
+		bool ValueIsSet() const {return bValueIsSet;}
+
+		inline uint64 GetEndPosition() const {
+			assert(bSizeIsFinite); // we don't know where the end is
+			return SizePosition + CodedSizeLength(Size, SizeLength, bSizeIsFinite) + Size;
+		}
+
+	protected:
+		/*!
+			\brief find any element in the stream
+			\return a DummyRawElement if the element is unknown or NULL if the element dummy is not allowed
+		*/
+		static EbmlElement *CreateElementUsingContext(const EbmlId & aID, const EbmlSemanticContext & Context, int & LowLevel, bool IsGlobalContext, bool bAllowDummy = false, unsigned int MaxLowerLevel = 1);
+
+		filepos_t RenderHead(IOCallback & output, bool bForceRender, bool bWithDefault = false, bool bKeepPosition = false);
+		filepos_t MakeRenderHead(IOCallback & output, bool bKeepPosition);
+
+		/*!
+			\brief prepare the data before writing them (in case it's not already done by default)
+		*/
+		virtual filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false) = 0;
+
+		/*!
+			\brief special constructor for cloning
+		*/
+		EbmlElement(const EbmlElement & ElementToClone);
+
+        inline uint64 GetDefaultSize() const {return DefaultSize;}
+        inline void SetSize_(uint64 aSize) {Size = aSize;}
+        inline void SetValueIsSet(bool Set = true) {bValueIsSet = Set;}
+        inline void SetDefaultIsSet(bool Set = true) {DefaultIsSet = Set;}
+        inline void SetSizeIsFinite(bool Set = true) {bSizeIsFinite = Set;}
+        inline uint64 GetSizePosition() const {return SizePosition;}
+
+#if defined(EBML_STRICT_API)
+	private:
+#endif
+		uint64 Size;        ///< the size of the data to write
+		uint64 DefaultSize; ///< Minimum data size to fill on rendering (0 = optimal)
+		int SizeLength; /// the minimum size on which the size will be written (0 = optimal)
+		bool bSizeIsFinite;
+		uint64 ElementPosition;
+		uint64 SizePosition;
+		bool bValueIsSet;
+		bool DefaultIsSet;
+		bool bLocked;
+};
+
+END_LIBEBML_NAMESPACE
+
+#endif // LIBEBML_ELEMENT_H

ebml/EbmlFloat.h

@@ -30,7 +30,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlFloat.h 1079 2005-03-03 13:18:14Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_FLOAT_H
@@ -79,8 +79,8 @@ class EBML_DLL_API EbmlFloat : public EbmlElement {
 
 		virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
 		
-		operator const float() const {return float(Value);}
-		operator const double() const {return double(Value);}
+		operator const float() const;
+		operator const double() const;
 
 		void SetDefaultValue(double);
     

ebml/EbmlSInteger.h

@@ -30,7 +30,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlSInteger.h 1079 2005-03-03 13:18:14Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 	\author Julien Coloos    <suiryc @ users.sf.net>
 	\author Moritz Bunkus    <moritz @ bunkus.org>
@@ -64,17 +64,17 @@ class EBML_DLL_API EbmlSInteger : public EbmlElement {
 		*/
         virtual void SetDefaultSize(uint64 nDefaultSize = DEFAULT_INT_SIZE) {EbmlElement::SetDefaultSize(nDefaultSize); SetSize_(nDefaultSize);}
 
-		virtual bool ValidateSize() const {return (GetSize() <= 8);}
+		virtual bool ValidateSize() const {return IsFiniteSize() && (GetSize() <= 8);}
 		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
 		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
 		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
 
 		virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
 
-		operator int8() {return  int8(Value);}
-		operator int16() {return int16(Value);}
-		operator int32() {return int32(Value);}
-		operator int64() {return Value;}
+		operator int8();
+		operator int16();
+		operator int32();
+		operator int64();
 
 		void SetDefaultValue(int64 aValue) {assert(!DefaultISset()); DefaultValue = aValue; SetDefaultIsSet();}
 

ebml/EbmlStream.h

@@ -1,76 +1,76 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlStream.h 639 2004-07-09 20:59:14Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#ifndef LIBEBML_STREAM_H
-#define LIBEBML_STREAM_H
-
-#include "EbmlTypes.h"
-#include "IOCallback.h"
-#include "EbmlElement.h"
-
-START_LIBEBML_NAMESPACE
-
-/*!
-    \class EbmlStream
-    \brief Handle an input/output stream of EBML elements
-*/
-class EBML_DLL_API EbmlStream {
-	public:
-		EbmlStream(IOCallback & output);
-		~EbmlStream();
-	
-		/*!
-			\brief Find a possible next ID in the data stream
-			\param MaxDataSize The maximum possible of the data in the element (for sanity checks)
-			\note the user will have to delete that element later
-		*/
-		EbmlElement * FindNextID(const EbmlCallbacks & ClassInfos, const uint64 MaxDataSize);
-
-		EbmlElement * FindNextElement(const EbmlSemanticContext & Context, int & UpperLevel, const uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel = 1);
-
-		inline IOCallback & I_O() {return Stream;}
-        operator IOCallback &() {return Stream;}
-
-#if defined(EBML_STRICT_API)
-    private:
-#else
-    protected:
-#endif
-		IOCallback & Stream;
-};
-
-END_LIBEBML_NAMESPACE
-
-#endif // LIBEBML_STREAM_H
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id$
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+*/
+#ifndef LIBEBML_STREAM_H
+#define LIBEBML_STREAM_H
+
+#include "EbmlTypes.h"
+#include "IOCallback.h"
+#include "EbmlElement.h"
+
+START_LIBEBML_NAMESPACE
+
+/*!
+    \class EbmlStream
+    \brief Handle an input/output stream of EBML elements
+*/
+class EBML_DLL_API EbmlStream {
+	public:
+		EbmlStream(IOCallback & output);
+		~EbmlStream();
+	
+		/*!
+			\brief Find a possible next ID in the data stream
+			\param MaxDataSize The maximum possible of the data in the element (for sanity checks)
+			\note the user will have to delete that element later
+		*/
+		EbmlElement * FindNextID(const EbmlCallbacks & ClassInfos, uint64 MaxDataSize);
+
+		EbmlElement * FindNextElement(const EbmlSemanticContext & Context, int & UpperLevel, uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel = 1);
+
+		inline IOCallback & I_O() {return Stream;}
+        operator IOCallback &() {return Stream;}
+
+#if defined(EBML_STRICT_API)
+    private:
+#else
+    protected:
+#endif
+		IOCallback & Stream;
+};
+
+END_LIBEBML_NAMESPACE
+
+#endif // LIBEBML_STREAM_H

ebml/EbmlString.h

@@ -1,85 +1,85 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlString.h 1079 2005-03-03 13:18:14Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#ifndef LIBEBML_STRING_H
-#define LIBEBML_STRING_H
-
-#include <string>
-
-#include "EbmlTypes.h"
-#include "EbmlElement.h"
-
-START_LIBEBML_NAMESPACE
-
-/*!
-    \class EbmlString
-    \brief Handle all operations on a printable string EBML element
-*/
-class EBML_DLL_API EbmlString : public EbmlElement {
-	public:
-		EbmlString();
-		EbmlString(const std::string & aDefaultValue);
-		EbmlString(const EbmlString & ElementToClone);
-	
-		virtual ~EbmlString() {}
-	
-		virtual bool ValidateSize() const {return true;} // any size is possible
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
-		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
-		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
-	
-		EbmlString & operator=(const std::string &);
-		operator const std::string &() const {return Value;}
-	
-		void SetDefaultValue(std::string &);
-    
-		const std::string & DefaultVal() const;
-
-		bool IsDefaultValue() const {
-			return (DefaultISset() && Value == DefaultValue);
-		}
-
-#if defined(EBML_STRICT_API)
-    private:
-#else
-    protected:
-#endif
-		std::string Value;  /// The actual value of the element
-		std::string DefaultValue;
-};
-
-END_LIBEBML_NAMESPACE
-
-#endif // LIBEBML_STRING_H
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id$
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+*/
+#ifndef LIBEBML_STRING_H
+#define LIBEBML_STRING_H
+
+#include <string>
+
+#include "EbmlTypes.h"
+#include "EbmlElement.h"
+
+START_LIBEBML_NAMESPACE
+
+/*!
+    \class EbmlString
+    \brief Handle all operations on a printable string EBML element
+*/
+class EBML_DLL_API EbmlString : public EbmlElement {
+	public:
+		EbmlString();
+		EbmlString(const std::string & aDefaultValue);
+		EbmlString(const EbmlString & ElementToClone);
+	
+		virtual ~EbmlString() {}
+	
+		virtual bool ValidateSize() const {return IsFiniteSize();} // any size is possible
+		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
+		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
+	
+		EbmlString & operator=(const std::string &);
+		operator const std::string &() const;
+	
+		void SetDefaultValue(std::string &);
+    
+		const std::string & DefaultVal() const;
+
+		bool IsDefaultValue() const {
+			return (DefaultISset() && Value == DefaultValue);
+		}
+
+#if defined(EBML_STRICT_API)
+    private:
+#else
+    protected:
+#endif
+		std::string Value;  /// The actual value of the element
+		std::string DefaultValue;
+};
+
+END_LIBEBML_NAMESPACE
+
+#endif // LIBEBML_STRING_H

ebml/EbmlUInteger.h

@@ -30,7 +30,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlUInteger.h 1079 2005-03-03 13:18:14Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 	\author Julien Coloos    <suiryc @ users.sf.net>
 	\author Moritz Bunkus    <moritz @ bunkus.org>
@@ -62,21 +62,21 @@ class EBML_DLL_API EbmlUInteger : public EbmlElement {
 		*/
 		virtual void SetDefaultSize(uint64 nDefaultSize = DEFAULT_UINT_SIZE) {EbmlElement::SetDefaultSize(nDefaultSize); SetSize_(nDefaultSize);}
 
-		virtual bool ValidateSize() const {return (GetSize() <= 8);}
+		virtual bool ValidateSize() const {return IsFiniteSize() && (GetSize() <= 8);}
 		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
 		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
 		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
 		
 		virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
 		
-		operator uint8()  const {return uint8(Value); }
-		operator uint16() const {return uint16(Value);}
-		operator uint32() const {return uint32(Value);}
-		operator uint64() const {return Value;}
+		operator uint8()  const;
+		operator uint16() const;
+		operator uint32() const;
+		operator uint64() const;
 
 		void SetDefaultValue(uint64);
     
-		const uint64 DefaultVal() const;
+		uint64 DefaultVal() const;
 
 		bool IsDefaultValue() const {
 			return (DefaultISset() && Value == DefaultValue);

ebml/EbmlUnicodeString.h

@@ -1,134 +1,134 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlUnicodeString.h 1079 2005-03-03 13:18:14Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Moritz Bunkus <moritz @ bunkus.org>
-	\author Jory Stone       <jcsston @ toughguy.net>
-*/
-#ifndef LIBEBML_UNICODE_STRING_H
-#define LIBEBML_UNICODE_STRING_H
-
-#include <string>
-
-#include "EbmlTypes.h"
-#include "EbmlElement.h"
-
-START_LIBEBML_NAMESPACE
-
-/*!
-  \class UTFstring
-  A class storing strings in a wchar_t (ie, in UCS-2 or UCS-4)
-  \note inspired by wstring which is not available everywhere
-*/
-class EBML_DLL_API UTFstring {
-public:
-	typedef wchar_t value_type;
-
-	UTFstring();
-	UTFstring(const wchar_t *); // should be NULL terminated
-	UTFstring(const UTFstring &);
-	
-	virtual ~UTFstring();
-	bool operator==(const UTFstring&) const;
-	inline bool operator!=(const UTFstring &cmp) const
-	{
-		return !(*this == cmp);
-	}
-	UTFstring & operator=(const UTFstring &);
-	UTFstring & operator=(const wchar_t *);
-	UTFstring & operator=(wchar_t);
-
-	/// Return length of string
-	size_t length() const {return _Length;}
-
-	operator const wchar_t*() const {return _Data;}
-	const wchar_t* c_str() const {return _Data;}
-
-	const std::string & GetUTF8() const {return UTF8string;}
-	void SetUTF8(const std::string &);
-
-#if defined(EBML_STRICT_API)
-    private:
-#else
-    protected:
-#endif
-	size_t _Length; ///< length of the UCS string excluding the \0
-	wchar_t* _Data; ///< internal UCS representation	
-	std::string UTF8string;
-	static bool wcscmp_internal(const wchar_t *str1, const wchar_t *str2);
-	void UpdateFromUTF8();
-	void UpdateFromUCS2();
-};
-
-
-/*!
-    \class EbmlUnicodeString
-    \brief Handle all operations on a Unicode string EBML element
-	\note internally treated as a string made of wide characters (ie UCS-2 or UCS-4 depending on the machine)
-*/
-class EBML_DLL_API EbmlUnicodeString : public EbmlElement {
-	public:
-		EbmlUnicodeString();
-		EbmlUnicodeString(const UTFstring & DefaultValue);
-		EbmlUnicodeString(const EbmlUnicodeString & ElementToClone);
-	
-		virtual ~EbmlUnicodeString() {}
-	
-		virtual bool ValidateSize() const {return true;} // any size is possible
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
-		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
-		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
-	
-		EbmlUnicodeString & operator=(const UTFstring &); ///< platform dependant code
-		operator const UTFstring &() const {return Value;}
-	
-		void SetDefaultValue(UTFstring &);
-    
-		const UTFstring & DefaultVal() const;
-
-		bool IsDefaultValue() const {
-			return (DefaultISset() && Value == DefaultValue);
-		}
-
-#if defined(EBML_STRICT_API)
-    private:
-#else
-    protected:
-#endif
-		UTFstring Value; /// The actual value of the element
-		UTFstring DefaultValue;
-};
-
-END_LIBEBML_NAMESPACE
-
-#endif // LIBEBML_UNICODE_STRING_H
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id$
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+	\author Moritz Bunkus <moritz @ bunkus.org>
+	\author Jory Stone       <jcsston @ toughguy.net>
+*/
+#ifndef LIBEBML_UNICODE_STRING_H
+#define LIBEBML_UNICODE_STRING_H
+
+#include <string>
+
+#include "EbmlTypes.h"
+#include "EbmlElement.h"
+
+START_LIBEBML_NAMESPACE
+
+/*!
+  \class UTFstring
+  A class storing strings in a wchar_t (ie, in UCS-2 or UCS-4)
+  \note inspired by wstring which is not available everywhere
+*/
+class EBML_DLL_API UTFstring {
+public:
+	typedef wchar_t value_type;
+
+	UTFstring();
+	UTFstring(const wchar_t *); // should be NULL terminated
+	UTFstring(const UTFstring &);
+	
+	virtual ~UTFstring();
+	bool operator==(const UTFstring&) const;
+	inline bool operator!=(const UTFstring &cmp) const
+	{
+		return !(*this == cmp);
+	}
+	UTFstring & operator=(const UTFstring &);
+	UTFstring & operator=(const wchar_t *);
+	UTFstring & operator=(wchar_t);
+
+	/// Return length of string
+	size_t length() const {return _Length;}
+
+	operator const wchar_t*() const;
+	const wchar_t* c_str() const {return _Data;}
+
+	const std::string & GetUTF8() const {return UTF8string;}
+	void SetUTF8(const std::string &);
+
+#if defined(EBML_STRICT_API)
+    private:
+#else
+    protected:
+#endif
+	size_t _Length; ///< length of the UCS string excluding the \0
+	wchar_t* _Data; ///< internal UCS representation	
+	std::string UTF8string;
+	static bool wcscmp_internal(const wchar_t *str1, const wchar_t *str2);
+	void UpdateFromUTF8();
+	void UpdateFromUCS2();
+};
+
+
+/*!
+    \class EbmlUnicodeString
+    \brief Handle all operations on a Unicode string EBML element
+	\note internally treated as a string made of wide characters (ie UCS-2 or UCS-4 depending on the machine)
+*/
+class EBML_DLL_API EbmlUnicodeString : public EbmlElement {
+	public:
+		EbmlUnicodeString();
+		EbmlUnicodeString(const UTFstring & DefaultValue);
+		EbmlUnicodeString(const EbmlUnicodeString & ElementToClone);
+	
+		virtual ~EbmlUnicodeString() {}
+	
+		virtual bool ValidateSize() const {return IsFiniteSize();} // any size is possible
+		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
+		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
+	
+		EbmlUnicodeString & operator=(const UTFstring &); ///< platform dependant code
+		operator const UTFstring &() const;
+	
+		void SetDefaultValue(UTFstring &);
+    
+		const UTFstring & DefaultVal() const;
+
+		bool IsDefaultValue() const {
+			return (DefaultISset() && Value == DefaultValue);
+		}
+
+#if defined(EBML_STRICT_API)
+    private:
+#else
+    protected:
+#endif
+		UTFstring Value; /// The actual value of the element
+		UTFstring DefaultValue;
+};
+
+END_LIBEBML_NAMESPACE
+
+#endif // LIBEBML_UNICODE_STRING_H

ebml/EbmlVersion.h

@@ -1,56 +1,56 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlVersion.h 1326 2009-08-23 00:47:52Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#ifndef LIBEBML_VERSION_H
-#define LIBEBML_VERSION_H
-
-#include <string>
-
-#include "EbmlConfig.h"
-
-START_LIBEBML_NAMESPACE
-
-#define LIBEBML_VERSION 0x000800
-
-static const std::string EbmlCodeVersion = "0.8.0";
-static const std::string EbmlCodeDate    = __TIMESTAMP__;
-
-/*!
-	\todo Closer relation between an element and the context it comes from (context is an element attribute ?)
-*/
-
-END_LIBEBML_NAMESPACE
-
-#endif // LIBEBML_VERSION_H
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id$
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+*/
+#ifndef LIBEBML_VERSION_H
+#define LIBEBML_VERSION_H
+
+#include <string>
+
+#include "EbmlConfig.h"
+
+START_LIBEBML_NAMESPACE
+
+#define LIBEBML_VERSION 0x010202
+
+extern const std::string EbmlCodeVersion;
+extern const std::string EbmlCodeDate;
+
+/*!
+	\todo Closer relation between an element and the context it comes from (context is an element attribute ?)
+*/
+
+END_LIBEBML_NAMESPACE
+
+#endif // LIBEBML_VERSION_H

libebml.proj

@@ -1,67 +1,67 @@
-Include "*/*.proj"
-
-LIB ebml
-{
-  PROJECT_VERSION 0.7.9
-
-  INCLUDE .
-  EXPINCLUDE .
-  EXPDEFINE(USE_EBML_STRICT_API) EBML_STRICT_API
-  DEFINE(USE_EBML_STRICT_API) EBML_STRICT_API
-
-//  OPTIMIZE_GLOBALLY .
-  FAVOR_MAX_SPEED .
-  REDUCE_SIZE .
-  FASTER_FLOAT .
-  
-//  SOURCE src/Debug.cpp
-  SOURCE src/EbmlBinary.cpp
-  SOURCE src/EbmlContexts.cpp
-  SOURCE src/EbmlCrc32.cpp
-  SOURCE src/EbmlDate.cpp
-  SOURCE src/EbmlDummy.cpp
-  SOURCE src/EbmlElement.cpp
-  SOURCE src/EbmlFloat.cpp
-  SOURCE src/EbmlHead.cpp
-  SOURCE src/EbmlMaster.cpp
-  SOURCE src/EbmlSInteger.cpp
-  SOURCE src/EbmlStream.cpp
-  SOURCE src/EbmlString.cpp
-  SOURCE src/EbmlSubHead.cpp
-  SOURCE src/EbmlUInteger.cpp
-  SOURCE src/EbmlUnicodeString.cpp
-  SOURCE src/EbmlVersion.cpp
-  SOURCE src/EbmlVoid.cpp
-  SOURCE src/IOCallback.cpp
-  SOURCE src/MemIOCallback.cpp
-  SOURCE src/StdIOCallback.cpp
-  SOURCE(TARGET_WIN) src/platform/win32/WinIOCallback.cpp
-
-  HEADER(TARGET_WIN) src/platform/win32/WinIOCallback.h
-//  HEADER ebml/Debug.h
-  HEADER ebml/EbmlBinary.h
-  HEADER ebml/EbmlConfig.h
-  HEADER ebml/EbmlContexts.h
-  HEADER ebml/EbmlCrc32.h
-  HEADER ebml/EbmlDate.h
-  HEADER ebml/EbmlDummy.h
-  HEADER ebml/EbmlElement.h
-  HEADER ebml/EbmlEndian.h
-  HEADER ebml/EbmlFloat.h
-  HEADER ebml/EbmlHead.h
-  HEADER ebml/EbmlId.h
-  HEADER ebml/EbmlMaster.h
-  HEADER ebml/EbmlSInteger.h
-  HEADER ebml/EbmlStream.h
-  HEADER ebml/EbmlString.h
-  HEADER ebml/EbmlSubHead.h
-  HEADER ebml/EbmlTypes.h
-  HEADER ebml/EbmlUInteger.h
-  HEADER ebml/EbmlUnicodeString.h
-  HEADER ebml/EbmlVersion.h
-  HEADER ebml/EbmlVoid.h
-  HEADER ebml/IOCallback.h
-  HEADER ebml/MemIOCallback.h
-  HEADER ebml/StdIOCallback.h
-  HEADER ebml/c/libebml_t.h
-}
+#include "*/*.proj"
+
+LIB ebml
+{
+  PROJECT_VERSION 1.2.2
+
+  INCLUDE .
+  EXPINCLUDE .
+  EXPDEFINE(USE_EBML_STRICT_API) EBML_STRICT_API
+  DEFINE(USE_EBML_STRICT_API) EBML_STRICT_API
+
+//  OPTIMIZE_GLOBALLY .
+  FAVOR_MAX_SPEED .
+  REDUCE_SIZE .
+  FASTER_FLOAT .
+  
+  SOURCE src/Debug.cpp
+  SOURCE src/EbmlBinary.cpp
+  SOURCE src/EbmlContexts.cpp
+  SOURCE src/EbmlCrc32.cpp
+  SOURCE src/EbmlDate.cpp
+  SOURCE src/EbmlDummy.cpp
+  SOURCE src/EbmlElement.cpp
+  SOURCE src/EbmlFloat.cpp
+  SOURCE src/EbmlHead.cpp
+  SOURCE src/EbmlMaster.cpp
+  SOURCE src/EbmlSInteger.cpp
+  SOURCE src/EbmlStream.cpp
+  SOURCE src/EbmlString.cpp
+  SOURCE src/EbmlSubHead.cpp
+  SOURCE src/EbmlUInteger.cpp
+  SOURCE src/EbmlUnicodeString.cpp
+  SOURCE src/EbmlVersion.cpp
+  SOURCE src/EbmlVoid.cpp
+  SOURCE src/IOCallback.cpp
+  SOURCE src/MemIOCallback.cpp
+  SOURCE src/StdIOCallback.cpp
+  SOURCE(TARGET_WIN) src/platform/win32/WinIOCallback.cpp
+
+  HEADER(TARGET_WIN) src/platform/win32/WinIOCallback.h
+  HEADER ebml/Debug.h
+  HEADER ebml/EbmlBinary.h
+  HEADER ebml/EbmlConfig.h
+  HEADER ebml/EbmlContexts.h
+  HEADER ebml/EbmlCrc32.h
+  HEADER ebml/EbmlDate.h
+  HEADER ebml/EbmlDummy.h
+  HEADER ebml/EbmlElement.h
+  HEADER ebml/EbmlEndian.h
+  HEADER ebml/EbmlFloat.h
+  HEADER ebml/EbmlHead.h
+  HEADER ebml/EbmlId.h
+  HEADER ebml/EbmlMaster.h
+  HEADER ebml/EbmlSInteger.h
+  HEADER ebml/EbmlStream.h
+  HEADER ebml/EbmlString.h
+  HEADER ebml/EbmlSubHead.h
+  HEADER ebml/EbmlTypes.h
+  HEADER ebml/EbmlUInteger.h
+  HEADER ebml/EbmlUnicodeString.h
+  HEADER ebml/EbmlVersion.h
+  HEADER ebml/EbmlVoid.h
+  HEADER ebml/IOCallback.h
+  HEADER ebml/MemIOCallback.h
+  HEADER ebml/StdIOCallback.h
+  HEADER ebml/c/libebml_t.h
+}

make/linux/Makefile

@@ -49,7 +49,7 @@ LIBS=
 # Names
 LIBRARY=libebml.a
 LIBRARY_SO=libebml.so
-LIBRARY_SO_VER=libebml.so.0
+LIBRARY_SO_VER=libebml.so.3
 
 # source-files
 sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))

make/linux/fedora-core.spec

@@ -1,67 +1,67 @@
-# SPEC file for libebml on (at least) Fedora Core 1, 2, 3
-
-Name: 		libebml
-Version: 0.7.5
-Release: 1
-License: 	LGPL
-Summary:	Extensible Binary Meta Language
-Group:		System Environment/Libraries
-URL: 		http://ebml.sourceforge.net/
-Vendor:         Moritz Bunkus <moritz@bunkus.org>
-Source:		http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2
-BuildRoot: 	%{_tmppath}/%{name}-root
-
-%description
-EBML was designed to be a simplified binary extension of XML for
-the purpose of storing and manipulating data in a hierarchical
-form with variable field lengths.
-It uses the same paradigms as XML files, ie syntax and semantic
-are separated. So a generic EBML library could read any format
-based on it. The interpretation of data is up to a specific
-application that knows how each elements (equivalent of XML tag)
-has to be handled.
-
-%package devel
-Summary:	Extensible Binary Meta Language headers/development files
-Group:		Development/Libraries
-
-%description devel
-EBML was designed to be a simplified binary extension of XML for
-the purpose of storing and manipulating data in a hierarchical
-form with variable field lengths.
-It uses the same paradigms as XML files, ie syntax and semantic
-are separated. So a generic EBML library could read any format
-based on it. The interpretation of data is up to a specific
-application that knows how each elements (equivalent of XML tag)
-has to be handled.
-
-%prep
-%setup -q
-
-%build
-cd make/linux
-CFLAGS="$RPM_OPT_FLAGS" \
-make \
-prefix="%{_prefix}" staticlib
-cd ../..
-
-%install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-cd make/linux
-make prefix=$RPM_BUILD_ROOT/%{_prefix} install_staticlib install_headers
-cd ../..
-
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%files devel
-%defattr(-, root, root)
-%{_includedir}/ebml/*.h
-%{_includedir}/ebml/c/*.h
-%{_libdir}/libebml.a
-
-%changelog
-* Sat Apr 16 2005 Moritz Bunkus <moritz@bunkus.org>
-- updated for the new libebml build targets
-* Fri May 15 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
-- create spec file
+# SPEC file for libebml on (at least) Fedora Core 1, 2, 3
+
+Name: 		libebml
+Version: 1.2.2
+Release: 1
+License: 	LGPL
+Summary:	Extensible Binary Meta Language
+Group:		System Environment/Libraries
+URL: 		http://ebml.sourceforge.net/
+Vendor:         Moritz Bunkus <moritz@bunkus.org>
+Source:		http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2
+BuildRoot: 	%{_tmppath}/%{name}-root
+
+%description
+EBML was designed to be a simplified binary extension of XML for
+the purpose of storing and manipulating data in a hierarchical
+form with variable field lengths.
+It uses the same paradigms as XML files, ie syntax and semantic
+are separated. So a generic EBML library could read any format
+based on it. The interpretation of data is up to a specific
+application that knows how each elements (equivalent of XML tag)
+has to be handled.
+
+%package devel
+Summary:	Extensible Binary Meta Language headers/development files
+Group:		Development/Libraries
+
+%description devel
+EBML was designed to be a simplified binary extension of XML for
+the purpose of storing and manipulating data in a hierarchical
+form with variable field lengths.
+It uses the same paradigms as XML files, ie syntax and semantic
+are separated. So a generic EBML library could read any format
+based on it. The interpretation of data is up to a specific
+application that knows how each elements (equivalent of XML tag)
+has to be handled.
+
+%prep
+%setup -q
+
+%build
+cd make/linux
+CFLAGS="$RPM_OPT_FLAGS" \
+make \
+prefix="%{_prefix}" staticlib
+cd ../..
+
+%install
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+cd make/linux
+make prefix=$RPM_BUILD_ROOT/%{_prefix} libdir=$RPM_BUILD_ROOT/%{_libdir} install_staticlib install_headers
+cd ../..
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+%files devel
+%defattr(-, root, root)
+%{_includedir}/ebml/*.h
+%{_includedir}/ebml/c/*.h
+%{_libdir}/libebml.a
+
+%changelog
+* Sat Apr 16 2005 Moritz Bunkus <moritz@bunkus.org>
+- updated for the new libebml build targets
+* Fri May 15 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+- create spec file

make/linux/suse-libebml-makefile.diff

@@ -1,14 +0,0 @@
---- libebml-0.7.1/make/linux/Makefile~	2004-09-01 22:24:12.520218192 +0200
-+++ libebml-0.7.1/make/linux/Makefile	2004-09-01 22:25:30.976291056 +0200
-@@ -14,9 +14,9 @@
- ifeq (BeOS,$(shell uname -s))
- prefix=/boot/home/config
- else
--prefix=/usr/local
-+prefix=$(PREFIX)
- endif
--libdir=$(prefix)/lib
-+libdir=$(LIBDIR)
- includedir=$(prefix)/include/ebml
- 
- # Programs

make/linux/suse.spec

@@ -1,71 +1,69 @@
-#
-# spec file for package libebml for (at least) SuSE Linux 9.0, 9.1
-#
-# Copyright (c) 2004 SUSE LINUX AG, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
-#
-
-# neededforbuild  gcc-c++ libstdc++-devel
-
-BuildRequires: bzip2 cpp libebml make patch tar zlib zlib-devel binutils gcc gcc-c++ libstdc++-devel perl rpm
-
-Name:         libebml
-URL:          http://sourceforge.net/projects/ebml
-Version: 0.7.8
-Release: 1
-Summary:      libary to parse EBML files.
-License:      LGPL
-Group:        Development/Libraries/Other
-Source:       %{name}-%{version}.tar.bz2
-Patch:        suse-libebml-makefile.diff
-Summary:      libary to parse EBML files.
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Prefix:       /usr
-
-%description
-libebml is a C++ libary to parse EBML files. See the EBML RFV at
-http://www.matroska.org/technical/specs/rfc/
-
-
-
-Authors:
---------
-    Steve Lhomme <steve.lhomme@free.fr>
-    Moritz Bunkus <moritz@bunkus.org>
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-%setup
-%patch -p1
-
-%build
-export CFLAGS="$RPM_OPT_FLAGS"
-cd make/linux
-make PREFIX=$RPM_BUILD_ROOT/usr LIBDIR=%{_libdir} staticlib
-
-%install
-cd make/linux
-make install_staticlib install_headers PREFIX=$RPM_BUILD_ROOT/usr LIBDIR=$RPM_BUILD_ROOT/%{_libdir}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%run_ldconfig
-
-%postun
-%run_ldconfig
-
-%files
-%defattr (-,root,root)
-%{_libdir}/libebml.a
-/usr/include/ebml
-
-%changelog -n libebml
-* Sat Apr 16 2005 - moritz@bunkus.org
-- modified for the new libebml build targets
-* Wed Sep 01 2004 - seife@suse.de
-- initial submission
+#
+# spec file for package libebml for (at least) SuSE Linux 9.0, 9.1
+#
+# Copyright (c) 2004 SUSE LINUX AG, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://www.suse.de/feedback/
+#
+
+# neededforbuild  gcc-c++ libstdc++-devel
+
+BuildRequires: bzip2 cpp make tar zlib zlib-devel binutils gcc gcc-c++ libstdc++-devel perl rpm
+
+Name:         libebml
+URL:          http://sourceforge.net/projects/ebml
+Version: 1.2.2
+Release: 1
+Summary:      libary to parse EBML files.
+License:      LGPL
+Group:        Development/Libraries/Other
+Source:       %{name}-%{version}.tar.bz2
+Summary:      libary to parse EBML files.
+BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Prefix:       /usr
+
+%description
+libebml is a C++ libary to parse EBML files. See the EBML RFV at
+http://www.matroska.org/technical/specs/rfc/
+
+
+
+Authors:
+--------
+    Steve Lhomme <steve.lhomme@free.fr>
+    Moritz Bunkus <moritz@bunkus.org>
+
+%prep
+rm -rf $RPM_BUILD_ROOT
+%setup
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+cd make/linux
+make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} staticlib
+
+%install
+cd make/linux
+make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install_staticlib install_headers
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%run_ldconfig
+
+%postun
+%run_ldconfig
+
+%files
+%defattr (-,root,root)
+%{_libdir}/libebml.a
+/usr/include/ebml
+
+%changelog -n libebml
+* Sat Apr 16 2005 - moritz@bunkus.org
+- modified for the new libebml build targets
+* Wed Sep 01 2004 - seife@suse.de
+- initial submission

make/mingw32/Makefile

@@ -31,7 +31,7 @@ DLLFLAGS = -DEBML_DLL -DEBML_DLL_EXPORT
 else
 LIBS = libebml.a
 endif
-INCS = -I$(shell pwd)/../..
+INCS = -I"$(shell pwd)/../.."
 COMPILEFLAGS = $(DEBUGFLAGS) $(INCS) $(DLLFLAGS) $(CXXFLAGS)
 
 .PHONY: all all-before all-after clean clean-custom
@@ -50,7 +50,7 @@ distclean dist-clean: clean
 	rm -f .depend
 
 libebml.a: $(OBJ)
-	$(AR) r $@ $(OBJ)
+	$(AR) rcvu $@ $(OBJ)
 	$(RANLIB) $@
 
 libebml.dll: $(OBJ)

src/Debug.cpp

@@ -49,7 +49,7 @@ START_LIBEBML_NAMESPACE
 
 class ADbg globalDebug;
 
-#if !defined(NDEBUG)
+#if defined(LIBEBML_DEBUG)
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -232,6 +232,6 @@ bool ADbg::unsetDebugFile() {
 	return result;
 }
 
-#endif // !defined(NDEBUG)
+#endif // defined(LIBEBML_DEBUG)
 
 END_LIBEBML_NAMESPACE

src/EbmlBinary.cpp

@@ -1,101 +1,107 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlBinary.cpp 1112 2005-03-28 09:55:50Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Julien Coloos	<suiryc @ users.sf.net>
-*/
-#include <cassert>
-
-#include "ebml/EbmlBinary.h"
-
-START_LIBEBML_NAMESPACE
-
-EbmlBinary::EbmlBinary()
- :EbmlElement(0, false), Data(NULL)
-{}
-
-EbmlBinary::EbmlBinary(const EbmlBinary & ElementToClone)
- :EbmlElement(ElementToClone)
-{
-	if (ElementToClone.Data == NULL)
-		Data = NULL;
-	else {
-		Data = (binary *)malloc(GetSize() * sizeof(binary));
-		assert(Data != NULL);
-		memcpy(Data, ElementToClone.Data, GetSize());
-	}
-}
-
-EbmlBinary::~EbmlBinary(void) {
-	if(Data)
-		free(Data);
-}
-
-filepos_t EbmlBinary::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
-{
-	output.writeFully(Data,GetSize());
-
-	return GetSize();
-}
-	
-/*!
-	\note no Default binary value handled
-*/
-uint64 EbmlBinary::UpdateSize(bool bWithDefault, bool bForceRender)
-{
-	return GetSize();
-}
-
-filepos_t EbmlBinary::ReadData(IOCallback & input, ScopeMode ReadFully)
-{
-	if (Data != NULL)
-		free(Data);
-	
-	if (ReadFully == SCOPE_NO_DATA)
-	{
-		Data = NULL;
-		return GetSize();
-	}
-
-	Data = (binary *)malloc(GetSize() * sizeof(binary));
-	assert(Data != NULL);
-	SetValueIsSet();
-	return input.read(Data, GetSize());
-}
-
-bool EbmlBinary::operator==(const EbmlBinary & ElementToCompare) const
-{
-	return ((GetSize() == ElementToCompare.GetSize()) && !memcmp(Data, ElementToCompare.Data, GetSize()));
-}
-
-END_LIBEBML_NAMESPACE
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id$
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+	\author Julien Coloos	<suiryc @ users.sf.net>
+*/
+#include <cassert>
+#include <string>
+
+#include "ebml/EbmlBinary.h"
+#include "ebml/StdIOCallback.h"
+
+START_LIBEBML_NAMESPACE
+
+EbmlBinary::EbmlBinary()
+ :EbmlElement(0, false), Data(NULL)
+{}
+
+EbmlBinary::EbmlBinary(const EbmlBinary & ElementToClone)
+ :EbmlElement(ElementToClone)
+{
+	if (ElementToClone.Data == NULL)
+		Data = NULL;
+	else {
+		Data = (binary *)malloc(GetSize() * sizeof(binary));
+		assert(Data != NULL);
+		memcpy(Data, ElementToClone.Data, GetSize());
+	}
+}
+
+EbmlBinary::~EbmlBinary(void) {
+	if(Data)
+		free(Data);
+}
+
+EbmlBinary::operator const binary &() const {return *Data;}
+
+
+filepos_t EbmlBinary::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
+{
+	output.writeFully(Data,GetSize());
+
+	return GetSize();
+}
+	
+/*!
+	\note no Default binary value handled
+*/
+uint64 EbmlBinary::UpdateSize(bool bWithDefault, bool bForceRender)
+{
+	return GetSize();
+}
+
+filepos_t EbmlBinary::ReadData(IOCallback & input, ScopeMode ReadFully)
+{
+	if (Data != NULL)
+		free(Data);
+	
+    if (ReadFully == SCOPE_NO_DATA || !GetSize())
+	{
+		Data = NULL;
+		return GetSize();
+	}
+
+	Data = (binary *)malloc(GetSize());
+    if (Data == NULL)
+		throw CRTError(std::string("Error allocating data"));
+	SetValueIsSet();
+	return input.read(Data, GetSize());
+}
+
+bool EbmlBinary::operator==(const EbmlBinary & ElementToCompare) const
+{
+	return ((GetSize() == ElementToCompare.GetSize()) && !memcmp(Data, ElementToCompare.Data, GetSize()));
+}
+
+END_LIBEBML_NAMESPACE

src/EbmlCrc32.cpp

@@ -1,333 +1,353 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlCrc32.cpp 1155 2005-05-06 11:43:38Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Jory Stone       <jcsston @ toughguy.net>
-*/
-#include "ebml/EbmlCrc32.h"
-#include "ebml/EbmlContexts.h"
-#include "ebml/MemIOCallback.h"
-
-START_LIBEBML_NAMESPACE
-
-DEFINE_EBML_CLASS_GLOBAL(EbmlCrc32, 0xBF, 1, "EBMLCrc32\0ratamadabapa");
-
-const uint32 EbmlCrc32::m_tab[] = {
-#ifdef WORDS_BIGENDIAN
-	0x00000000L, 0x96300777L, 0x2c610eeeL, 0xba510999L, 0x19c46d07L,
-	0x8ff46a70L, 0x35a563e9L, 0xa395649eL, 0x3288db0eL, 0xa4b8dc79L,
-	0x1ee9d5e0L, 0x88d9d297L, 0x2b4cb609L, 0xbd7cb17eL, 0x072db8e7L,
-	0x911dbf90L, 0x6410b71dL, 0xf220b06aL, 0x4871b9f3L, 0xde41be84L,
-	0x7dd4da1aL, 0xebe4dd6dL, 0x51b5d4f4L, 0xc785d383L, 0x56986c13L,
-	0xc0a86b64L, 0x7af962fdL, 0xecc9658aL, 0x4f5c0114L, 0xd96c0663L,
-	0x633d0ffaL, 0xf50d088dL, 0xc8206e3bL, 0x5e10694cL, 0xe44160d5L,
-	0x727167a2L, 0xd1e4033cL, 0x47d4044bL, 0xfd850dd2L, 0x6bb50aa5L,
-	0xfaa8b535L, 0x6c98b242L, 0xd6c9bbdbL, 0x40f9bcacL, 0xe36cd832L,
-	0x755cdf45L, 0xcf0dd6dcL, 0x593dd1abL, 0xac30d926L, 0x3a00de51L,
-	0x8051d7c8L, 0x1661d0bfL, 0xb5f4b421L, 0x23c4b356L, 0x9995bacfL,
-	0x0fa5bdb8L, 0x9eb80228L, 0x0888055fL, 0xb2d90cc6L, 0x24e90bb1L,
-	0x877c6f2fL, 0x114c6858L, 0xab1d61c1L, 0x3d2d66b6L, 0x9041dc76L,
-	0x0671db01L, 0xbc20d298L, 0x2a10d5efL, 0x8985b171L, 0x1fb5b606L,
-	0xa5e4bf9fL, 0x33d4b8e8L, 0xa2c90778L, 0x34f9000fL, 0x8ea80996L,
-	0x18980ee1L, 0xbb0d6a7fL, 0x2d3d6d08L, 0x976c6491L, 0x015c63e6L,
-	0xf4516b6bL, 0x62616c1cL, 0xd8306585L, 0x4e0062f2L, 0xed95066cL,
-	0x7ba5011bL, 0xc1f40882L, 0x57c40ff5L, 0xc6d9b065L, 0x50e9b712L,
-	0xeab8be8bL, 0x7c88b9fcL, 0xdf1ddd62L, 0x492dda15L, 0xf37cd38cL,
-	0x654cd4fbL, 0x5861b24dL, 0xce51b53aL, 0x7400bca3L, 0xe230bbd4L,
-	0x41a5df4aL, 0xd795d83dL, 0x6dc4d1a4L, 0xfbf4d6d3L, 0x6ae96943L,
-	0xfcd96e34L, 0x468867adL, 0xd0b860daL, 0x732d0444L, 0xe51d0333L,
-	0x5f4c0aaaL, 0xc97c0dddL, 0x3c710550L, 0xaa410227L, 0x10100bbeL,
-	0x86200cc9L, 0x25b56857L, 0xb3856f20L, 0x09d466b9L, 0x9fe461ceL,
-	0x0ef9de5eL, 0x98c9d929L, 0x2298d0b0L, 0xb4a8d7c7L, 0x173db359L,
-	0x810db42eL, 0x3b5cbdb7L, 0xad6cbac0L, 0x2083b8edL, 0xb6b3bf9aL,
-	0x0ce2b603L, 0x9ad2b174L, 0x3947d5eaL, 0xaf77d29dL, 0x1526db04L,
-	0x8316dc73L, 0x120b63e3L, 0x843b6494L, 0x3e6a6d0dL, 0xa85a6a7aL,
-	0x0bcf0ee4L, 0x9dff0993L, 0x27ae000aL, 0xb19e077dL, 0x44930ff0L,
-	0xd2a30887L, 0x68f2011eL, 0xfec20669L, 0x5d5762f7L, 0xcb676580L,
-	0x71366c19L, 0xe7066b6eL, 0x761bd4feL, 0xe02bd389L, 0x5a7ada10L,
-	0xcc4add67L, 0x6fdfb9f9L, 0xf9efbe8eL, 0x43beb717L, 0xd58eb060L,
-	0xe8a3d6d6L, 0x7e93d1a1L, 0xc4c2d838L, 0x52f2df4fL, 0xf167bbd1L,
-	0x6757bca6L, 0xdd06b53fL, 0x4b36b248L, 0xda2b0dd8L, 0x4c1b0aafL,
-	0xf64a0336L, 0x607a0441L, 0xc3ef60dfL, 0x55df67a8L, 0xef8e6e31L,
-	0x79be6946L, 0x8cb361cbL, 0x1a8366bcL, 0xa0d26f25L, 0x36e26852L,
-	0x95770cccL, 0x03470bbbL, 0xb9160222L, 0x2f260555L, 0xbe3bbac5L,
-	0x280bbdb2L, 0x925ab42bL, 0x046ab35cL, 0xa7ffd7c2L, 0x31cfd0b5L,
-	0x8b9ed92cL, 0x1daede5bL, 0xb0c2649bL, 0x26f263ecL, 0x9ca36a75L,
-	0x0a936d02L, 0xa906099cL, 0x3f360eebL, 0x85670772L, 0x13570005L,
-	0x824abf95L, 0x147ab8e2L, 0xae2bb17bL, 0x381bb60cL, 0x9b8ed292L,
-	0x0dbed5e5L, 0xb7efdc7cL, 0x21dfdb0bL, 0xd4d2d386L, 0x42e2d4f1L,
-	0xf8b3dd68L, 0x6e83da1fL, 0xcd16be81L, 0x5b26b9f6L, 0xe177b06fL,
-	0x7747b718L, 0xe65a0888L, 0x706a0fffL, 0xca3b0666L, 0x5c0b0111L,
-	0xff9e658fL, 0x69ae62f8L, 0xd3ff6b61L, 0x45cf6c16L, 0x78e20aa0L,
-	0xeed20dd7L, 0x5483044eL, 0xc2b30339L, 0x612667a7L, 0xf71660d0L,
-	0x4d476949L, 0xdb776e3eL, 0x4a6ad1aeL, 0xdc5ad6d9L, 0x660bdf40L,
-	0xf03bd837L, 0x53aebca9L, 0xc59ebbdeL, 0x7fcfb247L, 0xe9ffb530L,
-	0x1cf2bdbdL, 0x8ac2bacaL, 0x3093b353L, 0xa6a3b424L, 0x0536d0baL,
-	0x9306d7cdL, 0x2957de54L, 0xbf67d923L, 0x2e7a66b3L, 0xb84a61c4L,
-	0x021b685dL, 0x942b6f2aL, 0x37be0bb4L, 0xa18e0cc3L, 0x1bdf055aL,
-	0x8def022dL
-#else
-	0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
-	0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
-	0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
-	0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
-	0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
-	0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
-	0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
-	0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
-	0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
-	0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
-	0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
-	0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
-	0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
-	0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
-	0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
-	0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
-	0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
-	0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
-	0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
-	0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
-	0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
-	0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
-	0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
-	0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
-	0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
-	0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
-	0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
-	0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
-	0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
-	0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
-	0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
-	0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
-	0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
-	0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
-	0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
-	0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
-	0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
-	0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
-	0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
-	0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
-	0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
-	0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
-	0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
-	0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
-	0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
-	0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
-	0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
-	0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
-	0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
-	0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
-	0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
-	0x2d02ef8dL
-#endif
-};
-
-EbmlCrc32::EbmlCrc32()
-{
-	ResetCRC();
-	SetDefaultSize(DIGESTSIZE);
-	m_crc_final = 0;
-	SetSize_(4);
-	//This EbmlElement has been set
-//	SetValueIsSet();
-}
-
-EbmlCrc32::EbmlCrc32(const EbmlCrc32 & ElementToClone)
-:EbmlBinary(ElementToClone)
-{
-	m_crc       = ElementToClone.m_crc;
-	m_crc_final = ElementToClone.m_crc_final;
-}
-
-void EbmlCrc32::AddElementCRC32(EbmlElement &ElementToCRC)
-{
-	// Use a special IOCallback class that Render's to memory instead of to disk
-	MemIOCallback memoryBuffer;
-	ElementToCRC.Render(memoryBuffer, true, true);
-
-	Update(memoryBuffer.GetDataBuffer(), memoryBuffer.GetDataBufferSize());
-//	Finalize();
-};
-
-bool EbmlCrc32::CheckElementCRC32(EbmlElement &ElementToCRC)
-{
-	MemIOCallback memoryBuffer;
-	ElementToCRC.Render(memoryBuffer);
-
-	return CheckCRC(m_crc_final, memoryBuffer.GetDataBuffer(), memoryBuffer.GetDataBufferSize());
-};
-
-filepos_t EbmlCrc32::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
-{
-	filepos_t Result = DIGESTSIZE;
-
-	if (Result != 0) {
-	    output.writeFully(&m_crc_final, Result);
-	}
-
-	if (Result < GetDefaultSize()) {
-		// pad the rest with 0
-		binary *Pad = new binary[GetDefaultSize() - Result];
-		if (Pad != NULL) {
-			memset(Pad, 0x00, GetDefaultSize() - Result);
-			output.writeFully(Pad, GetDefaultSize() - Result);
-
-			Result = GetDefaultSize();
-			delete [] Pad;
-		}
-	}
-
-	return Result;
-}
-
-filepos_t EbmlCrc32::ReadData(IOCallback & input, ScopeMode ReadFully)
-{
-	if (ReadFully != SCOPE_NO_DATA)
-	{
-		binary *Buffer = new binary[GetSize()];
-		if (Buffer == NULL) {
-			// impossible to read, skip it
-			input.setFilePointer(GetSize(), seek_current);
-		} else {
-			input.readFully(Buffer, GetSize());
-
-			memcpy((void *)&m_crc_final, Buffer, 4);
-			delete [] Buffer;
-			SetValueIsSet();
-		}
-	}
-
-	return GetSize();
-}
-
-bool EbmlCrc32::CheckCRC(uint32 inputCRC, const binary *input, uint32 length)
-{
-	uint32 crc = CRC32_NEGL;
-
-	for(; !IsAligned<uint32>(input) && length > 0; length--)
-		crc = m_tab[CRC32_INDEX(crc) ^ *input++] ^ CRC32_SHIFTED(crc);
-
-	while (length >= 4)
-	{
-		crc ^= *(const uint32 *)input;
-		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
-		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
-		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
-		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
-		length -= 4;
-		input += 4;
-	}
-
-	while (length--)
-		crc = m_tab[CRC32_INDEX(crc) ^ *input++] ^ CRC32_SHIFTED(crc);
-
-	//Now we finalize the CRC32
-	crc ^= CRC32_NEGL;
-	
-	if (crc == inputCRC)
-		return true;
-	
-	return false;
-};
-
-void EbmlCrc32::FillCRC32(const binary *s, uint32 n)
-{
-	ResetCRC();
-	Update(s, n);
-	Finalize();
-	
-	/*uint32 crc = CRC32_NEGL;
-
-	for(; !IsAligned<uint32>(s) && n > 0; n--)
-		crc = m_tab[CRC32_INDEX(crc) ^ *s++] ^ CRC32_SHIFTED(crc);
-
-	while (n >= 4)
-	{
-		crc ^= *(const uint32 *)s;
-		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
-		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
-		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
-		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
-		n -= 4;
-		s += 4;
-	}
-
-	while (n--)
-		crc = m_tab[CRC32_INDEX(crc) ^ *s++] ^ CRC32_SHIFTED(crc);
-
-	m_crc = crc;
-
-	//Now we finalize the CRC32
-	m_crc ^= CRC32_NEGL;
-	//for (unsigned int i = 0; i < 4; i++)
-	//	(&last_crc32)[i] = GetCrcByte(i);*/
-
-}
-
-void EbmlCrc32::Update(const binary *input, uint32 length)
-{
-	uint32 crc = m_crc;
-
-	for(; !IsAligned<uint32>(input) && length > 0; length--)
-		crc = m_tab[CRC32_INDEX(crc) ^ *input++] ^ CRC32_SHIFTED(crc);
-
-	while (length >= 4)
-	{
-		crc ^= *(const uint32 *)input;
-		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
-		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
-		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
-		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
-		length -= 4;
-		input += 4;
-	}
-
-	while (length--)
-		crc = m_tab[CRC32_INDEX(crc) ^ *input++] ^ CRC32_SHIFTED(crc);
-
-	m_crc = crc;
-}
-
-void EbmlCrc32::Finalize()
-{
-	//Finalize the CRC32
-	m_crc ^= CRC32_NEGL;
-	//Copy it over to completed CRC32 memeber
-	m_crc_final = m_crc;
-	//Reset the holding CRC member (m_crc)
-	ResetCRC();
-	//This EbmlElement has been set
-	SetValueIsSet();
-}
-
-END_LIBEBML_NAMESPACE
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id: EbmlCrc32.cpp 1155 2005-05-06 11:43:38Z robux4 $
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+	\author Jory Stone       <jcsston @ toughguy.net>
+*/
+#include "ebml/EbmlCrc32.h"
+#include "ebml/EbmlContexts.h"
+#include "ebml/MemIOCallback.h"
+
+#ifdef WORDS_BIGENDIAN
+# define CRC32_INDEX(c) (c >> 24)
+# define CRC32_SHIFTED(c) (c << 8)
+#else
+# define CRC32_INDEX(c) (c & 0xff)
+# define CRC32_SHIFTED(c) (c >> 8)
+#endif
+
+const uint32 CRC32_NEGL = 0xffffffffL;
+
+START_LIBEBML_NAMESPACE
+
+DEFINE_EBML_CLASS_GLOBAL(EbmlCrc32, 0xBF, 1, "EBMLCrc32\0ratamadabapa");
+
+const uint32 EbmlCrc32::m_tab[] = {
+#ifdef WORDS_BIGENDIAN
+	0x00000000L, 0x96300777L, 0x2c610eeeL, 0xba510999L, 0x19c46d07L,
+	0x8ff46a70L, 0x35a563e9L, 0xa395649eL, 0x3288db0eL, 0xa4b8dc79L,
+	0x1ee9d5e0L, 0x88d9d297L, 0x2b4cb609L, 0xbd7cb17eL, 0x072db8e7L,
+	0x911dbf90L, 0x6410b71dL, 0xf220b06aL, 0x4871b9f3L, 0xde41be84L,
+	0x7dd4da1aL, 0xebe4dd6dL, 0x51b5d4f4L, 0xc785d383L, 0x56986c13L,
+	0xc0a86b64L, 0x7af962fdL, 0xecc9658aL, 0x4f5c0114L, 0xd96c0663L,
+	0x633d0ffaL, 0xf50d088dL, 0xc8206e3bL, 0x5e10694cL, 0xe44160d5L,
+	0x727167a2L, 0xd1e4033cL, 0x47d4044bL, 0xfd850dd2L, 0x6bb50aa5L,
+	0xfaa8b535L, 0x6c98b242L, 0xd6c9bbdbL, 0x40f9bcacL, 0xe36cd832L,
+	0x755cdf45L, 0xcf0dd6dcL, 0x593dd1abL, 0xac30d926L, 0x3a00de51L,
+	0x8051d7c8L, 0x1661d0bfL, 0xb5f4b421L, 0x23c4b356L, 0x9995bacfL,
+	0x0fa5bdb8L, 0x9eb80228L, 0x0888055fL, 0xb2d90cc6L, 0x24e90bb1L,
+	0x877c6f2fL, 0x114c6858L, 0xab1d61c1L, 0x3d2d66b6L, 0x9041dc76L,
+	0x0671db01L, 0xbc20d298L, 0x2a10d5efL, 0x8985b171L, 0x1fb5b606L,
+	0xa5e4bf9fL, 0x33d4b8e8L, 0xa2c90778L, 0x34f9000fL, 0x8ea80996L,
+	0x18980ee1L, 0xbb0d6a7fL, 0x2d3d6d08L, 0x976c6491L, 0x015c63e6L,
+	0xf4516b6bL, 0x62616c1cL, 0xd8306585L, 0x4e0062f2L, 0xed95066cL,
+	0x7ba5011bL, 0xc1f40882L, 0x57c40ff5L, 0xc6d9b065L, 0x50e9b712L,
+	0xeab8be8bL, 0x7c88b9fcL, 0xdf1ddd62L, 0x492dda15L, 0xf37cd38cL,
+	0x654cd4fbL, 0x5861b24dL, 0xce51b53aL, 0x7400bca3L, 0xe230bbd4L,
+	0x41a5df4aL, 0xd795d83dL, 0x6dc4d1a4L, 0xfbf4d6d3L, 0x6ae96943L,
+	0xfcd96e34L, 0x468867adL, 0xd0b860daL, 0x732d0444L, 0xe51d0333L,
+	0x5f4c0aaaL, 0xc97c0dddL, 0x3c710550L, 0xaa410227L, 0x10100bbeL,
+	0x86200cc9L, 0x25b56857L, 0xb3856f20L, 0x09d466b9L, 0x9fe461ceL,
+	0x0ef9de5eL, 0x98c9d929L, 0x2298d0b0L, 0xb4a8d7c7L, 0x173db359L,
+	0x810db42eL, 0x3b5cbdb7L, 0xad6cbac0L, 0x2083b8edL, 0xb6b3bf9aL,
+	0x0ce2b603L, 0x9ad2b174L, 0x3947d5eaL, 0xaf77d29dL, 0x1526db04L,
+	0x8316dc73L, 0x120b63e3L, 0x843b6494L, 0x3e6a6d0dL, 0xa85a6a7aL,
+	0x0bcf0ee4L, 0x9dff0993L, 0x27ae000aL, 0xb19e077dL, 0x44930ff0L,
+	0xd2a30887L, 0x68f2011eL, 0xfec20669L, 0x5d5762f7L, 0xcb676580L,
+	0x71366c19L, 0xe7066b6eL, 0x761bd4feL, 0xe02bd389L, 0x5a7ada10L,
+	0xcc4add67L, 0x6fdfb9f9L, 0xf9efbe8eL, 0x43beb717L, 0xd58eb060L,
+	0xe8a3d6d6L, 0x7e93d1a1L, 0xc4c2d838L, 0x52f2df4fL, 0xf167bbd1L,
+	0x6757bca6L, 0xdd06b53fL, 0x4b36b248L, 0xda2b0dd8L, 0x4c1b0aafL,
+	0xf64a0336L, 0x607a0441L, 0xc3ef60dfL, 0x55df67a8L, 0xef8e6e31L,
+	0x79be6946L, 0x8cb361cbL, 0x1a8366bcL, 0xa0d26f25L, 0x36e26852L,
+	0x95770cccL, 0x03470bbbL, 0xb9160222L, 0x2f260555L, 0xbe3bbac5L,
+	0x280bbdb2L, 0x925ab42bL, 0x046ab35cL, 0xa7ffd7c2L, 0x31cfd0b5L,
+	0x8b9ed92cL, 0x1daede5bL, 0xb0c2649bL, 0x26f263ecL, 0x9ca36a75L,
+	0x0a936d02L, 0xa906099cL, 0x3f360eebL, 0x85670772L, 0x13570005L,
+	0x824abf95L, 0x147ab8e2L, 0xae2bb17bL, 0x381bb60cL, 0x9b8ed292L,
+	0x0dbed5e5L, 0xb7efdc7cL, 0x21dfdb0bL, 0xd4d2d386L, 0x42e2d4f1L,
+	0xf8b3dd68L, 0x6e83da1fL, 0xcd16be81L, 0x5b26b9f6L, 0xe177b06fL,
+	0x7747b718L, 0xe65a0888L, 0x706a0fffL, 0xca3b0666L, 0x5c0b0111L,
+	0xff9e658fL, 0x69ae62f8L, 0xd3ff6b61L, 0x45cf6c16L, 0x78e20aa0L,
+	0xeed20dd7L, 0x5483044eL, 0xc2b30339L, 0x612667a7L, 0xf71660d0L,
+	0x4d476949L, 0xdb776e3eL, 0x4a6ad1aeL, 0xdc5ad6d9L, 0x660bdf40L,
+	0xf03bd837L, 0x53aebca9L, 0xc59ebbdeL, 0x7fcfb247L, 0xe9ffb530L,
+	0x1cf2bdbdL, 0x8ac2bacaL, 0x3093b353L, 0xa6a3b424L, 0x0536d0baL,
+	0x9306d7cdL, 0x2957de54L, 0xbf67d923L, 0x2e7a66b3L, 0xb84a61c4L,
+	0x021b685dL, 0x942b6f2aL, 0x37be0bb4L, 0xa18e0cc3L, 0x1bdf055aL,
+	0x8def022dL
+#else
+	0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+	0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
+	0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
+	0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
+	0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
+	0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
+	0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
+	0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
+	0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
+	0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
+	0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
+	0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
+	0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
+	0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
+	0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
+	0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
+	0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
+	0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
+	0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
+	0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
+	0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
+	0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
+	0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
+	0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
+	0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
+	0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
+	0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
+	0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
+	0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
+	0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
+	0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
+	0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
+	0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
+	0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
+	0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
+	0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
+	0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
+	0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
+	0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
+	0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
+	0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
+	0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
+	0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
+	0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
+	0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
+	0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
+	0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
+	0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
+	0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
+	0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
+	0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
+	0x2d02ef8dL
+#endif
+};
+
+EbmlCrc32::EbmlCrc32()
+{
+	ResetCRC();
+	SetDefaultSize(4);
+	m_crc_final = 0;
+	SetSize_(4);
+	//This EbmlElement has been set
+//	SetValueIsSet();
+}
+
+EbmlCrc32::EbmlCrc32(const EbmlCrc32 & ElementToClone)
+:EbmlBinary(ElementToClone)
+{
+	m_crc       = ElementToClone.m_crc;
+	m_crc_final = ElementToClone.m_crc_final;
+}
+
+void EbmlCrc32::ResetCRC()
+{
+    m_crc = CRC32_NEGL;
+}
+
+void EbmlCrc32::UpdateByte(binary b)
+{
+    m_crc = m_tab[CRC32_INDEX(m_crc) ^ b] ^ CRC32_SHIFTED(m_crc);
+}
+
+void EbmlCrc32::AddElementCRC32(EbmlElement &ElementToCRC)
+{
+	// Use a special IOCallback class that Render's to memory instead of to disk
+	MemIOCallback memoryBuffer;
+	ElementToCRC.Render(memoryBuffer, true, true);
+
+	Update(memoryBuffer.GetDataBuffer(), memoryBuffer.GetDataBufferSize());
+//	Finalize();
+};
+
+bool EbmlCrc32::CheckElementCRC32(EbmlElement &ElementToCRC)
+{
+	MemIOCallback memoryBuffer;
+	ElementToCRC.Render(memoryBuffer);
+
+	return CheckCRC(m_crc_final, memoryBuffer.GetDataBuffer(), memoryBuffer.GetDataBufferSize());
+};
+
+filepos_t EbmlCrc32::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
+{
+	filepos_t Result = 4;
+
+	if (Result != 0) {
+	    output.writeFully(&m_crc_final, Result);
+	}
+
+	if (Result < GetDefaultSize()) {
+		// pad the rest with 0
+		binary *Pad = new binary[GetDefaultSize() - Result];
+		if (Pad != NULL) {
+			memset(Pad, 0x00, GetDefaultSize() - Result);
+			output.writeFully(Pad, GetDefaultSize() - Result);
+
+			Result = GetDefaultSize();
+			delete [] Pad;
+		}
+	}
+
+	return Result;
+}
+
+filepos_t EbmlCrc32::ReadData(IOCallback & input, ScopeMode ReadFully)
+{
+	if (ReadFully != SCOPE_NO_DATA)
+	{
+		binary *Buffer = new binary[GetSize()];
+		if (Buffer == NULL) {
+			// impossible to read, skip it
+			input.setFilePointer(GetSize(), seek_current);
+		} else {
+			input.readFully(Buffer, GetSize());
+
+			memcpy((void *)&m_crc_final, Buffer, 4);
+			delete [] Buffer;
+			SetValueIsSet();
+		}
+	}
+
+	return GetSize();
+}
+
+bool EbmlCrc32::CheckCRC(uint32 inputCRC, const binary *input, uint32 length)
+{
+	uint32 crc = CRC32_NEGL;
+
+	for(; !IsAligned<uint32>(input) && length > 0; length--)
+		crc = m_tab[CRC32_INDEX(crc) ^ *input++] ^ CRC32_SHIFTED(crc);
+
+	while (length >= 4)
+	{
+		crc ^= *(const uint32 *)input;
+		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
+		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
+		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
+		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
+		length -= 4;
+		input += 4;
+	}
+
+	while (length--)
+		crc = m_tab[CRC32_INDEX(crc) ^ *input++] ^ CRC32_SHIFTED(crc);
+
+	//Now we finalize the CRC32
+	crc ^= CRC32_NEGL;
+	
+	if (crc == inputCRC)
+		return true;
+	
+	return false;
+};
+
+void EbmlCrc32::FillCRC32(const binary *s, uint32 n)
+{
+	ResetCRC();
+	Update(s, n);
+	Finalize();
+	
+	/*uint32 crc = CRC32_NEGL;
+
+	for(; !IsAligned<uint32>(s) && n > 0; n--)
+		crc = m_tab[CRC32_INDEX(crc) ^ *s++] ^ CRC32_SHIFTED(crc);
+
+	while (n >= 4)
+	{
+		crc ^= *(const uint32 *)s;
+		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
+		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
+		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
+		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
+		n -= 4;
+		s += 4;
+	}
+
+	while (n--)
+		crc = m_tab[CRC32_INDEX(crc) ^ *s++] ^ CRC32_SHIFTED(crc);
+
+	m_crc = crc;
+
+	//Now we finalize the CRC32
+	m_crc ^= CRC32_NEGL;
+	//for (unsigned int i = 0; i < 4; i++)
+	//	(&last_crc32)[i] = GetCrcByte(i);*/
+
+}
+
+void EbmlCrc32::Update(const binary *input, uint32 length)
+{
+	uint32 crc = m_crc;
+
+	for(; !IsAligned<uint32>(input) && length > 0; length--)
+		crc = m_tab[CRC32_INDEX(crc) ^ *input++] ^ CRC32_SHIFTED(crc);
+
+	while (length >= 4)
+	{
+		crc ^= *(const uint32 *)input;
+		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
+		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
+		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
+		crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
+		length -= 4;
+		input += 4;
+	}
+
+	while (length--)
+		crc = m_tab[CRC32_INDEX(crc) ^ *input++] ^ CRC32_SHIFTED(crc);
+
+	m_crc = crc;
+}
+
+void EbmlCrc32::Finalize()
+{
+	//Finalize the CRC32
+	m_crc ^= CRC32_NEGL;
+	//Copy it over to completed CRC32 memeber
+	m_crc_final = m_crc;
+	//Reset the holding CRC member (m_crc)
+	ResetCRC();
+	//This EbmlElement has been set
+	SetValueIsSet();
+}
+
+END_LIBEBML_NAMESPACE

src/EbmlDummy.cpp

@@ -1,45 +1,50 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlDummy.cpp 639 2004-07-09 20:59:14Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#include "ebml/EbmlDummy.h"
-#include "ebml/EbmlContexts.h"
-
-START_LIBEBML_NAMESPACE
-
-DEFINE_EBML_CLASS_ORPHAN(EbmlDummy, 0xFF, 1, "DummyElement");
-
-const EbmlId EbmlDummy::DummyRawId = Id_EbmlDummy;
-
-END_LIBEBML_NAMESPACE
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id$
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+*/
+#include "ebml/EbmlDummy.h"
+#include "ebml/EbmlContexts.h"
+
+START_LIBEBML_NAMESPACE
+
+DEFINE_EBML_CLASS_ORPHAN(EbmlDummy, 0xFF, 1, "DummyElement");
+
+const EbmlId EbmlDummy::DummyRawId = Id_EbmlDummy;
+
+EbmlDummy::operator const EbmlId &()
+{
+    return DummyId;
+}
+
+END_LIBEBML_NAMESPACE

src/EbmlElement.cpp

@@ -28,7 +28,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlElement.cpp 1232 2005-10-15 15:56:52Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 
@@ -49,7 +49,7 @@ START_LIBEBML_NAMESPACE
 */
 int CodedSizeLength(uint64 Length, unsigned int SizeLength, bool bSizeFinite)
 {
-	int CodedSize;
+	unsigned int CodedSize;
 	if (bSizeFinite) {
 		// prepare the head of the size (000...01xxxxxx)
 		// optimal size
@@ -257,7 +257,7 @@ EbmlElement::~EbmlElement()
 	\todo this method is deprecated and should be called FindThisID
 	\todo replace the new RawElement with the appropriate class (when known)
 */
-EbmlElement * EbmlElement::FindNextID(IOCallback & DataStream, const EbmlCallbacks & ClassInfos, const uint64 MaxDataSize)
+EbmlElement * EbmlElement::FindNextID(IOCallback & DataStream, const EbmlCallbacks & ClassInfos, uint64 MaxDataSize)
 {
 	binary PossibleId[4];
 	int PossibleID_Length = 0;
@@ -436,7 +436,7 @@ EbmlElement * EbmlElement::FindNextElement(IOCallback & DataStream, const EbmlSe
 					//  0 : child
 					//  1 : same level
 					//  + : further parent
-					if (Result->ValidateSize() && (UpperLevel > 0 || MaxDataSize == 0 || MaxDataSize >= (PossibleID_Length + PossibleSizeLength + SizeFound))) {
+					if (Result->ValidateSize() && (SizeFound == SizeUnknown || UpperLevel > 0 || MaxDataSize == 0 || MaxDataSize >= (PossibleID_Length + PossibleSizeLength + SizeFound))) {
 						if (SizeFound == SizeUnknown) {
 							Result->SetSizeInfinite();
 						}
@@ -486,6 +486,7 @@ EbmlElement * EbmlElement::SkipData(EbmlStream & DataStream, const EbmlSemanticC
 				Result = DataStream.FindNextElement(Context, bUpperElement, 0xFFFFFFFFL, AllowDummyElt);
 			} else {
 				Result = TestReadElt;
+                TestReadElt = NULL;
 			}
 
 			if (Result != NULL) {
@@ -581,14 +582,14 @@ filepos_t EbmlElement::Render(IOCallback & output, bool bWithDefault, bool bKeep
 		if (!bWithDefault && IsDefaultValue()) {
 			return 0;
 		}
-#if defined(_DEBUG) || defined(DEBUG)
+#if defined(LIBEBML_DEBUG)
 		uint64 SupposedSize = UpdateSize(bWithDefault, bForceRender);
-#endif // _DEBUG
+#endif // LIBEBML_DEBUG
 		filepos_t result = RenderHead(output, bForceRender, bWithDefault, bKeepPosition);
 		uint64 WrittenSize = RenderData(output, bForceRender, bWithDefault);
-#if defined(_DEBUG) || defined(DEBUG)
-	if (SupposedSize != (0-1)) assert(WrittenSize == SupposedSize);
-#endif // DEBUG
+#if defined(LIBEBML_DEBUG)
+	if (static_cast<int64>(SupposedSize) != (0-1)) assert(WrittenSize == SupposedSize);
+#endif // LIBEBML_DEBUG
 		result += WrittenSize;
 		return result;
 	} catch (std::exception & ex) {
@@ -692,7 +693,7 @@ filepos_t EbmlElement::OverwriteHead(IOCallback & output, bool bKeepPosition)
 	return Result;
 }
 
-uint32 EbmlElement::VoidMe(IOCallback & output, bool bWithDefault)
+uint64 EbmlElement::VoidMe(IOCallback & output, bool bWithDefault)
 {
 	if (ElementPosition == 0) {
 		return 0; // the element has not been written

src/EbmlFloat.cpp

@@ -30,7 +30,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlFloat.cpp 1243 2006-03-30 19:33:22Z mosu $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 
@@ -73,6 +73,9 @@ const double EbmlFloat::DefaultVal() const
     return DefaultValue;
 }
 
+EbmlFloat::operator const float() const {return float(Value);}
+EbmlFloat::operator const double() const {return double(Value);}
+
 
 /*!
 	\todo handle exception on errors

src/EbmlMaster.cpp

@@ -30,7 +30,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlMaster.cpp 1178 2005-05-19 15:47:11Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 
@@ -145,10 +145,10 @@ uint64 EbmlMaster::UpdateSize(bool bWithDefault, bool bForceRender)
 			continue;
 		(ElementList[Index])->UpdateSize(bWithDefault, bForceRender);
 		uint64 SizeToAdd = (ElementList[Index])->ElementSize(bWithDefault);
-#if defined(_DEBUG) || defined(DEBUG)
-		if (SizeToAdd == (0-1))
+#if defined(LIBEBML_DEBUG)
+		if (static_cast<int64>(SizeToAdd) == (0-1))
 			return (0-1);
-#endif // DEBUG
+#endif // LIBEBML_DEBUG
 		SetSize_(GetSize() + SizeToAdd);
 	}
 	if (bChecksumUsed) {
@@ -204,10 +204,10 @@ bool EbmlMaster::CheckMandatory() const
 	for (EltIdx = 0; EltIdx < EBML_CTX_SIZE(Context); EltIdx++) {
 		if (EBML_CTX_IDX(Context,EltIdx).IsMandatory()) {
 			if (FindElt(EBML_CTX_IDX_INFO(Context,EltIdx)) == NULL) {
-#if defined(_DEBUG) || defined(DEBUG)
+#if defined(LIBEBML_DEBUG)
 				// you are missing this Mandatory element
 // 				const char * MissingName = EBML_INFO_NAME(EBML_CTX_IDX_INFO(Context,EltIdx));
-#endif // DEBUG
+#endif // LIBEBML_DEBUG
 				return false;
 			}
 		}
@@ -278,7 +278,7 @@ EbmlElement *EbmlMaster::FindFirstElt(const EbmlCallbacks & Callbacks, bool bCre
 	size_t Index;
 	
 	for (Index = 0; Index < ElementList.size(); Index++) {
-		if (EbmlId(*(ElementList[Index])) == EBML_INFO_ID(Callbacks))
+		if (ElementList[Index] && EbmlId(*(ElementList[Index])) == EBML_INFO_ID(Callbacks))
 			return ElementList[Index];
 	}
 	
@@ -409,14 +409,21 @@ void EbmlMaster::Read(EbmlStream & inDataStream, const EbmlSemanticContext & sCo
 			}
 		}
 		ElementList.clear();
-		uint64 MaxSizeToRead = GetSize();
+		uint64 MaxSizeToRead;
+
+		if (IsFiniteSize())
+			MaxSizeToRead = GetSize();
+		else
+			MaxSizeToRead = 0x7FFFFFFF;
 
 		// read blocks and discard the ones we don't care about
-		if (MaxSizeToRead > 0) {
+		if (MaxSizeToRead > 0)
+		{
 			inDataStream.I_O().setFilePointer(GetSizePosition() + GetSizeLength(), seek_beginning);
 			ElementLevelA = inDataStream.FindNextElement(sContext, UpperEltFound, MaxSizeToRead, AllowDummyElt);
-			while (ElementLevelA != NULL && MaxSizeToRead > 0 && UpperEltFound <= 0) {
-				MaxSizeToRead = GetEndPosition() - ElementLevelA->GetEndPosition(); // even if it's the default value
+			while (ElementLevelA != NULL && UpperEltFound <= 0 && MaxSizeToRead > 0) {
+				if (IsFiniteSize())
+					MaxSizeToRead = GetEndPosition() - ElementLevelA->GetEndPosition(); // even if it's the default value
 				if (!AllowDummyElt && ElementLevelA->IsDummy()) {
 					ElementLevelA->SkipData(inDataStream, sContext);
 					delete ElementLevelA; // forget this unknown element
@@ -444,9 +451,8 @@ void EbmlMaster::Read(EbmlStream & inDataStream, const EbmlSemanticContext & sCo
 						goto processCrc;
 				}
 
-				if (MaxSizeToRead <= 0) {
+				if (MaxSizeToRead <= 0)
 					goto processCrc;// this level is finished
-				}
 				
 				ElementLevelA = inDataStream.FindNextElement(sContext, UpperEltFound, MaxSizeToRead, AllowDummyElt);
 			}
@@ -455,17 +461,22 @@ void EbmlMaster::Read(EbmlStream & inDataStream, const EbmlSemanticContext & sCo
 			}
 		}
 	processCrc:
-        EBML_MASTER_ITERATOR Itr;
+        EBML_MASTER_ITERATOR Itr, CrcItr;
         for (Itr = ElementList.begin(); Itr != ElementList.end();) {
 			if ((EbmlId)(*(*Itr)) == EBML_ID(EbmlCrc32)) {
 				bChecksumUsed = true;
 				// remove the element
 				Checksum = *(static_cast<EbmlCrc32*>(*Itr));
-				delete *Itr;
-				Remove(Itr);
+                CrcItr = Itr;
+                break;
 			}
-            else ++Itr;
+            ++Itr;
 		}
+        if (bChecksumUsed)
+        {
+		    delete *CrcItr;
+		    Remove(CrcItr);
+        }
 		SetValueIsSet();
 	}
 }

src/EbmlSInteger.cpp

@@ -28,7 +28,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlSInteger.cpp 1079 2005-03-03 13:18:14Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 	\author Moritz Bunkus <moritz @ bunkus.org>
 */
@@ -55,6 +55,11 @@ EbmlSInteger::EbmlSInteger(const EbmlSInteger & ElementToClone)
 {
 }
 
+EbmlSInteger::operator int8() {return  int8(Value);}
+EbmlSInteger::operator int16() {return int16(Value);}
+EbmlSInteger::operator int32() {return int32(Value);}
+EbmlSInteger::operator int64() {return Value;}
+
 /*!
 	\todo handle exception on errors
 */

src/EbmlStream.cpp

@@ -1,57 +1,57 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlStream.cpp 639 2004-07-09 20:59:14Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#include "ebml/EbmlStream.h"
-
-START_LIBEBML_NAMESPACE
-
-EbmlStream::EbmlStream(IOCallback & DataStream)
- :Stream(DataStream)
-{}
-
-EbmlStream::~EbmlStream()
-{}
-
-EbmlElement * EbmlStream::FindNextID(const EbmlCallbacks & ClassInfos, const uint64 MaxDataSize)
-{
-	return EbmlElement::FindNextID(Stream, ClassInfos, MaxDataSize);
-}
-
-EbmlElement * EbmlStream::FindNextElement(const EbmlSemanticContext & Context, int & UpperLevel, const uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel)
-{
-	return EbmlElement::FindNextElement(Stream, Context, UpperLevel, MaxDataSize, AllowDummyElt, MaxLowerLevel);
-}
-
-END_LIBEBML_NAMESPACE
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id$
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+*/
+#include "ebml/EbmlStream.h"
+
+START_LIBEBML_NAMESPACE
+
+EbmlStream::EbmlStream(IOCallback & DataStream)
+ :Stream(DataStream)
+{}
+
+EbmlStream::~EbmlStream()
+{}
+
+EbmlElement * EbmlStream::FindNextID(const EbmlCallbacks & ClassInfos, uint64 MaxDataSize)
+{
+	return EbmlElement::FindNextID(Stream, ClassInfos, MaxDataSize);
+}
+
+EbmlElement * EbmlStream::FindNextElement(const EbmlSemanticContext & Context, int & UpperLevel, uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel)
+{
+	return EbmlElement::FindNextElement(Stream, Context, UpperLevel, MaxDataSize, AllowDummyElt, MaxLowerLevel);
+}
+
+END_LIBEBML_NAMESPACE

src/EbmlString.cpp

@@ -1,163 +1,165 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlString.cpp 1079 2005-03-03 13:18:14Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#include <cassert>
-
-#include "ebml/EbmlString.h"
-
-START_LIBEBML_NAMESPACE
-
-EbmlString::EbmlString()
- :EbmlElement(0, false)
-{
-	SetDefaultSize(0);
-/* done automatically	
-	SetSize_(Value.length());
-	if (GetDefaultSize() > GetSize())
-		SetSize_(GetDefaultSize());*/
-}
-
-EbmlString::EbmlString(const std::string & aDefaultValue)
- :EbmlElement(0, true), Value(aDefaultValue), DefaultValue(aDefaultValue)
-{
-	SetDefaultSize(0);
-	SetDefaultIsSet();
-/* done automatically	
-	SetSize_(Value.length());
-	if (GetDefaultSize() > GetSize())
-		SetSize_(GetDefaultSize());*/
-}
-
-/*!
-	\todo Cloning should be on the same exact type !
-*/
-EbmlString::EbmlString(const EbmlString & ElementToClone)
- :EbmlElement(ElementToClone)
- ,Value(ElementToClone.Value)
- ,DefaultValue(ElementToClone.DefaultValue)
-{
-}
-
-void EbmlString::SetDefaultValue(std::string & aValue)
-{
-    assert(!DefaultISset());
-    DefaultValue = aValue;
-    SetDefaultIsSet();
-}
-
-const std::string & EbmlString::DefaultVal() const
-{
-    assert(DefaultISset());
-    return DefaultValue;
-}
-
-
-/*!
-	\todo handle exception on errors
-*/
-filepos_t EbmlString::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
-{
-	filepos_t Result;
-	output.writeFully(Value.c_str(), Value.length());
-	Result = Value.length();
-	
-	if (Result < GetDefaultSize()) {
-		// pad the rest with 0
-		binary *Pad = new binary[GetDefaultSize() - Result];
-		if (Pad == NULL)
-		{
-			return Result;
-		}
-		memset(Pad, 0x00, GetDefaultSize() - Result);
-		output.writeFully(Pad, GetDefaultSize() - Result);
-		Result = GetDefaultSize();
-		delete [] Pad;
-	}
-	
-	return Result;
-}
-
-EbmlString & EbmlString::operator=(const std::string & NewString)
-{
-	Value = NewString;
-	SetValueIsSet();
-/* done automatically	
-	SetSize_(Value.length());
-	if (GetDefaultSize() > GetSize())
-		SetSize_(GetDefaultSize());*/
-	return *this;
-}
-
-uint64 EbmlString::UpdateSize(bool bWithDefault, bool bForceRender)
-{
-	if (!bWithDefault && IsDefaultValue())
-		return 0;
-
-	if (Value.length() < GetDefaultSize()) {
-		SetSize_(GetDefaultSize());
-	} else {
-		SetSize_(Value.length());
-	}
-	return GetSize();
-}
-
-filepos_t EbmlString::ReadData(IOCallback & input, ScopeMode ReadFully)
-{
-	if (ReadFully != SCOPE_NO_DATA)
-	{
-		if (GetSize() == 0) {
-			Value = "";
-			SetValueIsSet();
-		} else {
-			char *Buffer = new char[GetSize() + 1];
-			if (Buffer == NULL) {
-				// unable to store the data, skip it
-				input.setFilePointer(GetSize(), seek_current);
-			} else {
-				input.readFully(Buffer, GetSize());
-				if (Buffer[GetSize()-1] != '\0') {
-					Buffer[GetSize()] = '\0';
-				}
-				Value = Buffer;
-				delete [] Buffer;
-				SetValueIsSet();
-			}
-		}
-	}
-
-	return GetSize();
-}
-
-END_LIBEBML_NAMESPACE
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id$
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+*/
+#include <cassert>
+
+#include "ebml/EbmlString.h"
+
+START_LIBEBML_NAMESPACE
+
+EbmlString::EbmlString()
+ :EbmlElement(0, false)
+{
+	SetDefaultSize(0);
+/* done automatically	
+	SetSize_(Value.length());
+	if (GetDefaultSize() > GetSize())
+		SetSize_(GetDefaultSize());*/
+}
+
+EbmlString::EbmlString(const std::string & aDefaultValue)
+ :EbmlElement(0, true), Value(aDefaultValue), DefaultValue(aDefaultValue)
+{
+	SetDefaultSize(0);
+	SetDefaultIsSet();
+/* done automatically	
+	SetSize_(Value.length());
+	if (GetDefaultSize() > GetSize())
+		SetSize_(GetDefaultSize());*/
+}
+
+/*!
+	\todo Cloning should be on the same exact type !
+*/
+EbmlString::EbmlString(const EbmlString & ElementToClone)
+ :EbmlElement(ElementToClone)
+ ,Value(ElementToClone.Value)
+ ,DefaultValue(ElementToClone.DefaultValue)
+{
+}
+
+void EbmlString::SetDefaultValue(std::string & aValue)
+{
+    assert(!DefaultISset());
+    DefaultValue = aValue;
+    SetDefaultIsSet();
+}
+
+const std::string & EbmlString::DefaultVal() const
+{
+    assert(DefaultISset());
+    return DefaultValue;
+}
+
+
+/*!
+	\todo handle exception on errors
+*/
+filepos_t EbmlString::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
+{
+	filepos_t Result;
+	output.writeFully(Value.c_str(), Value.length());
+	Result = Value.length();
+	
+	if (Result < GetDefaultSize()) {
+		// pad the rest with 0
+		binary *Pad = new binary[GetDefaultSize() - Result];
+		if (Pad == NULL)
+		{
+			return Result;
+		}
+		memset(Pad, 0x00, GetDefaultSize() - Result);
+		output.writeFully(Pad, GetDefaultSize() - Result);
+		Result = GetDefaultSize();
+		delete [] Pad;
+	}
+	
+	return Result;
+}
+
+EbmlString::operator const std::string &() const {return Value;}
+
+EbmlString & EbmlString::operator=(const std::string & NewString)
+{
+	Value = NewString;
+	SetValueIsSet();
+/* done automatically	
+	SetSize_(Value.length());
+	if (GetDefaultSize() > GetSize())
+		SetSize_(GetDefaultSize());*/
+	return *this;
+}
+
+uint64 EbmlString::UpdateSize(bool bWithDefault, bool bForceRender)
+{
+	if (!bWithDefault && IsDefaultValue())
+		return 0;
+
+	if (Value.length() < GetDefaultSize()) {
+		SetSize_(GetDefaultSize());
+	} else {
+		SetSize_(Value.length());
+	}
+	return GetSize();
+}
+
+filepos_t EbmlString::ReadData(IOCallback & input, ScopeMode ReadFully)
+{
+	if (ReadFully != SCOPE_NO_DATA)
+	{
+		if (GetSize() == 0) {
+			Value = "";
+			SetValueIsSet();
+		} else {
+			char *Buffer = new char[GetSize() + 1];
+			if (Buffer == NULL) {
+				// unable to store the data, skip it
+				input.setFilePointer(GetSize(), seek_current);
+			} else {
+				input.readFully(Buffer, GetSize());
+				if (Buffer[GetSize()-1] != '\0') {
+					Buffer[GetSize()] = '\0';
+				}
+				Value = Buffer;
+				delete [] Buffer;
+				SetValueIsSet();
+			}
+		}
+	}
+
+	return GetSize();
+}
+
+END_LIBEBML_NAMESPACE

src/EbmlUInteger.cpp

@@ -30,7 +30,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlUInteger.cpp 1079 2005-03-03 13:18:14Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 	\author Moritz Bunkus <moritz @ bunkus.org>
 */
@@ -64,12 +64,17 @@ void EbmlUInteger::SetDefaultValue(uint64 aValue)
     SetDefaultIsSet();
 }
 
-const uint64 EbmlUInteger::DefaultVal() const
+uint64 EbmlUInteger::DefaultVal() const
 {
     assert(DefaultISset());
     return DefaultValue;
 }
 
+EbmlUInteger::operator uint8()  const {return uint8(Value); }
+EbmlUInteger::operator uint16() const {return uint16(Value);}
+EbmlUInteger::operator uint32() const {return uint32(Value);}
+EbmlUInteger::operator uint64() const {return Value;}
+
 
 /*!
 	\todo handle exception on errors

src/EbmlUnicodeString.cpp

@@ -1,321 +1,337 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlUnicodeString.cpp 1079 2005-03-03 13:18:14Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Jory Stone       <jcsston @ toughguy.net>
-*/
-
-#include <cassert>
-
-#if __GNUC__ == 2 && ! defined ( __OpenBSD__ )
-#include <wchar.h>
-#endif
-
-#include "ebml/EbmlUnicodeString.h"
-
-START_LIBEBML_NAMESPACE
-
-// ===================== UTFstring class ===================
-
-UTFstring::UTFstring()
-	:_Length(0)
-	,_Data(NULL)
-{}
-
-UTFstring::UTFstring(const wchar_t * _aBuf)
-	:_Length(0)
-	,_Data(NULL)
-{
-	*this = _aBuf;
-}
-
-UTFstring::~UTFstring()
-{
-	delete [] _Data;
-}
-
-UTFstring::UTFstring(const UTFstring & _aBuf)
-	:_Length(0)
-	,_Data(NULL)
-{
-	*this = _aBuf.c_str();
-}
-
-UTFstring & UTFstring::operator=(const UTFstring & _aBuf)
-{
-	*this = _aBuf.c_str();
-	return *this;
-}
-
-UTFstring & UTFstring::operator=(const wchar_t * _aBuf)
-{
-	delete [] _Data;
-	if (_aBuf == NULL) {
-		_Data = new wchar_t[1];
-		_Data[0] = 0;
-		UpdateFromUCS2();
-		return *this;
-	}
-
-	size_t aLen;
-	for (aLen=0; _aBuf[aLen] != 0; aLen++);
-	_Length = aLen;
-	_Data = new wchar_t[_Length+1];
-	for (aLen=0; _aBuf[aLen] != 0; aLen++) {
-		_Data[aLen] = _aBuf[aLen];
-	}
-	_Data[aLen] = 0;
-	UpdateFromUCS2();
-	return *this;
-}
-
-UTFstring & UTFstring::operator=(wchar_t _aChar)
-{
-	delete [] _Data;
-	_Data = new wchar_t[2];
-	_Length = 1;
-	_Data[0] = _aChar;
-	_Data[1] = 0;
-	UpdateFromUCS2();
-	return *this;
-}
-
-bool UTFstring::operator==(const UTFstring& _aStr) const
-{
-	if ((_Data == NULL) && (_aStr._Data == NULL))
-		return true;
-	if ((_Data == NULL) || (_aStr._Data == NULL))
-		return false;
-	return wcscmp_internal(_Data, _aStr._Data);
-}
-
-void UTFstring::SetUTF8(const std::string & _aStr)
-{
-	UTF8string = _aStr;
-	UpdateFromUTF8();
-}
-
-/*!
-	\see RFC 2279
-*/
-void UTFstring::UpdateFromUTF8()
-{
-	delete [] _Data;
-	// find the size of the final UCS-2 string
-	size_t i;
-	for (_Length=0, i=0; i<UTF8string.length(); _Length++) {
-		if ((UTF8string[i] & 0x80) == 0) {
-			i++;
-		} else if ((UTF8string[i] & 0x20) == 0) {
-			i += 2;
-		} else if ((UTF8string[i] & 0x10) == 0) {
-			i += 3;
-		}
-	}
-	_Data = new wchar_t[_Length+1];
-	size_t j;
-	for (j=0, i=0; i<UTF8string.length(); j++) {
-		if ((UTF8string[i] & 0x80) == 0) {
-			_Data[j] = UTF8string[i];
-			i++;
-		} else if ((UTF8string[i] & 0x20) == 0) {
-			_Data[j] = ((UTF8string[i] & 0x1F) << 6) + (UTF8string[i+1] & 0x3F);
-			i += 2;
-		} else if ((UTF8string[i] & 0x10) == 0) {
-			_Data[j] = ((UTF8string[i] & 0x0F) << 12) + ((UTF8string[i+1] & 0x3F) << 6) + (UTF8string[i+2] & 0x3F);
-			i += 3;
-		}
-	}
-	_Data[j] = 0;
-}
-
-void UTFstring::UpdateFromUCS2()
-{
-	// find the size of the final UTF-8 string
-	size_t i,Size=0;
-	for (i=0; i<_Length; i++)
-	{
-		if (_Data[i] < 0x80) {
-			Size++;
-		} else if (_Data[i] < 0x800) {
-			Size += 2;
-		} else if (_Data[i] < 0x10000) {
-			Size += 3;
-		}
-	}
-	std::string::value_type *tmpStr = new std::string::value_type[Size+1];
-	for (i=0, Size=0; i<_Length; i++)
-	{
-		if (_Data[i] < 0x80) {
-			tmpStr[Size++] = _Data[i];
-		} else if (_Data[i] < 0x800) {
-			tmpStr[Size++] = 0xC0 | (_Data[i] >> 6);
-			tmpStr[Size++] = 0x80 | (_Data[i] & 0x3F);
-		} else if (_Data[i] < 0x10000) {
-			tmpStr[Size++] = 0xE0 | (_Data[i] >> 12);
-			tmpStr[Size++] = 0x80 | ((_Data[i] >> 6) & 0x3F);
-			tmpStr[Size++] = 0x80 | (_Data[i] & 0x3F);
-		}
-	}
-	tmpStr[Size] = 0;
-	UTF8string = tmpStr; // implicit conversion
-	delete [] tmpStr;
-
-}
-
-bool UTFstring::wcscmp_internal(const wchar_t *str1, const wchar_t *str2)
-{
-	size_t Index=0;
-	while (str1[Index] == str2[Index] && str1[Index] != 0) {
-		Index++;
-	}
-	return (str1[Index] == str2[Index]);
-}
-
-// ===================== EbmlUnicodeString class ===================
-
-EbmlUnicodeString::EbmlUnicodeString()
-:EbmlElement(0, false)
-{
-	SetDefaultSize(0);
-}
-
-EbmlUnicodeString::EbmlUnicodeString(const UTFstring & aDefaultValue)
-:EbmlElement(0, true), Value(aDefaultValue), DefaultValue(aDefaultValue)
-{
-	SetDefaultSize(0);
-	SetDefaultIsSet();
-}
-
-EbmlUnicodeString::EbmlUnicodeString(const EbmlUnicodeString & ElementToClone)
- :EbmlElement(ElementToClone)
- ,Value(ElementToClone.Value)
- ,DefaultValue(ElementToClone.DefaultValue)
-{
-}
-
-void EbmlUnicodeString::SetDefaultValue(UTFstring & aValue)
-{
-    assert(!DefaultISset());
-    DefaultValue = aValue;
-    SetDefaultIsSet();
-}
-
-const UTFstring & EbmlUnicodeString::DefaultVal() const
-{
-    assert(DefaultISset());
-    return DefaultValue;
-}
-
-
-/*!
-\note limited to UCS-2
-\todo handle exception on errors
-*/
-filepos_t EbmlUnicodeString::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
-{
-	uint32 Result = Value.GetUTF8().length();
-
-	if (Result != 0) {
-		output.writeFully(Value.GetUTF8().c_str(), Result);
-	}
-
-	if (Result < GetDefaultSize()) {
-		// pad the rest with 0
-		binary *Pad = new binary[GetDefaultSize() - Result];
-		if (Pad != NULL) {
-			memset(Pad, 0x00, GetDefaultSize() - Result);
-			output.writeFully(Pad, GetDefaultSize() - Result);
-
-			Result = GetDefaultSize();
-			delete [] Pad;
-		}
-	}
-
-	return Result;
-}
-
-EbmlUnicodeString & EbmlUnicodeString::operator=(const UTFstring & NewString)
-{
-	Value = NewString;
-	SetValueIsSet();
-	return *this;
-}
-
-/*!
-\note limited to UCS-2
-*/
-uint64 EbmlUnicodeString::UpdateSize(bool bWithDefault, bool bForceRender)
-{
-	if (!bWithDefault && IsDefaultValue())
-		return 0;
-
-	SetSize_(Value.GetUTF8().length());
-	if (GetSize() < GetDefaultSize())
-		SetSize_(GetDefaultSize());
-
-	return GetSize();
-}
-
-/*!
-	\note limited to UCS-2
-*/
-filepos_t EbmlUnicodeString::ReadData(IOCallback & input, ScopeMode ReadFully)
-{	
-	if (ReadFully != SCOPE_NO_DATA)
-	{
-		if (GetSize() == 0) {
-			Value = UTFstring::value_type(0);
-			SetValueIsSet();
-		} else {
-			char *Buffer = new char[GetSize()+1];
-			if (Buffer == NULL) {
-				// impossible to read, skip it
-				input.setFilePointer(GetSize(), seek_current);
-			} else {
-				input.readFully(Buffer, GetSize());
-				if (Buffer[GetSize()-1] != 0) {
-					Buffer[GetSize()] = 0;
-				}
-
-				Value.SetUTF8(Buffer); // implicit conversion to std::string
-				delete [] Buffer;
-				SetValueIsSet();
-			}
-		}
-	}
-
-	return GetSize();
-}
-
-END_LIBEBML_NAMESPACE
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id$
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+	\author Jory Stone       <jcsston @ toughguy.net>
+*/
+
+#include <cassert>
+
+#if __GNUC__ == 2 && ! defined ( __OpenBSD__ )
+#include <wchar.h>
+#endif
+
+#include "ebml/EbmlUnicodeString.h"
+
+START_LIBEBML_NAMESPACE
+
+// ===================== UTFstring class ===================
+
+UTFstring::UTFstring()
+	:_Length(0)
+	,_Data(NULL)
+{}
+
+UTFstring::UTFstring(const wchar_t * _aBuf)
+	:_Length(0)
+	,_Data(NULL)
+{
+	*this = _aBuf;
+}
+
+UTFstring::~UTFstring()
+{
+	delete [] _Data;
+}
+
+UTFstring::UTFstring(const UTFstring & _aBuf)
+	:_Length(0)
+	,_Data(NULL)
+{
+	*this = _aBuf.c_str();
+}
+
+UTFstring & UTFstring::operator=(const UTFstring & _aBuf)
+{
+	*this = _aBuf.c_str();
+	return *this;
+}
+
+UTFstring::operator const wchar_t*() const {return _Data;}
+
+
+UTFstring & UTFstring::operator=(const wchar_t * _aBuf)
+{
+	delete [] _Data;
+	if (_aBuf == NULL) {
+		_Data = new wchar_t[1];
+		_Data[0] = 0;
+		UpdateFromUCS2();
+		return *this;
+	}
+
+	size_t aLen;
+	for (aLen=0; _aBuf[aLen] != 0; aLen++);
+	_Length = aLen;
+	_Data = new wchar_t[_Length+1];
+	for (aLen=0; _aBuf[aLen] != 0; aLen++) {
+		_Data[aLen] = _aBuf[aLen];
+	}
+	_Data[aLen] = 0;
+	UpdateFromUCS2();
+	return *this;
+}
+
+UTFstring & UTFstring::operator=(wchar_t _aChar)
+{
+	delete [] _Data;
+	_Data = new wchar_t[2];
+	_Length = 1;
+	_Data[0] = _aChar;
+	_Data[1] = 0;
+	UpdateFromUCS2();
+	return *this;
+}
+
+bool UTFstring::operator==(const UTFstring& _aStr) const
+{
+	if ((_Data == NULL) && (_aStr._Data == NULL))
+		return true;
+	if ((_Data == NULL) || (_aStr._Data == NULL))
+		return false;
+	return wcscmp_internal(_Data, _aStr._Data);
+}
+
+void UTFstring::SetUTF8(const std::string & _aStr)
+{
+	UTF8string = _aStr;
+	UpdateFromUTF8();
+}
+
+/*!
+	\see RFC 2279
+*/
+void UTFstring::UpdateFromUTF8()
+{
+	delete [] _Data;
+	// find the size of the final UCS-2 string
+	size_t i;
+	for (_Length=0, i=0; i<UTF8string.length(); _Length++) {
+		uint8 lead = static_cast<uint8>(UTF8string[i]);
+		if (lead < 0x80)
+			i++;
+		else if ((lead >> 5) == 0x6)
+			i += 2;
+		else if ((lead >> 4) == 0xe)
+			i += 3;
+		else if ((lead >> 3) == 0x1e)
+			i += 4;
+		else
+			// Invalid size?
+			break;
+	}
+	_Data = new wchar_t[_Length+1];
+	size_t j;
+	for (j=0, i=0; i<UTF8string.length(); j++) {
+		uint8 lead = static_cast<uint8>(UTF8string[i]);
+		if (lead < 0x80) {
+			_Data[j] = lead;
+			i++;
+		} else if ((lead >> 5) == 0x6) {
+			_Data[j] = ((lead & 0x1F) << 6) + (UTF8string[i+1] & 0x3F);
+			i += 2;
+		} else if ((lead >> 4) == 0xe) {
+			_Data[j] = ((lead & 0x0F) << 12) + ((UTF8string[i+1] & 0x3F) << 6) + (UTF8string[i+2] & 0x3F);
+			i += 3;
+		} else if ((lead >> 3) == 0x1e) {
+			_Data[j] = ((lead & 0x07) << 18) + ((UTF8string[i+1] & 0x3F) << 12) + ((UTF8string[i+2] & 0x3F) << 6) + (UTF8string[i+3] & 0x3F);
+			i += 4;
+		} else
+			// Invalid char?
+			break;
+	}
+	_Data[j] = 0;
+}
+
+void UTFstring::UpdateFromUCS2()
+{
+	// find the size of the final UTF-8 string
+	size_t i,Size=0;
+	for (i=0; i<_Length; i++)
+	{
+		if (_Data[i] < 0x80) {
+			Size++;
+		} else if (_Data[i] < 0x800) {
+			Size += 2;
+		} else if (_Data[i] < 0x10000) {
+			Size += 3;
+		}
+	}
+	std::string::value_type *tmpStr = new std::string::value_type[Size+1];
+	for (i=0, Size=0; i<_Length; i++)
+	{
+		if (_Data[i] < 0x80) {
+			tmpStr[Size++] = _Data[i];
+		} else if (_Data[i] < 0x800) {
+			tmpStr[Size++] = 0xC0 | (_Data[i] >> 6);
+			tmpStr[Size++] = 0x80 | (_Data[i] & 0x3F);
+		} else if (_Data[i] < 0x10000) {
+			tmpStr[Size++] = 0xE0 | (_Data[i] >> 12);
+			tmpStr[Size++] = 0x80 | ((_Data[i] >> 6) & 0x3F);
+			tmpStr[Size++] = 0x80 | (_Data[i] & 0x3F);
+		}
+	}
+	tmpStr[Size] = 0;
+	UTF8string = tmpStr; // implicit conversion
+	delete [] tmpStr;
+
+}
+
+bool UTFstring::wcscmp_internal(const wchar_t *str1, const wchar_t *str2)
+{
+	size_t Index=0;
+	while (str1[Index] == str2[Index] && str1[Index] != 0) {
+		Index++;
+	}
+	return (str1[Index] == str2[Index]);
+}
+
+// ===================== EbmlUnicodeString class ===================
+
+EbmlUnicodeString::EbmlUnicodeString()
+:EbmlElement(0, false)
+{
+	SetDefaultSize(0);
+}
+
+EbmlUnicodeString::EbmlUnicodeString(const UTFstring & aDefaultValue)
+:EbmlElement(0, true), Value(aDefaultValue), DefaultValue(aDefaultValue)
+{
+	SetDefaultSize(0);
+	SetDefaultIsSet();
+}
+
+EbmlUnicodeString::EbmlUnicodeString(const EbmlUnicodeString & ElementToClone)
+ :EbmlElement(ElementToClone)
+ ,Value(ElementToClone.Value)
+ ,DefaultValue(ElementToClone.DefaultValue)
+{
+}
+
+void EbmlUnicodeString::SetDefaultValue(UTFstring & aValue)
+{
+    assert(!DefaultISset());
+    DefaultValue = aValue;
+    SetDefaultIsSet();
+}
+
+const UTFstring & EbmlUnicodeString::DefaultVal() const
+{
+    assert(DefaultISset());
+    return DefaultValue;
+}
+
+
+/*!
+\note limited to UCS-2
+\todo handle exception on errors
+*/
+filepos_t EbmlUnicodeString::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
+{
+	uint32 Result = Value.GetUTF8().length();
+
+	if (Result != 0) {
+		output.writeFully(Value.GetUTF8().c_str(), Result);
+	}
+
+	if (Result < GetDefaultSize()) {
+		// pad the rest with 0
+		binary *Pad = new binary[GetDefaultSize() - Result];
+		if (Pad != NULL) {
+			memset(Pad, 0x00, GetDefaultSize() - Result);
+			output.writeFully(Pad, GetDefaultSize() - Result);
+
+			Result = GetDefaultSize();
+			delete [] Pad;
+		}
+	}
+
+	return Result;
+}
+
+EbmlUnicodeString::operator const UTFstring &() const {return Value;}
+
+EbmlUnicodeString & EbmlUnicodeString::operator=(const UTFstring & NewString)
+{
+	Value = NewString;
+	SetValueIsSet();
+	return *this;
+}
+
+/*!
+\note limited to UCS-2
+*/
+uint64 EbmlUnicodeString::UpdateSize(bool bWithDefault, bool bForceRender)
+{
+	if (!bWithDefault && IsDefaultValue())
+		return 0;
+
+	SetSize_(Value.GetUTF8().length());
+	if (GetSize() < GetDefaultSize())
+		SetSize_(GetDefaultSize());
+
+	return GetSize();
+}
+
+/*!
+	\note limited to UCS-2
+*/
+filepos_t EbmlUnicodeString::ReadData(IOCallback & input, ScopeMode ReadFully)
+{	
+	if (ReadFully != SCOPE_NO_DATA)
+	{
+		if (GetSize() == 0) {
+			Value = UTFstring::value_type(0);
+			SetValueIsSet();
+		} else {
+			char *Buffer = new char[GetSize()+1];
+			if (Buffer == NULL) {
+				// impossible to read, skip it
+				input.setFilePointer(GetSize(), seek_current);
+			} else {
+				input.readFully(Buffer, GetSize());
+				if (Buffer[GetSize()-1] != 0) {
+					Buffer[GetSize()] = 0;
+				}
+
+				Value.SetUTF8(Buffer); // implicit conversion to std::string
+				delete [] Buffer;
+				SetValueIsSet();
+			}
+		}
+	}
+
+	return GetSize();
+}
+
+END_LIBEBML_NAMESPACE

src/EbmlVersion.cpp

@@ -1,41 +1,44 @@
-/****************************************************************************
-** libebml : parse EBML files, see http://embl.sourceforge.net/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libebml.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
-**
-** Contact license@matroska.org if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: EbmlVersion.cpp 639 2004-07-09 20:59:14Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-
-#include "ebml/EbmlVersion.h"
-
-START_LIBEBML_NAMESPACE
-
-END_LIBEBML_NAMESPACE
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id: EbmlVersion.cpp 639 2004-07-09 20:59:14Z mosu $
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+*/
+
+#include "ebml/EbmlVersion.h"
+
+START_LIBEBML_NAMESPACE
+
+const std::string EbmlCodeVersion = "1.2.2";
+const std::string EbmlCodeDate    = __TIMESTAMP__;
+
+END_LIBEBML_NAMESPACE

src/MemIOCallback.cpp

@@ -72,8 +72,9 @@ uint32 MemIOCallback::read(void *Buffer, size_t Size)
 	{
 		//We will only return the remaining data
 		memcpy(Buffer, dataBuffer + dataBufferPos, dataBufferTotalSize - dataBufferPos);
+        uint64 oldDataPos = dataBufferPos;
 		dataBufferPos = dataBufferTotalSize;
-		return dataBufferTotalSize - dataBufferPos;
+		return dataBufferTotalSize - oldDataPos;
 	}
 		
 	//Well... We made it here, so do a quick and simple copy

src/StdIOCallback.cpp

@@ -49,13 +49,13 @@ START_LIBEBML_NAMESPACE
 
 CRTError::CRTError(int nError, const std::string & Description)
 	:std::runtime_error(Description+": "+strerror(nError))
-	,Error(Error)
+	,Error(nError)
 {
 }
 
 CRTError::CRTError(const std::string & Description,int nError)
 	:std::runtime_error(Description+": "+strerror(nError))
-	,Error(Error)
+	,Error(nError)
 {
 }