diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gbagfx/LICENSE | 19 | ||||
| -rw-r--r-- | tools/gbagfx/convert_png.c | 2 | ||||
| -rw-r--r-- | tools/gbagfx/gfx.c | 9 | ||||
| -rw-r--r-- | tools/gbagfx/global.h | 12 | ||||
| -rw-r--r-- | tools/gbagfx/main.c | 2 | ||||
| -rw-r--r-- | tools/scaninc/LICENSE | 19 | ||||
| -rw-r--r-- | tools/scaninc/scaninc.cpp | 18 |
7 files changed, 61 insertions, 20 deletions
diff --git a/tools/gbagfx/LICENSE b/tools/gbagfx/LICENSE new file mode 100644 index 000000000..b66bf81c0 --- /dev/null +++ b/tools/gbagfx/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2015 YamaArashi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/gbagfx/convert_png.c b/tools/gbagfx/convert_png.c index 8a3d03943..ffc1b3d41 100644 --- a/tools/gbagfx/convert_png.c +++ b/tools/gbagfx/convert_png.c @@ -1,3 +1,5 @@ +// Copyright (c) 2015 YamaArashi + #include <stdio.h> #include <setjmp.h> #include <png.h> diff --git a/tools/gbagfx/gfx.c b/tools/gbagfx/gfx.c index 71459c607..c09c4238e 100644 --- a/tools/gbagfx/gfx.c +++ b/tools/gbagfx/gfx.c @@ -253,13 +253,10 @@ void WriteImage(char *path, int numTiles, int bitDepth, struct Image *image, boo int maxNumTiles = tilesWidth * tilesHeight; - if (numTiles == 0) { + if (numTiles == 0) numTiles = maxNumTiles; - } else { - if (numTiles > maxNumTiles) { - FATAL_ERROR("The specified number of tiles (%d) is greater than the maximum possible value (%d).\n", numTiles, maxNumTiles); - } - } + else if (numTiles > maxNumTiles) + FATAL_ERROR("The specified number of tiles (%d) is greater than the maximum possible value (%d).\n", numTiles, maxNumTiles); int bufferSize = numTiles * tileSize; unsigned char *buffer = malloc(bufferSize); diff --git a/tools/gbagfx/global.h b/tools/gbagfx/global.h index 3ea5966af..ce4d6925d 100644 --- a/tools/gbagfx/global.h +++ b/tools/gbagfx/global.h @@ -10,16 +10,16 @@ #define FATAL_ERROR(format, ...) \ do { \ - fprintf(stderr, format, __VA_ARGS__); \ - exit(1); \ + fprintf(stderr, format, __VA_ARGS__); \ + exit(1); \ } while (0) #else #define FATAL_ERROR(format, ...) \ do { \ - fprintf(stderr, format, ##__VA_ARGS__); \ - exit(1); \ + fprintf(stderr, format, ##__VA_ARGS__); \ + exit(1); \ } while (0) #endif // _MSC_VER @@ -28,8 +28,8 @@ do { \ #define CHECK_PATH_LENGTH(path) \ do { \ - if (strlen(path) > GBAGFX_MAX_PATH) \ - FATAL_ERROR("\"%s\" is too long a path.\n", path); \ + if (strlen(path) > GBAGFX_MAX_PATH) \ + FATAL_ERROR("\"%s\" is too long a path.\n", path); \ } while (0) #endif // GLOBAL_H diff --git a/tools/gbagfx/main.c b/tools/gbagfx/main.c index 8a750f03a..a1a0ed4da 100644 --- a/tools/gbagfx/main.c +++ b/tools/gbagfx/main.c @@ -1,3 +1,5 @@ +// Copyright (c) 2015 YamaArashi + #include <stdio.h> #include <string.h> #include <stdbool.h> diff --git a/tools/scaninc/LICENSE b/tools/scaninc/LICENSE new file mode 100644 index 000000000..b66bf81c0 --- /dev/null +++ b/tools/scaninc/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2015 YamaArashi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/scaninc/scaninc.cpp b/tools/scaninc/scaninc.cpp index fa5ab87b8..803355f32 100644 --- a/tools/scaninc/scaninc.cpp +++ b/tools/scaninc/scaninc.cpp @@ -1,3 +1,5 @@ +// Copyright (c) 2015 YamaArashi + #include <cstdio> #include <cstdlib> #include <stack> @@ -8,28 +10,28 @@ #define FATAL_INPUT_ERROR(format, ...) \ do { \ - fprintf(stderr, "%s:%d " format, m_path.c_str(), m_lineNum, __VA_ARGS__); \ - exit(1); \ + fprintf(stderr, "%s:%d " format, m_path.c_str(), m_lineNum, __VA_ARGS__); \ + exit(1); \ } while (0) #define FATAL_ERROR(format, ...) \ do { \ - fprintf(stderr, format, __VA_ARGS__); \ - exit(1); \ + fprintf(stderr, format, __VA_ARGS__); \ + exit(1); \ } while (0) #else #define FATAL_INPUT_ERROR(format, ...) \ do { \ - fprintf(stderr, "%s:%d " format, m_path.c_str(), m_lineNum, ##__VA_ARGS__); \ - exit(1); \ + fprintf(stderr, "%s:%d " format, m_path.c_str(), m_lineNum, ##__VA_ARGS__); \ + exit(1); \ } while (0) #define FATAL_ERROR(format, ...) \ do { \ - fprintf(stderr, format, ##__VA_ARGS__); \ - exit(1); \ + fprintf(stderr, format, ##__VA_ARGS__); \ + exit(1); \ } while (0) #endif // _MSC_VER |