[SCM] libebml/master: Imported Upstream version 1.2.2
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Wed Oct 5 11:44:19 UTC 2011
The following commit has been merged in the master branch:
commit f267c5e8c252cc16ce7c2a8e61c8a862c7a49819
Author: Matteo F. Vescovi <m.vescovi at revese.it>
Date: Wed Oct 5 13:40:10 2011 +0200
Imported Upstream version 1.2.2
diff --git a/ChangeLog b/ChangeLog
index 5a7ad38..b0a3293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-23 robux4/mosu
+New 1.2.2 version:
+ - fix usage of the DEBUG #define (use LIBEBML_DEBUG instead)
+ - The EbmlCodeVersion variable now resides in the library instead of being declared static in the header file.
+ - only use the test element to read once in the loop
+
2011-06-26 robux4/mosu
New 1.2.1 version:
- fix the constructor of CRTError in StdIOCallback (patch from Graham 'gbooker' Booker)
diff --git a/debian/changelog b/debian/changelog
index 526cc88..68440bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libebml (1.2.2-1) natty; urgency=low
+
+ * New version.
+
+ -- Moritz Bunkus <moritz at bunkus.org> Fri, 23 Sep 2011 13:22:24 +0200
+
libebml (1.2.1-1) natty; urgency=low
* New version.
diff --git a/ebml/Debug.h b/ebml/Debug.h
index e8fd636..2957ce1 100644
--- a/ebml/Debug.h
+++ b/ebml/Debug.h
@@ -52,7 +52,7 @@ START_LIBEBML_NAMESPACE
static const int MAX_PREFIX_LENGTH = 128;
-#if defined(DEBUG)
+#if defined(LIBEBML_DEBUG)
// define the working debugging class
class EBML_DLL_API ADbg
@@ -102,7 +102,7 @@ private:
#endif // WIN32
};
-#else // defined(DEBUG)
+#else // defined(LIBEBML_DEBUG)
// define a class that does nothing (no output)
@@ -145,7 +145,7 @@ public:
}
};
-#endif // defined(DEBUG)
+#endif // defined(LIBEBML_DEBUG)
extern class EBML_DLL_API ADbg globalDebug;
diff --git a/ebml/EbmlConfig.h b/ebml/EbmlConfig.h
index a66a41b..39c1e2c 100644
--- a/ebml/EbmlConfig.h
+++ b/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
diff --git a/ebml/EbmlVersion.h b/ebml/EbmlVersion.h
index a56a381..bebde07 100644
--- a/ebml/EbmlVersion.h
+++ b/ebml/EbmlVersion.h
@@ -30,7 +30,7 @@
/*!
\file
- \version \$Id: EbmlVersion.h 756 2011-06-12 09:21:05Z robux4 $
+ \version \$Id: EbmlVersion.h 803 2011-09-11 09:03:43Z mosub $
\author Steve Lhomme <robux4 @ users.sf.net>
*/
#ifndef LIBEBML_VERSION_H
@@ -42,10 +42,10 @@
START_LIBEBML_NAMESPACE
-#define LIBEBML_VERSION 0x010201
+#define LIBEBML_VERSION 0x010202
-static const std::string EbmlCodeVersion = "1.2.1";
-static const std::string EbmlCodeDate = __TIMESTAMP__;
+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 ?)
diff --git a/libebml.proj b/libebml.proj
index f1d2214..b9b9138 100644
--- a/libebml.proj
+++ b/libebml.proj
@@ -2,7 +2,7 @@
LIB ebml
{
- PROJECT_VERSION 1.2.1
+ PROJECT_VERSION 1.2.2
INCLUDE .
EXPINCLUDE .
@@ -14,7 +14,7 @@ LIB ebml
REDUCE_SIZE .
FASTER_FLOAT .
-// SOURCE src/Debug.cpp
+ SOURCE src/Debug.cpp
SOURCE src/EbmlBinary.cpp
SOURCE src/EbmlContexts.cpp
SOURCE src/EbmlCrc32.cpp
@@ -38,7 +38,7 @@ LIB ebml
SOURCE(TARGET_WIN) src/platform/win32/WinIOCallback.cpp
HEADER(TARGET_WIN) src/platform/win32/WinIOCallback.h
-// HEADER ebml/Debug.h
+ HEADER ebml/Debug.h
HEADER ebml/EbmlBinary.h
HEADER ebml/EbmlConfig.h
HEADER ebml/EbmlContexts.h
diff --git a/make/linux/fedora-core.spec b/make/linux/fedora-core.spec
index a503171..5d9af3f 100644
--- a/make/linux/fedora-core.spec
+++ b/make/linux/fedora-core.spec
@@ -1,7 +1,7 @@
# SPEC file for libebml on (at least) Fedora Core 1, 2, 3
Name: libebml
-Version: 1.2.1
+Version: 1.2.2
Release: 1
License: LGPL
Summary: Extensible Binary Meta Language
diff --git a/make/linux/suse.spec b/make/linux/suse.spec
index 7d519e5..af949f9 100644
--- a/make/linux/suse.spec
+++ b/make/linux/suse.spec
@@ -14,7 +14,7 @@ BuildRequires: bzip2 cpp make tar zlib zlib-devel binutils gcc gcc-c++ libstdc++
Name: libebml
URL: http://sourceforge.net/projects/ebml
-Version: 1.2.1
+Version: 1.2.2
Release: 1
Summary: libary to parse EBML files.
License: LGPL
diff --git a/src/Debug.cpp b/src/Debug.cpp
index 2f59369..47da74d 100644
--- a/src/Debug.cpp
+++ b/src/Debug.cpp
@@ -49,7 +49,7 @@ START_LIBEBML_NAMESPACE
class ADbg globalDebug;
-#if defined(DEBUG)
+#if defined(LIBEBML_DEBUG)
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -232,6 +232,6 @@ bool ADbg::unsetDebugFile() {
return result;
}
-#endif // defined(DEBUG)
+#endif // defined(LIBEBML_DEBUG)
END_LIBEBML_NAMESPACE
diff --git a/src/EbmlElement.cpp b/src/EbmlElement.cpp
index aefcfe4..5d53c4b 100644
--- a/src/EbmlElement.cpp
+++ b/src/EbmlElement.cpp
@@ -28,7 +28,7 @@
/*!
\file
- \version \$Id: EbmlElement.cpp 708 2011-03-20 17:33:49Z robux4 $
+ \version \$Id: EbmlElement.cpp 796 2011-09-09 04:00:42Z robux4 $
\author Steve Lhomme <robux4 @ users.sf.net>
*/
@@ -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 defined(LIBEBML_DEBUG)
if (static_cast<int64>(SupposedSize) != (0-1)) assert(WrittenSize == SupposedSize);
-#endif // DEBUG
+#endif // LIBEBML_DEBUG
result += WrittenSize;
return result;
} catch (std::exception & ex) {
diff --git a/src/EbmlMaster.cpp b/src/EbmlMaster.cpp
index d6c416e..b59f309 100644
--- a/src/EbmlMaster.cpp
+++ b/src/EbmlMaster.cpp
@@ -30,7 +30,7 @@
/*!
\file
- \version \$Id: EbmlMaster.cpp 708 2011-03-20 17:33:49Z robux4 $
+ \version \$Id: EbmlMaster.cpp 796 2011-09-09 04:00:42Z robux4 $
\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 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;
}
}
diff --git a/src/EbmlVersion.cpp b/src/EbmlVersion.cpp
index 6b146a5..eae57ce 100644
--- a/src/EbmlVersion.cpp
+++ b/src/EbmlVersion.cpp
@@ -11,12 +11,12 @@
** 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
@@ -38,4 +38,7 @@
START_LIBEBML_NAMESPACE
+const std::string EbmlCodeVersion = "1.2.2";
+const std::string EbmlCodeDate = __TIMESTAMP__;
+
END_LIBEBML_NAMESPACE
--
libebml packaging
More information about the pkg-multimedia-commits
mailing list