From bd0449ea79b132a0791c3afe7e2661f7f678f3cf Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 14 Dec 2016 21:42:01 +0100 Subject: [PATCH] closes assimp/assimp/issues/1101: copy aiTexture type declaration instead of using decltype for declaration to fix iOS build. --- code/AMFImporter.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/AMFImporter.hpp b/code/AMFImporter.hpp index 64f9e6230..4d92b9ea0 100644 --- a/code/AMFImporter.hpp +++ b/code/AMFImporter.hpp @@ -135,18 +135,18 @@ private: }; /// \struct SPP_Texture - /// Data type for postprocessing step. More suitable container for texture. + /// Data type for post-processing step. More suitable container for texture. struct SPP_Texture { std::string ID; - size_t Width, Height, Depth; - bool Tiled; - decltype(aiTexture::achFormatHint) FormatHint; - uint8_t* Data; + size_t Width, Height, Depth; + bool Tiled; + char FormatHint[ 9 ];// 8 for string + 1 for terminator. + uint8_t *Data; }; /// \struct SComplexFace - /// Data type for postprocessing step. Contain face data. + /// Data type for post-processing step. Contain face data. struct SComplexFace { aiFace Face;///< Face vertices.