Merge 'master' into shader-uids-awesome.

Conflicts:
	Source/Core/VideoCommon/Src/LightingShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.h
	Source/Core/VideoCommon/Src/PixelShaderManager.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h

1 files changed, 19 insertions, 18 deletions

diff --git a/Source/Core/VideoCommon/Src/ImageWrite.cpp b/Source/Core/VideoCommon/Src/ImageWrite.cpp
index 23b0e73427..52d48fc547 100644
--- a/Source/Core/VideoCommon/Src/ImageWrite.cpp
+++ b/Source/Core/VideoCommon/Src/ImageWrite.cpp
@@ -25,22 +25,22 @@
 
 struct TGA_HEADER
 {
-    u8  identsize;          // size of ID field that follows 18 u8 header (0 usually)
-    u8  colourmaptype;      // type of colour map 0=none, 1=has palette
-    u8  imagetype;          // type of image 0=none,1=indexed,2=rgb,3=grey,+8=rle packed
-
-    s16 colourmapstart;     // first colour map entry in palette
-    s16 colourmaplength;    // number of colours in palette
-    u8  colourmapbits;      // number of bits per palette entry 15,16,24,32
-
-    s16 xstart;             // image x origin
-    s16 ystart;             // image y origin
-    s16 width;              // image width in pixels
-    s16 height;             // image height in pixels
-    u8  bits;               // image bits per pixel 8,16,24,32
-    u8  descriptor;         // image descriptor bits (vh flip bits)
-    
-    // pixel data follows header
+	u8  identsize;          // size of ID field that follows 18 u8 header (0 usually)
+	u8  colourmaptype;      // type of colour map 0=none, 1=has palette
+	u8  imagetype;          // type of image 0=none,1=indexed,2=rgb,3=grey,+8=rle packed
+
+	s16 colourmapstart;     // first colour map entry in palette
+	s16 colourmaplength;    // number of colours in palette
+	u8  colourmapbits;      // number of bits per palette entry 15,16,24,32
+
+	s16 xstart;             // image x origin
+	s16 ystart;             // image y origin
+	s16 width;              // image width in pixels
+	s16 height;             // image height in pixels
+	u8  bits;               // image bits per pixel 8,16,24,32
+	u8  descriptor;         // image descriptor bits (vh flip bits)
+	
+	// pixel data follows header
 };
 
 #pragma pack(pop)
@@ -53,7 +53,7 @@ bool SaveTGA(const char* filename, int width, int height, void* pdata)
 		return false;
 
 	_assert_(sizeof(TGA_HEADER) == 18 && sizeof(hdr) == 18);
-    
+
 	memset(&hdr, 0, sizeof(hdr));
 	hdr.imagetype = 2;
 	hdr.bits = 32;
@@ -69,7 +69,8 @@ bool SaveTGA(const char* filename, int width, int height, void* pdata)
 
 bool SaveData(const char* filename, const char* data)
 {
-	std::ofstream f(filename, std::ios::binary);
+	std::ofstream f;
+	OpenFStream(f, filename, std::ios::binary);
 	f << data;
 
 	return true;