diff --git a/bin/main.c b/bin/main.c index 6b2d419..b08a080 100644 --- a/bin/main.c +++ b/bin/main.c @@ -6,7 +6,6 @@ #include "pnglite.h" #include -#include static void usage(int argc, char **argv, const char *message, ...) { if (message) { @@ -18,16 +17,19 @@ static void usage(int argc, char **argv, const char *message, ...) { fprintf(stderr, "\n"); } - fprintf(stderr, "usage: %s file.sav photo1..30 photo.png\n", argv[0]); + fprintf(stderr, "usage: %1$s import file.sav photo1..30 input.png\n" + " %1$s export file.sav photo1..30 output.png\n" + " %1$s dither input.png output.png\n", + argv[0]); exit(1); } -static inline uint8_t *buf_malloc(png_t *png) { - return malloc(4 * png->width * png->height); +static inline uint8_t *buf_malloc(size_t width, size_t height, int stride) { + return malloc(stride * width * height); } -int main(int argc, char **argv) { +static int import(int argc, char **argv) { cammy_sram *sram; png_t *png; int photo = 0; @@ -35,23 +37,23 @@ int main(int argc, char **argv) { int error; - if (argc < 2) { + if (argc < 3) { usage(argc, argv, "No save file provided"); - } else if (argc < 3) { - usage(argc, argv, "No photo number provided"); } else if (argc < 4) { + usage(argc, argv, "No photo number provided"); + } else if (argc < 5) { usage(argc, argv, "No photo provided"); } - photo = atoi(argv[2]); + photo = atoi(argv[3]); if (photo < 1 || photo > CAMMY_SRAM_PHOTO_COUNT) { usage(argc, argv, "Invalid photo number"); } - if ((sram = cammy_sram_open(argv[1])) == NULL) { + if ((sram = cammy_sram_open(argv[2])) == NULL) { fprintf(stderr, "%s: %s: %s: %s\n", - argv[0], "cammy_sram_open()", argv[1], strerror(errno)); + argv[0], "cammy_sram_open()", argv[2], strerror(errno)); goto error_sram_open; } @@ -62,9 +64,9 @@ int main(int argc, char **argv) { goto error_malloc_png; } - if ((error = png_open_file_read(png, argv[3])) < 0) { + if ((error = png_open_file_read(png, argv[4])) < 0) { fprintf(stderr, "%s: %s: %s: %s\n", - argv[0], "png_open_file_read()", argv[3], png_error_string(error)); + argv[0], "png_open_file_read()", argv[4], png_error_string(error)); goto error_png_open_file_read; } @@ -72,12 +74,12 @@ int main(int argc, char **argv) { if (png->width != CAMMY_PHOTO_WIDTH || png->height != CAMMY_PHOTO_HEIGHT) { fprintf(stderr, "%s: %s: %s\n", - argv[0], argv[3], "Invalid image dimensions"); + argv[0], argv[4], "Invalid image dimensions"); goto error_invalid_dimensions; } - if ((buf = buf_malloc(png)) == NULL) { + if ((buf = buf_malloc(png->width, png->height, (int)png->bpp)) == NULL) { fprintf(stderr, "%s: %s: %s\n", argv[0], "malloc()", strerror(errno)); @@ -86,7 +88,7 @@ int main(int argc, char **argv) { if ((error = png_get_data(png, buf)) < 0) { fprintf(stderr, "%s: %s: %s: %s\n", - argv[0], "png_get_data()", argv[3], png_error_string(error)); + argv[0], "png_get_data()", argv[4], png_error_string(error)); goto error_png_get_data; } @@ -119,3 +121,218 @@ error_malloc_png: error_sram_open: return 1; } + +static int export(int argc, char **argv) { + cammy_sram *sram; + png_t *png; + int photo = 0; + uint8_t *buf; + + int error; + + if (argc < 3) { + usage(argc, argv, "No save file provided"); + } else if (argc < 4) { + usage(argc, argv, "No photo number provided"); + } else if (argc < 5) { + usage(argc, argv, "No output filename provided"); + } + + photo = atoi(argv[3]); + + if (photo < 1 || photo > CAMMY_SRAM_PHOTO_COUNT) { + usage(argc, argv, "Invalid photo number"); + } + + if ((sram = cammy_sram_open(argv[2])) == NULL) { + fprintf(stderr, "%s: %s: %s: %s\n", + argv[0], "cammy_sram_open()", argv[2], strerror(errno)); + + goto error_sram_open; + } + + png_init(malloc, free); + + if ((png = malloc(sizeof(*png))) == NULL) { + goto error_malloc_png; + } + + if ((error = png_open_file_write(png, argv[4])) < 0) { + fprintf(stderr, "%s: %s: %s: %s\n", + argv[0], "png_open_file_write()", argv[4], png_error_string(error)); + + goto error_png_open_file_write; + } + + if ((buf = buf_malloc(CAMMY_PHOTO_WIDTH, CAMMY_PHOTO_HEIGHT, 3)) == NULL) { + fprintf(stderr, "%s: %s: %s\n", + argv[0], "malloc()", strerror(errno)); + + goto error_buf_malloc; + } + + cammy_photo_export(&sram->data->photos[photo-1], buf, 3); + + if ((error = png_set_data(png, CAMMY_PHOTO_WIDTH, CAMMY_PHOTO_HEIGHT, 8, PNG_TRUECOLOR, buf)) < 0) { + fprintf(stderr, "%s: %s: %s: %s\n", + argv[0], "png_set_data()", argv[4], png_error_string(error)); + + goto error_png_set_data; + } + + png_close_file(png); + + free(buf); + + free(png); + + cammy_sram_close(sram); + + return 0; + +error_png_set_data: + free(buf); + +error_buf_malloc: + png_close_file(png); + +error_png_open_file_write: + free(png); + +error_malloc_png: + cammy_sram_close(sram); + +error_sram_open: + return 1; +} + +static int dither(int argc, char **argv) { + png_t *in, *out; + uint8_t *bufin, *bufout; + + int error; + + if (argc < 3) { + usage(argc, argv, "No PNG input file provided"); + } else if (argc < 4) { + usage(argc, argv, "No PNG output filename provided"); + } + + png_init(malloc, free); + + if ((in = malloc(sizeof(*in))) == NULL) { + goto error_malloc_in; + } + + if ((out = malloc(sizeof(*in))) == NULL) { + goto error_malloc_out; + } + + if ((error = png_open_file_read(in, argv[2])) < 0) { + fprintf(stderr, "%s: %s: %s: %s\n", + argv[0], "png_open_file_read()", argv[2], png_error_string(error)); + + goto error_png_open_file_read; + } + + if ((error = png_open_file_write(out, argv[3])) < 0) { + fprintf(stderr, "%s: %s: %s: %s\n", + argv[0], "png_open_file_write()", argv[3], png_error_string(error)); + + goto error_png_open_file_write; + } + + if ((bufin = buf_malloc(in->width, in->height, (int)in->bpp)) == NULL) { + fprintf(stderr, "%s: %s: %s\n", + argv[0], "malloc()", strerror(errno)); + + goto error_buf_malloc_bufin; + } + + if ((bufout = buf_malloc(in->width, in->height, (int)in->bpp)) == NULL) { + fprintf(stderr, "%s: %s: %s\n", + argv[0], "malloc()", strerror(errno)); + + goto error_buf_malloc_bufout; + } + + if ((error = png_get_data(in, bufin)) < 0) { + fprintf(stderr, "%s: %s: %s: %s\n", + argv[0], "png_get_data()", argv[2], png_error_string(error)); + + goto error_png_get_data; + } + + cammy_photo_dither(bufout, bufin, in->width, in->height, in->bpp); + + if ((error = png_set_data(out, in->width, in->height, in->depth, in->color_type, bufout)) < 0) { + fprintf(stderr, "%s: %s: %s: %s\n", + argv[0], "png_set_data()", argv[4], png_error_string(error)); + + goto error_png_set_data; + } + + png_close_file(out); + + png_close_file(in); + + free(bufout); + + free(bufin); + + free(out); + + free(in); + + return 0; + +error_png_set_data: +error_png_get_data: + free(bufout); + +error_buf_malloc_bufout: + free(bufin); + +error_buf_malloc_bufin: + png_close_file(out); + +error_png_open_file_write: + png_close_file(in); + +error_png_open_file_read: + free(out); + +error_malloc_out: + free(in); + +error_malloc_in: + return 1; +} + +static struct { + char *name; + int (*fun)(int, char **); +} commands[] = { + { "import", import }, + { "export", export }, + { "dither", dither }, + { NULL, NULL } +}; + +int main(int argc, char **argv) { + int i; + + if (argc < 2) { + usage(argc, argv, "No command specified"); + } + + for (i=0; commands[i].name; i++) { + if (strcmp(argv[1], commands[i].name) == 0) { + return commands[i].fun(argc, argv); + } + } + + usage(argc, argv, "Unknown command '%s'", argv[1]); + + return 0; +} diff --git a/src/photo.c b/src/photo.c index 827f09c..ca6498d 100644 --- a/src/photo.c +++ b/src/photo.c @@ -86,8 +86,7 @@ static uint8_t rgb_to_tile_2bpp(uint8_t r, uint8_t g, uint8_t b, size_t x, size_ uint8_t from = (slot & 0x03000000) >> 24; uint8_t to = (slot & 0x00030000) >> 16; - return (slot & (0x8000 >> ((y & 3) << 2) >> (x & 3)))? - to ^ 3: from ^ 3; + return (slot & (0x8000 >> ((y & 3) << 2) >> (x & 3)))? to: from; } static inline uint8_t tile_read(cammy_photo *photo, size_t x, size_t y) { @@ -155,7 +154,7 @@ void cammy_photo_import(cammy_photo *dest, uint8_t *src, int stride) { buf_read(src, x, y, CAMMY_PHOTO_WIDTH, &r, &g, &b, stride); - tile_write(dest, x, y, rgb_to_tile_2bpp(r, g, b, x, y)); + tile_write(dest, x, y, rgb_to_tile_2bpp(r, g, b, x, y) ^ 3); } } }