From 8060c519a6d0b09c80b51cf97f598cd272db1287 Mon Sep 17 00:00:00 2001
From: Gareth Higgins <gareth.higgins@ryerson.ca>
Date: Sun, 5 Apr 2015 02:36:43 -0400
Subject: [PATCH] Changed occurences of colour to color for consistency
---
src/video_core/debug_utils/debug_utils.cpp | 2 +-
src/video_core/utils.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index 83982b4f2..c460146cb 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/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);
diff --git a/src/video_core/utils.h b/src/video_core/utils.h
index bda793fa5..ffb3e73a3 100644
--- a/src/video_core/utils.h
+++ b/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;