Merge a0de8db into 165b36c

assimp · Oct 7, 2019 · 40a3cd4 · 40a3cd4
2 parents 165b36c + a0de8db
commit 40a3cd4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/code/ASE/ASEParser.cpp b/code/ASE/ASEParser.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -431,7 +429,7 @@ void Parser::ParseLV1SoftSkinBlock()
                         std::string bone;
                         for (unsigned int w = 0; w < numWeights;++w) {
                             bone.clear();
-                            ParseString(bone,"*MESH_SOFTSKINVERTS.Bone");
+                            ParseString(bone, "*MESH_SOFTSKINVERTS.Bone");
 
                             // Find the bone in the mesh's list
                             std::pair<int,ai_real> me;
@@ -826,25 +824,23 @@ bool Parser::ParseString(std::string& out,const char* szName)
     char szBuffer[1024];
     if (!SkipSpaces(&filePtr))
     {
-
         ai_snprintf(szBuffer, 1024, "Unable to parse %s block: Unexpected EOL",szName);
         LogWarning(szBuffer);
         return false;
     }
     // there must be '"'
     if ('\"' != *filePtr)
     {
-
         ai_snprintf(szBuffer, 1024, "Unable to parse %s block: Strings are expected "
             "to be enclosed in double quotation marks",szName);
         LogWarning(szBuffer);
         return false;
     }
     ++filePtr;
     const char* sz = filePtr;
-    while (true)
-    {
-        if ('\"' == *sz)break;
+    while (true) {
+        if ('\"' == *sz)
+            break;
         else if ('\0' == *sz)
         {
             ai_snprintf(szBuffer, 1024, "Unable to parse %s block: Strings are expected to "

diff --git a/contrib/openddlparser/code/Value.cpp b/contrib/openddlparser/code/Value.cpp
@@ -413,8 +413,6 @@ Value *ValueAllocator::allocPrimData( Value::ValueType type, size_t len ) {
         case Value::ddl_ref:
             data->m_size = 0;
             break;
-        case Value::ddl_none:
-        case Value::ddl_types_max:
         default:
             break;
     }

diff --git a/test/unit/utASEImportExport.cpp b/test/unit/utASEImportExport.cpp
@@ -50,7 +50,7 @@ using namespace Assimp;
 
 class utASEImportExport : public AbstractImportExportBase {
 public:
-    virtual bool importerTest() {
+    bool importerTest() override {
         Assimp::Importer importer;
         const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/ASE/ThreeCubesGreen.ASE", aiProcess_ValidateDataStructure );
 #ifndef ASSIMP_BUILD_NO_3DS_IMPORTER