diff --git a/img2cpi.c b/img2cpi.c index f3ee294..0c9f44a 100644 --- a/img2cpi.c +++ b/img2cpi.c @@ -40,11 +40,11 @@ const extern struct palette DEFAULT_PALETTE, DEFAULT_GRAY_PALETTE; struct arguments { int width, height; - enum character_mode { - CHARACTER_BLOCK, - CHARACTER_CHAR_PRECISE, - CHARACTER_CHAR_FAST, - } character_mode; + enum conversion_mode { + CONVERSION_BLOCK, + CONVERSION_CHAR_PRECISE, + CONVERSION_CHAR_FAST, + } conversion_mode; enum cpi_version { CPI_VERSION_AUTO, CPI_VERSION_RAW, @@ -73,7 +73,7 @@ struct arguments { } args = { .width = 4 * 8 - 1, // 4x3 blocks screen .height = 3 * 6 - 2, - .character_mode = CHARACTER_CHAR_PRECISE, + .conversion_mode = CONVERSION_CHAR_PRECISE, .cpi_version = CPI_VERSION_AUTO, .placement = PLACEMENT_FULL, .input_path = NULL, @@ -204,7 +204,7 @@ int main(int argc, char **argv) { } struct image *canvas; - if (args.character_mode == CHARACTER_BLOCK) { + if (args.conversion_mode == CONVERSION_BLOCK) { canvas = image_new(args.width * 2, args.height * 3); } else { canvas = image_new(args.width * 8, args.height * 11); @@ -257,18 +257,18 @@ int main(int argc, char **argv) { return EXIT_FAILURE; } - switch (args.character_mode) { - case CHARACTER_BLOCK: + switch (args.conversion_mode) { + case CONVERSION_BLOCK: convert_2x3(quantized_image, characters); break; - case CHARACTER_CHAR_PRECISE: + case CONVERSION_CHAR_PRECISE: convert_8x11(quantized_image, characters, true); break; - case CHARACTER_CHAR_FAST: + case CONVERSION_CHAR_FAST: convert_8x11(quantized_image, characters, false); break; default: - fprintf(stderr, "BUG: invalid args.character_mode\n"); + fprintf(stderr, "BUG: invalid args.conversion_mode\n"); return EXIT_FAILURE; } @@ -320,7 +320,7 @@ bool parse_cmdline(int argc, char **argv) { exit(EXIT_SUCCESS); break; case 'f': // --fast - args.character_mode = CHARACTER_BLOCK; + args.conversion_mode = CONVERSION_BLOCK; fprintf(stderr, "Warning: `--fast` is deprecated, use `--mode block` instead\n"); if (args.cpi_version != CPI_VERSION_AUTO) { fprintf(stderr, "Warning: text mode ignores version\n"); @@ -329,11 +329,11 @@ bool parse_cmdline(int argc, char **argv) { case 'm': // --mode { if (0 == strcmp(optarg, "block") || 0 == strcmp(optarg, "fast") || 0 == strcmp(optarg, "2x3")) { - args.character_mode = CHARACTER_BLOCK; + args.conversion_mode = CONVERSION_BLOCK; } else if (0 == strcmp(optarg, "char") || 0 == strcmp(optarg, "char-precise") || 0 == strcmp(optarg, "8x11") || 0 == strcmp(optarg, "6x9")) { - args.character_mode = CHARACTER_CHAR_PRECISE; + args.conversion_mode = CONVERSION_CHAR_PRECISE; } else if (0 == strcmp(optarg, "char-fast") || 0 == strcmp(optarg, "8x11-fast") || 0 == strcmp(optarg, "6x9-fast")) { - args.character_mode = CHARACTER_CHAR_FAST; + args.conversion_mode = CONVERSION_CHAR_FAST; } } break;