Merge pull request #681 from Zaneo/master

Changed occurences of colour to color for consistency

src/video_core/debug_utils/debug_utils.cpp

@@ -597,7 +597,7 @@ void DumpTexture(const Pica::Regs::TextureConfig& texture_config, u8* data) {
 
     png_init_io(png_ptr, fp.GetHandle());
 
-    // Write header (8 bit colour depth)
+    // Write header (8 bit color depth)
     png_set_IHDR(png_ptr, info_ptr, texture_config.width, texture_config.height,
         8, PNG_COLOR_TYPE_RGB /*_ALPHA*/, PNG_INTERLACE_NONE,
         PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);

src/video_core/utils.h

@@ -13,10 +13,10 @@ namespace VideoCore {
 /// Structure for the TGA texture format (for dumping)
 struct TGAHeader {
     char  idlength;
-    char  colourmaptype;
+    char  colormaptype;
     char  datatypecode;
-    short int colourmaporigin;
-    short int colourmaplength;
+    short int colormaporigin;
+    short int colormaplength;
     short int x_origin;
     short int y_origin;
     short width;