From 4e50b05b856e1cd20812079a73670f0a5338783a Mon Sep 17 00:00:00 2001 From: RichardTea <31507749+RichardTea@users.noreply.github.com> Date: Thu, 2 Jan 2020 13:24:50 +0000 Subject: [PATCH] Fix off-by-one error --- code/Collada/ColladaHelper.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/Collada/ColladaHelper.cpp b/code/Collada/ColladaHelper.cpp index 8fa42b4d9..510ac657e 100644 --- a/code/Collada/ColladaHelper.cpp +++ b/code/Collada/ColladaHelper.cpp @@ -83,8 +83,10 @@ void ToCamelCase(std::string &text) if (text.empty()) return; // Capitalise first character - text[0] = Assimp::ToUpper(text[0]); - for (auto it = text.begin(); it != text.end(); /*iterated below*/) + auto it = text.begin(); + (*it) = ToUpper(*it); + ++it; + for (/*started above*/ ; it != text.end(); /*iterated below*/) { if ((*it) == '_') { @@ -94,10 +96,9 @@ void ToCamelCase(std::string &text) } else { - // Make next one lower case - ++it; - if (it != text.end()) - (*it) = ToLower(*it); + // Make lower case + (*it) = ToLower(*it); + ++it; } } }