1 files changed, 56 insertions, 57 deletions

diff --git a/src/3rdparty/assimp/code/RemoveComments.cpp b/src/3rdparty/assimp/code/RemoveComments.cpp
index 8de8227f4..8290d2217 100644
--- a/src/3rdparty/assimp/code/RemoveComments.cpp
+++ b/src/3rdparty/assimp/code/RemoveComments.cpp
@@ -2,11 +2,11 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2012, assimp team
+Copyright (c) 2006-2016, assimp team
 All rights reserved.
 
-Redistribution and use of this software in source and binary forms, 
-with or without modification, are permitted provided that the 
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the
 following conditions are met:
 
 * Redistributions of source code must retain the above
@@ -23,16 +23,16 @@ following conditions are met:
   derived from this software without specific prior
   written permission of the assimp team.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ----------------------------------------------------------------------
@@ -42,67 +42,66 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Defines the CommentRemover utility class
  */
 
-#include "AssimpPCH.h"
 #include "RemoveComments.h"
 #include "ParsingUtils.h"
 
-namespace Assimp	{
+namespace Assimp    {
 
 // ------------------------------------------------------------------------------------------------
 // Remove line comments from a file
 void CommentRemover::RemoveLineComments(const char* szComment,
-	char* szBuffer, char chReplacement /* = ' ' */)
+    char* szBuffer, char chReplacement /* = ' ' */)
 {
-	// validate parameters
-	ai_assert(NULL != szComment && NULL != szBuffer && *szComment);
-
-	const size_t len = strlen(szComment);
-	while (*szBuffer)	{
-
-		// skip over quotes
-		if (*szBuffer == '\"' || *szBuffer == '\'')
-			while (*szBuffer++ && *szBuffer != '\"' && *szBuffer != '\'');
-
-		if (!strncmp(szBuffer,szComment,len)) {
-			while (!IsLineEnd(*szBuffer))
-				*szBuffer++ = chReplacement;
-		}
-		++szBuffer;
-	}
+    // validate parameters
+    ai_assert(NULL != szComment && NULL != szBuffer && *szComment);
+
+    const size_t len = strlen(szComment);
+    while (*szBuffer)   {
+
+        // skip over quotes
+        if (*szBuffer == '\"' || *szBuffer == '\'')
+            while (*szBuffer++ && *szBuffer != '\"' && *szBuffer != '\'');
+
+        if (!strncmp(szBuffer,szComment,len)) {
+            while (!IsLineEnd(*szBuffer))
+                *szBuffer++ = chReplacement;
+        }
+        ++szBuffer;
+    }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Remove multi-line comments from a file
 void CommentRemover::RemoveMultiLineComments(const char* szCommentStart,
-	const char* szCommentEnd,char* szBuffer,
-	char chReplacement)
+    const char* szCommentEnd,char* szBuffer,
+    char chReplacement)
 {
-	// validate parameters
-	ai_assert(NULL != szCommentStart && NULL != szCommentEnd &&
-		NULL != szBuffer && *szCommentStart && *szCommentEnd);
-
-	const size_t len  = strlen(szCommentEnd);
-	const size_t len2 = strlen(szCommentStart);
-
-	while (*szBuffer)	{
-		// skip over quotes
-		if (*szBuffer == '\"' || *szBuffer == '\'')
-			while (*szBuffer++ && *szBuffer != '\"' && *szBuffer != '\'');
-
-		if (!strncmp(szBuffer,szCommentStart,len2))  {
-			while (*szBuffer) {
-				if (!::strncmp(szBuffer,szCommentEnd,len)) {
-					for (unsigned int i = 0; i < len;++i)
-						*szBuffer++ = chReplacement;
-
-					break;
-				}
-			*szBuffer++ = chReplacement;
-			}
-			continue;
-		}
-		++szBuffer;
-	}
+    // validate parameters
+    ai_assert(NULL != szCommentStart && NULL != szCommentEnd &&
+        NULL != szBuffer && *szCommentStart && *szCommentEnd);
+
+    const size_t len  = strlen(szCommentEnd);
+    const size_t len2 = strlen(szCommentStart);
+
+    while (*szBuffer)   {
+        // skip over quotes
+        if (*szBuffer == '\"' || *szBuffer == '\'')
+            while (*szBuffer++ && *szBuffer != '\"' && *szBuffer != '\'');
+
+        if (!strncmp(szBuffer,szCommentStart,len2))  {
+            while (*szBuffer) {
+                if (!::strncmp(szBuffer,szCommentEnd,len)) {
+                    for (unsigned int i = 0; i < len;++i)
+                        *szBuffer++ = chReplacement;
+
+                    break;
+                }
+            *szBuffer++ = chReplacement;
+            }
+            continue;
+        }
+        ++szBuffer;
+    }
 }
 
 } // !! Assimp