diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-05-25 20:28:13 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-05-25 20:28:37 +0200 |
| commit | fe4a58ebb6fc5d09b292f1031b23fc4995818c61 (patch) | |
| tree | e6b3deeca5698d1b373f4ef03fb06b574a3bf0a4 /external/opencollada | |
| parent | 309a2dabab52dc1498ddbf69b19232e3ad9e88c4 (diff) | |
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
Diffstat (limited to 'external/opencollada')
| -rw-r--r-- | external/opencollada/UnpackedTarball_opencollada.mk | 1 | ||||
| -rw-r--r-- | external/opencollada/patches/generatedsaxparser_utils_touri_fix.patch.1 | 28 |
2 files changed, 0 insertions, 29 deletions
diff --git a/external/opencollada/UnpackedTarball_opencollada.mk b/external/opencollada/UnpackedTarball_opencollada.mk index b625bb4c2e3b..a1837927e1dd 100644 --- a/external/opencollada/UnpackedTarball_opencollada.mk +++ b/external/opencollada/UnpackedTarball_opencollada.mk @@ -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/opencollada.clang.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: diff --git a/external/opencollada/patches/generatedsaxparser_utils_touri_fix.patch.1 b/external/opencollada/patches/generatedsaxparser_utils_touri_fix.patch.1 deleted file mode 100644 index 1df5d5b50e26..000000000000 --- a/external/opencollada/patches/generatedsaxparser_utils_touri_fix.patch.1 +++ /dev/null @@ -1,28 +0,0 @@ -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); - |