pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename *_verbose functions to idiomatic x*

Browse Source
This commit is contained in:
Rangi
2022-03-02 21:39:13 -05:00
parent 824d6bbaf2
commit e888b2f826
6 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/gfx.c
View File

@@ -61,7 +61,7 @@ void parse_args(int argc, char *argv[]) {
break;
case 'r':
for (char *token = strtok(optarg, ","); token; token = strtok(NULL, ",")) {
options.preserved = realloc(options.preserved, ++options.num_preserved * sizeof(*options.preserved));
options.preserved = xrealloc(options.preserved, ++options.num_preserved * sizeof(*options.preserved));
options.preserved[options.num_preserved-1] = strtoul(token, NULL, 0);
}
break;
@@ -212,7 +212,7 @@ const uint8_t flipped[256] = {
};
bool flip_exists(const uint8_t *tile, const uint8_t *tiles, int tile_size, int num_tiles, bool xflip, bool yflip) {
uint8_t flip[tile_size];
uint8_t flip[tile_size]; // VLA
memset(flip, 0, tile_size);
int half_size = tile_size / 2;
for (int i = 0; i < tile_size; i++) {
@@ -250,7 +250,7 @@ void interleave(struct Graphic *graphic, int width) {
int tile_size = options.depth * 8;
int width_tiles = width / 8;
int num_tiles = graphic->size / tile_size;
uint8_t *interleaved = malloc(graphic->size);
uint8_t *interleaved = xmalloc(graphic->size);
for (int i = 0; i < num_tiles; i++) {
int row = i / width_tiles;
int tile = i * 2 - (row % 2 ? width_tiles * (row + 1) - 1 : width_tiles * row);
@@ -280,7 +280,7 @@ int main(int argc, char *argv[]) {
if (!options.png_file) {
error_exit("--interleave needs --png to infer dimensions");
}
int width = read_png_width_verbose(options.png_file);
int width = read_png_width(options.png_file);
interleave(&graphic, width);
}
if (options.remove_duplicates) {