ref: f887cf3ee0e914e7e51517788ef969be6fe06c7f
parent: 85d8a8d587328ced9d04c6133ebba05917614397
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Sun Jun 28 16:00:58 EDT 2020
Update tools/gfx to support --preserve
--- a/tools/gfx.c
+++ b/tools/gfx.c
@@ -8,7 +8,7 @@
#include "common.h"
static void usage(void) {- fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [--remove-duplicates [--keep-whitespace]] [--remove-xflip] [--remove-yflip] [--png filename] [-d depth] [-h] [-o outfile] infile\n");
+ fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [--remove-duplicates [--keep-whitespace]] [--remove-xflip] [--remove-yflip] [--preserve indexes] [--png filename] [-d depth] [-h] [-o outfile] infile\n");
}
static void error(char *message) {@@ -27,6 +27,8 @@
int keep_whitespace;
int remove_xflip;
int remove_yflip;
+ int *preserved;
+ int num_preserved;
char *png_file;
};
@@ -43,11 +45,13 @@
{"keep-whitespace", no_argument, &Options.keep_whitespace, 1}, {"remove-xflip", no_argument, &Options.remove_xflip, 1}, {"remove-yflip", no_argument, &Options.remove_yflip, 1},+ {"preserve", required_argument, 0, 'r'}, {"png", required_argument, 0, 'p'}, {"depth", required_argument, 0, 'd'}, {"help", no_argument, 0, 'h'}, {0}};
+ char *token;
for (int opt = 0; opt != -1;) { switch (opt = getopt_long(argc, argv, "ho:d:p:", long_options)) {case 'h':
@@ -59,6 +63,15 @@
case 'd':
Options.depth = strtoul(optarg, NULL, 0);
break;
+ case 'r':
+ token = strtok(optarg, ",");
+ while (token) {+ Options.num_preserved++;
+ Options.preserved = realloc(Options.preserved, Options.num_preserved * sizeof(int));
+ Options.preserved[Options.num_preserved-1] = strtoul(token, NULL, 0);
+ token = strtok(NULL, ",");
+ }
+ break;
case 'p':
Options.png_file = optarg;
break;
@@ -73,6 +86,23 @@
}
}
+bool is_preserved(int index) {+ for (int i = 0; i < Options.num_preserved; i++) {+ if (Options.preserved[i] == index) {+ return true;
+ }
+ }
+ return false;
+}
+
+void shift_preserved(int removed_index) {+ for (int i = 0; i < Options.num_preserved; i++) {+ if (Options.preserved[i] >= removed_index) {+ Options.preserved[i]--;
+ }
+ }
+}
+
struct Graphic {int size;
uint8_t *data;
@@ -91,7 +121,7 @@
void trim_whitespace(struct Graphic *graphic) {int tile_size = Options.depth * 8;
for (int i = graphic->size - tile_size; i > 0; i -= tile_size) {- if (is_whitespace(&graphic->data[i], tile_size)) {+ if (is_whitespace(&graphic->data[i], tile_size) && !is_preserved(i / tile_size)) {graphic->size = i;
} else {break;
@@ -102,9 +132,15 @@
void remove_whitespace(struct Graphic *graphic) {int tile_size = Options.depth * 8;
if (Options.interleave) tile_size *= 2;
+
+ // Make sure we have a whole number of tiles, round down if required
+ graphic->size &= ~(tile_size - 1);
+
int i = 0;
- for (int j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {- while (is_whitespace(&graphic->data[j], tile_size)) {+ for (int j = 0, d = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {+ while (j < graphic->size && is_whitespace(&graphic->data[j], tile_size) && !is_preserved(j / tile_size - d)) {+ shift_preserved(j / tile_size - d);
+ d++;
j += tile_size;
}
if (j >= graphic->size) {@@ -136,11 +172,17 @@
int tile_size = Options.depth * 8;
if (Options.interleave) tile_size *= 2;
int num_tiles = 0;
- for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {- while (tile_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) {- if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) {+
+ // Make sure we have a whole number of tiles, round down if required
+ graphic->size &= ~(tile_size - 1);
+
+ for (int i = 0, j = 0, d = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {+ while (j < graphic->size && tile_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) {+ if ((Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) || is_preserved(j / tile_size - d)) {break;
}
+ shift_preserved(j / tile_size - d);
+ d++;
j += tile_size;
}
if (j >= graphic->size) {@@ -155,7 +197,8 @@
}
bool flip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles, bool xflip, bool yflip) {- uint8_t *flip = calloc(tile_size, 1);
+ uint8_t flip[tile_size];
+ memset(flip, 0, sizeof(flip));
int half_size = tile_size / 2;
for (int i = 0; i < tile_size; i++) {int byte = i;
@@ -183,11 +226,17 @@
int tile_size = Options.depth * 8;
if (Options.interleave) tile_size *= 2;
int num_tiles = 0;
- for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {- while (flip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles, xflip, yflip)) {- if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) {+
+ // Make sure we have a whole number of tiles, round down if required
+ graphic->size &= ~(tile_size - 1);
+
+ for (int i = 0, j = 0, d = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {+ while (j < graphic->size && flip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles, xflip, yflip)) {+ if ((Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) || is_preserved(j / tile_size - d)) {break;
}
+ shift_preserved(j / tile_size - d);
+ d++;
j += tile_size;
}
if (j >= graphic->size) {