mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

collada2gltf: Ignore case of the extension.

Browse Source 
Change-Id: If7f39a1a0537c561373137e6a9dcdb22b48037f0
This commit is contained in:
Jan Holesovsky
2014-05-20 09:37:47 +02:00
parent 2fa2e6db1c
commit 663c6800ca
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
avmedia/source/framework/modeltools.cxx
View File

@@ -148,7 +148,9 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
{ {
OUString sSource = rSourceURL; OUString sSource = rSourceURL;
#ifdef ENABLE_COLLADA2GLTF #ifdef ENABLE_COLLADA2GLTF
if (rSourceURL.endsWith(".dae") || rSourceURL.endsWith(".kmz")) const bool bIsDAE = rSourceURL.endsWithIgnoreAsciiCase(".dae");
const bool bIsKMZ = rSourceURL.endsWithIgnoreAsciiCase(".kmz");
if (bIsDAE || bIsKMZ)
{ {
OUString sName; OUString sName;
::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(), sName); ::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(), sName);
@@ -160,7 +162,7 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
std::shared_ptr <GLTF::GLTFAsset> asset(new GLTF::GLTFAsset()); std::shared_ptr <GLTF::GLTFAsset> asset(new GLTF::GLTFAsset());
asset->setInputFilePath(sSourcePath); asset->setInputFilePath(sSourcePath);
if (rSourceURL.endsWith(".kmz")) if (bIsKMZ)
{ {
std::string strDaeFilePath = GLTF::Kmz2Collada()(asset->getInputFilePath()); std::string strDaeFilePath = GLTF::Kmz2Collada()(asset->getInputFilePath());
if (strDaeFilePath == "") if (strDaeFilePath == "")