Merge branch 'master' into coverity_scan

code/AMFImporter_Postprocess.cpp

@@ -352,7 +352,7 @@ void AMFImporter::Postprocess_AddMetadata(const std::list<CAMFImporter_NodeEleme
 
 		for(const CAMFImporter_NodeElement_Metadata& metadata: pMetadataList)
 		{
-			pSceneNode.mMetaData->Set(meta_idx++, metadata.Type, metadata.Value.c_str());
+			pSceneNode.mMetaData->Set(meta_idx++, metadata.Type, aiString(metadata.Value));
 		}
 	}// if(pMetadataList.size() > 0)
 }

code/CMakeLists.txt

@@ -928,3 +928,15 @@ if(MSVC AND ASSIMP_INSTALL_PDB)
     CONFIGURATIONS RelWithDebInfo
   )
 endif ()
+
+if (ASSIMP_COVERALLS)
+    include(Coveralls)
+
+    set(COVERAGE_SRCS ${assimp_src} ${TEST_SRCS} )
+
+    # Create the coveralls target.
+    coveralls_setup(
+        "${COVERAGE_SRCS}" # The source files.
+        ON                 # If we should upload.
+        "${PROJECT_SOURCE_DIR}/cmake-modules/") # (Optional) Alternate project cmake module path.
+endif()

code/STLLoader.cpp

@@ -274,7 +274,7 @@ void STLImporter::LoadASCIIFile()
         }
         else pScene->mRootNode->mName.Set("<STL_ASCII>");
 
-        unsigned int faceVertexCounter = 0;
+        unsigned int faceVertexCounter = 3;
         for ( ;; )
         {
             // go to the next token