AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

TXTR: Eliminate variable shadowing

This commit is contained in:
Lioncash 2020-03-31 17:02:55 -04:00
parent d337327b97
commit 8132375c69
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
DataSpec/DNACommon/TXTR.cpp
View File

@ -933,9 +933,9 @@ static std::unique_ptr<uint8_t[]> ReadPalette(png_structp png, png_infop info, s
} }
} }
} else { } else {
png_colorp palettes; png_colorp palettes2;
int colorCount; int colorCount;
if (png_get_PLTE(png, info, &palettes, &colorCount) == PNG_INFO_PLTE) { if (png_get_PLTE(png, info, &palettes2, &colorCount) == PNG_INFO_PLTE) {
if (colorCount > 16) { if (colorCount > 16) {
/* This is a C8 palette */ /* This is a C8 palette */
ret.reset(new uint8_t[4 * 257]); ret.reset(new uint8_t[4 * 257]);
@ -944,7 +944,7 @@ static std::unique_ptr<uint8_t[]> ReadPalette(png_structp png, png_infop info, s
uint8_t* cur = ret.get() + 4; uint8_t* cur = ret.get() + 4;
for (int j = 0; j < 256; ++j) { for (int j = 0; j < 256; ++j) {
if (j < colorCount) { if (j < colorCount) {
png_colorp entry = &palettes[j]; const png_colorp entry = &palettes2[j];
*cur++ = entry->red; *cur++ = entry->red;
*cur++ = entry->green; *cur++ = entry->green;
*cur++ = entry->blue; *cur++ = entry->blue;
@ -964,7 +964,7 @@ static std::unique_ptr<uint8_t[]> ReadPalette(png_structp png, png_infop info, s
uint8_t* cur = ret.get() + 4; uint8_t* cur = ret.get() + 4;
for (int j = 0; j < 16; ++j) { for (int j = 0; j < 16; ++j) {
if (j < colorCount) { if (j < colorCount) {
png_colorp entry = &palettes[j]; const png_colorp entry = &palettes2[j];
*cur++ = entry->red; *cur++ = entry->red;
*cur++ = entry->green; *cur++ = entry->green;
*cur++ = entry->blue; *cur++ = entry->blue;
@ -984,11 +984,11 @@ static std::unique_ptr<uint8_t[]> ReadPalette(png_structp png, png_infop info, s
static int GetNumPaletteEntriesForGCN(png_structp png, png_infop info) { static int GetNumPaletteEntriesForGCN(png_structp png, png_infop info) {
png_sPLT_tp palettes; png_sPLT_tp palettes;
int paletteCount = png_get_sPLT(png, info, &palettes); const int paletteCount = png_get_sPLT(png, info, &palettes);
if (paletteCount) { if (paletteCount != 0) {
for (int i = 0; i < paletteCount; ++i) { for (int i = 0; i < paletteCount; ++i) {
png_sPLT_tp palette = &palettes[i]; const png_sPLT_tp palette = &palettes[i];
if (!strncmp(palette->name, "GX_", 3)) { if (strncmp(palette->name, "GX_", 3) == 0) {
if (palette->nentries > 16) { if (palette->nentries > 16) {
/* This is a C8 palette */ /* This is a C8 palette */
return 256; return 256;
@ -996,13 +996,12 @@ static int GetNumPaletteEntriesForGCN(png_structp png, png_infop info) {
/* This is a C4 palette */ /* This is a C4 palette */
return 16; return 16;
} }
break;
} }
} }
} else { } else {
png_colorp palettes; png_colorp palletes2;
int colorCount; int colorCount;
if (png_get_PLTE(png, info, &palettes, &colorCount) == PNG_INFO_PLTE) { if (png_get_PLTE(png, info, &palletes2, &colorCount) == PNG_INFO_PLTE) {
if (colorCount > 16) { if (colorCount > 16) {
/* This is a C8 palette */ /* This is a C8 palette */
return 256; return 256;