citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #681 from Zaneo/master 

Changed occurences of colour to color for consistency
This commit is contained in:
archshift 2015-04-05 00:11:48 -07:00
parent 64196976b9 8060c519a6
commit fec6d603b0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/debug_utils/debug_utils.cpp
View File

@ -597,7 +597,7 @@ void DumpTexture(const Pica::Regs::TextureConfig& texture_config, u8* data) {
png_init_io(png_ptr, fp.GetHandle()); 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, png_set_IHDR(png_ptr, info_ptr, texture_config.width, texture_config.height,
8, PNG_COLOR_TYPE_RGB /*_ALPHA*/, PNG_INTERLACE_NONE, 8, PNG_COLOR_TYPE_RGB /*_ALPHA*/, PNG_INTERLACE_NONE,
PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);

6
src/video_core/utils.h
View File

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