diff options
author | yenatch <yenatch@gmail.com> | 2017-07-06 22:25:16 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-06 22:25:16 -0400 |
commit | bd4a6520eaaaac186b6b26557305be8939a7ea2a (patch) | |
tree | c60fcd65afb446a8b459358edd48c5a60eba9376 /tools/gbagfx/main.c | |
parent | e39f55f55080108ced3ff5cb16b2181d7fec9d92 (diff) | |
parent | 8f1190efd62fcda55fd580e2609efbb055bc0d3d (diff) |
Merge pull request #355 from yenatch/fix-warnings
Fix uncaught cpp warnings
Diffstat (limited to 'tools/gbagfx/main.c')
-rw-r--r-- | tools/gbagfx/main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/gbagfx/main.c b/tools/gbagfx/main.c index 0624201df..37d3441fe 100644 --- a/tools/gbagfx/main.c +++ b/tools/gbagfx/main.c @@ -59,8 +59,7 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a { char *inputFileExtension = GetFileExtension(inputPath); int bitDepth = inputFileExtension[0] - '0'; - char *paletteFilePath; - bool hasPalette = false; + char *paletteFilePath = NULL; bool hasTransparency = false; int width = 1; @@ -76,8 +75,6 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a i++; paletteFilePath = argv[i]; - - hasPalette = true; } else if (strcmp(option, "-object") == 0) { @@ -102,7 +99,7 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a } } - ConvertGbaToPng(inputPath, outputPath, width, bitDepth, hasPalette ? paletteFilePath : NULL, hasTransparency); + ConvertGbaToPng(inputPath, outputPath, width, bitDepth, paletteFilePath, hasTransparency); } void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **argv) |