patches/libebml-03-ebmlbinary.diff
author viskov
Sun, 06 Feb 2011 00:40:45 +0000
changeset 3174 a21f87bf260d
permissions -rw-r--r--
SFEmkvtoolnix.spec: update to 4.5.0 SFElibebml.spec: update to 1.2.0 SFElibmatroska.spec: bump to 1.1.0 SFEhunspell.spec: update to 1.2.14 SFExz.spec: bump to 5.0.1 ext-sources/C++-filesystem-layout.dot: add source file for C++ libraries file system layout diagram
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3174
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
     1
--- libebml-1.2.0/src/EbmlBinary.cpp.orig	Thu Aug 19 08:01:28 2010
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
     2
+++ libebml-1.2.0/src/EbmlBinary.cpp	Sat Feb  5 15:52:23 2011
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
     3
@@ -35,6 +35,7 @@
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
     4
 	\author Julien Coloos	<suiryc @ users.sf.net>
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
     5
 */
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
     6
 #include <cassert>
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
     7
+#include <string>
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
     8
 
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
     9
 #include "ebml/EbmlBinary.h"
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
    10
 #include "ebml/StdIOCallback.h"
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
    11
@@ -93,7 +94,7 @@
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
    12
 
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
    13
 	Data = (binary *)malloc(GetSize() * sizeof(binary));
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
    14
     if (Data == NULL)
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
    15
-        throw CRTError("Error allocating data");
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
    16
+        throw CRTError(std::string("Error allocating data"));
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
    17
 	SetValueIsSet();
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
    18
 	return input.read(Data, GetSize());
a21f87bf260d SFEmkvtoolnix.spec: update to 4.5.0
viskov
parents:
diff changeset
    19
 }