diff options
author | Sergey Dubitskiy <sergey.dubitskiy@nokia.com> | 2012-01-18 15:23:41 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-25 00:46:01 +0100 |
commit | 4f3b9edab3b59b6ea150d65c5357f50174cbdd73 (patch) | |
tree | 1e63fc554b89b6ecadc68f531190f7549935bc4c /3rdparty/assimp/code/StringComparison.h | |
parent | 15f5b3c1f0eb8ffef9d700001e979945aa09fc30 (diff) |
Upgrade to AssImp library v2.0.863.
Also includes a new example.
Task-number: QTBUG-22194.
Change-Id: I8870edadff58f8103e3645574b635a3b83ce1d98
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Diffstat (limited to '3rdparty/assimp/code/StringComparison.h')
-rw-r--r-- | 3rdparty/assimp/code/StringComparison.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/3rdparty/assimp/code/StringComparison.h b/3rdparty/assimp/code/StringComparison.h index b885606a..ed79874c 100644 --- a/3rdparty/assimp/code/StringComparison.h +++ b/3rdparty/assimp/code/StringComparison.h @@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_STRING_WORKERS_H #define INCLUDED_AI_STRING_WORKERS_H -namespace Assimp { +namespace Assimp { // ------------------------------------------------------------------------------- /** @brief itoa with a fixed base 10 @@ -69,7 +69,7 @@ inline unsigned int ASSIMP_itoa10( char* out, unsigned int max, int32_t number) // write the unary minus to indicate we have a negative number unsigned int written = 1u; - if (number < 0 && written < max) { + if (number < 0 && written < max) { *out++ = '-'; ++written; number = -number; @@ -78,10 +78,10 @@ inline unsigned int ASSIMP_itoa10( char* out, unsigned int max, int32_t number) // We begin with the largest number that is not zero. int32_t cur = 1000000000; // 2147483648 bool mustPrint = false; - while (written < max) { + while (written < max) { const unsigned int digit = number / cur; - if (mustPrint || digit > 0 || 1 == cur) { + if (mustPrint || digit > 0 || 1 == cur) { // print all future zeroes from now mustPrint = true; @@ -136,7 +136,7 @@ inline int ASSIMP_stricmp(const char *s1, const char *s2) #else register char c1, c2; - do { + do { c1 = tolower(*s1++); c2 = tolower(*s2++); } |