Kaydet (Commit) fe4a58eb authored tarafından Zolnai Tamás's avatar Zolnai Tamás

opencollada: remove unneeded patch

The same problem (uninitialized bool) is solved by
0002-Expose-sid-for-textures-in-extras.patch.1.
Additionally handling empty string on a different way
was a mistake so that part is unneded too.

Change-Id: I1eaa86fa7c6ef7216c0fc26ebf2ee4ec5c0936aa
üst 309a2dab
...@@ -16,7 +16,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,opencollada,\ ...@@ -16,7 +16,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,opencollada,\
external/opencollada/patches/0002-Expose-sid-for-textures-in-extras.patch.1 \ external/opencollada/patches/0002-Expose-sid-for-textures-in-extras.patch.1 \
external/opencollada/patches/opencollada.clang.patch.0 \ external/opencollada/patches/opencollada.clang.patch.0 \
external/opencollada/patches/opencollada.libxml.patch.0 \ external/opencollada/patches/opencollada.libxml.patch.0 \
external/opencollada/patches/generatedsaxparser_utils_touri_fix.patch.1 \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
diff -ur opencollada.org/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp opencollada/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
--- opencollada.org/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp 2014-05-22 15:24:25.437939696 +0200
+++ opencollada/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp 2014-05-22 15:24:50.769938623 +0200
@@ -865,9 +865,10 @@
{
if ( *buffer == bufferEnd )
{
- failed = false;
+ failed = true;
return COLLADABU::URI(0);
}
+ failed = false;
const ParserString& string = toStringListItem(buffer, bufferEnd, failed);
return COLLADABU::URI(string.str, string.length);
@@ -880,10 +881,11 @@
{
if ( **buffer == '\0' )
{
- failed = false;
+ failed = true;
return COLLADABU::URI(0);
}
+ failed = false;
const ParserString& string = toStringListItem(buffer, failed);
return COLLADABU::URI(string.str, string.length);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment