From 1ac5a47c5dc4ee70ccbff1f1d1c53cb0fd680e2b Mon Sep 17 00:00:00 2001 From: kimmi Date: Sun, 20 May 2012 20:41:06 +0000 Subject: [PATCH] Bugfix : Fix a compiler bug for iOS arm, thanks to Brian Miller. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1247 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- CREDITS | 3 +++ code/StreamReader.h | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/CREDITS b/CREDITS index 4bac34b69..a46aa2332 100644 --- a/CREDITS +++ b/CREDITS @@ -133,3 +133,6 @@ Several LWO and LWS fixes (pivoting). - Marcel Metz GCC/Linux fixes for the SimpleOpenGL sample. + +- Brian Miller +Bugfix for a compiler fix for iOS on arm. \ No newline at end of file diff --git a/code/StreamReader.h b/code/StreamReader.h index 2388434a6..8d40922e0 100644 --- a/code/StreamReader.h +++ b/code/StreamReader.h @@ -295,7 +295,12 @@ private: throw DeadlyImportError("End of file or stream limit was reached"); } +#ifdef __arm__ + T f; + memcpy (&f, current, sizeof(T)); +#else T f = *((const T*)current); +#endif Intern :: Getter() (&f,le); current += sizeof(T);