Merge branch releases/1.8 revisions 5195:5252 into trunk

- Get rid of some "misleading-indentation" warnings in gcc6
- Fix some compile warnings in aes which got handled as errors by some c++11 compilers.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5253 dfc29bdd-3216-0410-991c-e03cc46cb475

changes.txt

@@ -133,6 +133,8 @@ Changes in 1.9 (not yet released)
 
 --------------------------
 Changes in 1.8.4
+ - Fix some compile warnings in aes which got handled as errors by some c++11 compilers.
+ - Get rid of some misleading-indentation warnings in gcc6
  - Fix serialization of the InputReceiverEnabled flag in CCameraSceneNode
  - Fix pasting text from X11 applications to Irrlicht. Thanks @est31 for the patch.
  - Tests give now a warning when stabilizing screenshots failed. Aslo trying more often now (a hack as taking screenshots otherwise fails often in windowed mode on some systems).

source/Irrlicht/CNullDriver.h

@@ -705,16 +705,28 @@ namespace video
 		//! normal map lookup 32 bit version
 		inline f32 nml32(int x, int y, int pitch, int height, s32 *p) const
 		{
-			if (x < 0) x = pitch-1; if (x >= pitch) x = 0;
-			if (y < 0) y = height-1; if (y >= height) y = 0;
+			if (x < 0) 
+				x = pitch-1; 
+			if (x >= pitch) 
+				x = 0;
+			if (y < 0) 
+				y = height-1; 
+			if (y >= height) 
+				y = 0;
 			return (f32)(((p[(y * pitch) + x])>>16) & 0xff);
 		}
 
 		//! normal map lookup 16 bit version
 		inline f32 nml16(int x, int y, int pitch, int height, s16 *p) const
 		{
-			if (x < 0) x = pitch-1; if (x >= pitch) x = 0;
-			if (y < 0) y = height-1; if (y >= height) y = 0;
+			if (x < 0) 
+				x = pitch-1; 
+			if (x >= pitch) 
+				x = 0;
+			if (y < 0) 
+				y = height-1; 
+			if (y >= height) 
+				y = 0;
 
 			return (f32) getAverage ( p[(y * pitch) + x] );
 		}

source/Irrlicht/aesGladman/aeskey.cpp

@@ -368,8 +368,10 @@ aes_rval aes_decrypt_key192(const void *in_key, aes_decrypt_ctx cx[1])
 #endif
     }
 #else
-    cx->ks[4] = ff(ss[4] = word_in(in_key, 4));
-    cx->ks[5] = ff(ss[5] = word_in(in_key, 5));
+	ss[4] = word_in(in_key, 4);
+    cx->ks[4] = ff(ss[4]);
+    ss[5] = word_in(in_key, 5);
+    cx->ks[5] = ff(ss[5]);
     kdf6(cx->ks, 0); kd6(cx->ks, 1);
     kd6(cx->ks, 2);  kd6(cx->ks, 3);
     kd6(cx->ks, 4);  kd6(cx->ks, 5);
@@ -414,10 +416,14 @@ aes_rval aes_decrypt_key256(const void *in_key, aes_decrypt_ctx cx[1])
 #endif
     }
 #else
-    cx->ks[4] = ff(ss[4] = word_in(in_key, 4));
-    cx->ks[5] = ff(ss[5] = word_in(in_key, 5));
-    cx->ks[6] = ff(ss[6] = word_in(in_key, 6));
-    cx->ks[7] = ff(ss[7] = word_in(in_key, 7));
+	ss[4] = word_in(in_key, 4);
+    cx->ks[4] = ff(ss[4]);
+    ss[5] = word_in(in_key, 5);
+    cx->ks[5] = ff(ss[5]);
+    ss[6] = word_in(in_key, 6);
+    cx->ks[6] = ff(ss[6]);
+    ss[7] = word_in(in_key, 7);
+    cx->ks[7] = ff(ss[7]);
     kdf8(cx->ks, 0); kd8(cx->ks, 1);
     kd8(cx->ks, 2);  kd8(cx->ks, 3);
     kd8(cx->ks, 4);  kd8(cx->ks, 5);

source/Irrlicht/aesGladman/sha2.h

@@ -76,7 +76,7 @@
 #else
 #include <stdint.h>
 #endif
-    typedef int64_t sha2_64t;
+    typedef uint64_t sha2_64t;
 #if __WORDSIZE==64
 #define s_u64 ul
 #else