diff options
| -rw-r--r-- | external/opencollada/UnpackedTarball_opencollada.mk | 1 | ||||
| -rw-r--r-- | external/opencollada/generatedsaxparser_utils_touri_fix.patch.1 | 35 |
2 files changed, 36 insertions, 0 deletions
diff --git a/external/opencollada/UnpackedTarball_opencollada.mk b/external/opencollada/UnpackedTarball_opencollada.mk index 579efc25494d..487a858c937e 100644 --- a/external/opencollada/UnpackedTarball_opencollada.mk +++ b/external/opencollada/UnpackedTarball_opencollada.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,opencollada,$(OPENCOLLADA_TARBALL)) $(eval $(call gb_UnpackedTarball_add_patches,opencollada,\ external/opencollada/opencollada.clang.patch.0 \ external/opencollada/opencollada.libxml.patch.0 \ + external/opencollada/generatedsaxparser_utils_touri_fix.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/opencollada/generatedsaxparser_utils_touri_fix.patch.1 b/external/opencollada/generatedsaxparser_utils_touri_fix.patch.1 new file mode 100644 index 000000000000..892d4b93020d --- /dev/null +++ b/external/opencollada/generatedsaxparser_utils_touri_fix.patch.1 @@ -0,0 +1,35 @@ +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,13 +865,14 @@ + { + if ( *buffer == bufferEnd ) + { +- failed = false; ++ failed = true; + return COLLADABU::URI(0); + } + //Just get the string as it is for ids, so that we are able to read FBX-COLLADA + //Otherwise, calling toStringItem would result in a truncated string when an id contains spaces + //const ParserString& string = toStringListItem(buffer, bufferEnd, failed); + //return COLLADABU::URI(string.str, string.length); ++ failed = false; + return COLLADABU::URI((const char*)*buffer, bufferEnd - *buffer); + } + +@@ -880,13 +881,14 @@ + { + if ( **buffer == '\0' ) + { +- failed = false; ++ failed = true; + return COLLADABU::URI(0); + } + //Just get the string as it is for ids, so that we are able to read FBX-COLLADA + //Otherwise, calling toStringItem would result in a truncated string when an id contains spaces + //const ParserString& string = toStringListItem(buffer, failed); + //return COLLADABU::URI(string.str, string.length); ++ failed = false; + return COLLADABU::URI((const char*)*buffer); + } + |