Browse Source

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
kimmi 13 years ago
parent
commit
1ac5a47c5d
2 changed files with 8 additions and 0 deletions
  1. 3 0
      CREDITS
  2. 5 0
      code/StreamReader.h

+ 3 - 0
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.

+ 5 - 0
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<SwapEndianess,T,RuntimeSwitch>() (&f,le);
 
 		current += sizeof(T);