Merge remote-tracking branch pull/7047.

And fix the whitespace + optimize the pngs.

GPU/GLES/TransformPipeline.h

@@ -17,7 +17,14 @@
 
 #pragma once
 
+#if defined(IOS)
+#include <tr1/unordered_map>
+namespace std {
+	using std::tr1::unordered_map;
+}
+#else
 #include <unordered_map>
+#endif
 
 #include "GPU/Common/GPUDebugInterface.h"
 #include "GPU/Common/IndexGenerator.h"

ext/xbrz/xbrz.cpp

@@ -611,7 +611,11 @@ void scalePixel(const Kernel_3x3& ker,
 
 #ifdef _DEBUG
 	if (breakIntoDebugger)
+#if defined(IOS)
+		__asm__("trap");
+#else
 		__debugbreak(); //__asm int 3;
+#endif
 #endif
 
 	const unsigned char blend = rotateBlendInfo<rotDeg>(blendInfo);