From 81aef90f4a5e4773984af05e38947fcbf6adaa38 Mon Sep 17 00:00:00 2001 From: ulfjorensen Date: Mon, 5 Nov 2012 09:13:09 +0000 Subject: [PATCH] - manually pulled the three smaller change requests from Github. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1331 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- CMakeLists.txt | 2 +- code/Q3BSPFileImporter.cpp | 9 +++++---- include/assimp/types.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bc39f27d..eac24cab2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,7 +82,7 @@ ELSE ( ASSIMP_ENABLE_BOOST_WORKAROUND ) MESSAGE( FATAL_ERROR "Boost libraries (http://www.boost.org/) not found. " "You can build a non-boost version of Assimp with slightly reduced " - "functionality by specifying -DENABLE_BOOST_WORKAROUND=ON." + "functionality by specifying -DASSIMP_ENABLE_BOOST_WORKAROUND=ON." ) ENDIF ( NOT Boost_FOUND ) diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp index 28b04a59b..6ea67305a 100644 --- a/code/Q3BSPFileImporter.cpp +++ b/code/Q3BSPFileImporter.cpp @@ -640,6 +640,7 @@ bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pMode std::vector supportedExtensions; supportedExtensions.push_back( ".jpg" ); supportedExtensions.push_back( ".png" ); + supportedExtensions.push_back( ".tga" ); if ( NULL == pArchive || NULL == pArchive || NULL == pMatHelper ) { return false; @@ -670,10 +671,10 @@ bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pMode (void)readSize; ai_assert( readSize == pTexture->mWidth ); pTexture->pcData = reinterpret_cast( pData ); - pTexture->achFormatHint[ 0 ] = ext[ 0 ]; - pTexture->achFormatHint[ 1 ] = ext[ 1 ]; - pTexture->achFormatHint[ 2 ] = ext[ 2 ]; - pTexture->achFormatHint[ 2 ] = '\0'; + pTexture->achFormatHint[ 0 ] = ext[ 1 ]; + pTexture->achFormatHint[ 1 ] = ext[ 2 ]; + pTexture->achFormatHint[ 2 ] = ext[ 3 ]; + pTexture->achFormatHint[ 3 ] = '\0'; res = true; aiString name; diff --git a/include/assimp/types.h b/include/assimp/types.h index dc75f4db4..3afb66ef8 100644 --- a/include/assimp/types.h +++ b/include/assimp/types.h @@ -314,7 +314,7 @@ struct aiString /** Append a string to the string */ void Append (const char* app) { - const size_t len = strlen(app); + const size_t len = ::strlen(app); if (!len) { return; }