v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into coverity_scan

pull/2286/head
Kim Kulling 2016-11-21 10:18:17 +01:00
parent dc3875b8f2 eb6390a639
commit 9e07701f3e
6 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -50,4 +50,5 @@ after_success:
- lcov --directory . --capture --output-file coverage.info - lcov --directory . --capture --output-file coverage.info
- lcov --remove coverage.info '/usr/*' 'contrib/*' 'test/*' --output-file coverage.info - lcov --remove coverage.info '/usr/*' 'contrib/*' 'test/*' --output-file coverage.info
- lcov --list coverage.info - lcov --list coverage.info
- coveralls-lcov --repo-token=${COVERALLS_TOKEN} coverage.info - coveralls-lcov --source-encoding=ISO-8859-1 --repo-token=${COVERALLS_TOKEN} coverage.info

2
code/AMFImporter_Postprocess.cpp
View File

@ -352,7 +352,7 @@ void AMFImporter::Postprocess_AddMetadata(const std::list<CAMFImporter_NodeEleme
for(const CAMFImporter_NodeElement_Metadata& metadata: pMetadataList) 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) }// if(pMetadataList.size() > 0)
} }

12
code/CMakeLists.txt
View File

@ -928,3 +928,15 @@ if(MSVC AND ASSIMP_INSTALL_PDB)
CONFIGURATIONS RelWithDebInfo CONFIGURATIONS RelWithDebInfo
) )
endif () 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()

2
code/STLLoader.cpp
View File

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

2
include/assimp/material.h
View File

@ -413,7 +413,7 @@ enum aiTextureFlags
* SourceColor * SourceBlend + DestColor * DestBlend * SourceColor * SourceBlend + DestColor * DestBlend
* @endcode * @endcode
* where DestColor is the previous color in the framebuffer at this * where DestColor is the previous color in the framebuffer at this
* position and SourceColor is the material colro before the transparency * position and SourceColor is the material color before the transparency
* calculation.<br> * calculation.<br>
* This corresponds to the #AI_MATKEY_BLEND_FUNC property. * This corresponds to the #AI_MATKEY_BLEND_FUNC property.
*/ */

22
test/CMakeLists.txt
View File

@ -122,15 +122,15 @@ ENDIF( WIN32 )
target_link_libraries( unit assimp ${platform_libs} ) target_link_libraries( unit assimp ${platform_libs} )
add_subdirectory(headercheck) add_subdirectory(headercheck)
if (ASSIMP_COVERALLS) #if (ASSIMP_COVERALLS)
include(Coveralls) # include(Coveralls)
#
set(COVERAGE_SRCS ${assimp_src} ${TEST_SRCS} ) # set(COVERAGE_SRCS ${assimp_src} ${TEST_SRCS} )
#
# Create the coveralls target. # # Create the coveralls target.
coveralls_setup( # coveralls_setup(
"${COVERAGE_SRCS}" # The source files. # "${COVERAGE_SRCS}" # The source files.
ON # If we should upload. # ON # If we should upload.
"${PROJECT_SOURCE_DIR}/cmake-modules/") # (Optional) Alternate project cmake module path. # "${PROJECT_SOURCE_DIR}/cmake-modules/") # (Optional) Alternate project cmake module path.
endif() #endif()