From b9100222a146b61badcde313d589d8688a3c88ef Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Wed, 17 Jul 2019 02:38:18 -0400 Subject: image_*(): New functions --- diff --git a/src/i18n.h b/src/i18n.h new file mode 100644 index 0000000..fbe5186 --- /dev/null +++ b/src/i18n.h @@ -0,0 +1,3 @@ +#include + +#define _(msgid) gettext(msgid) diff --git a/src/image.c b/src/image.c new file mode 100644 index 0000000..4cf7905 --- /dev/null +++ b/src/image.c @@ -0,0 +1,91 @@ +#include "image.h" + +#include +#include + +#include + +#include "i18n.h" + +#define BIT_DEPTH 4 +#define PALETTE_SIZE (1 << BIT_DEPTH) +#define PIXEL_SIZE ((BIT_DEPTH + 7) / 8) + +struct image { + png_structp png_ptr; + png_infop info_ptr; + png_bytepp rows; +}; + +static png_color palette[PALETTE_SIZE]; + +struct image * +image_new(const char *file_name) +{ + struct image *image; + FILE *fp; + size_t i; + size_t width = 32; + size_t height = 32; + + image = calloc(1, sizeof(*image)); + if (!image) { + return NULL; + } + + fp = fopen(file_name, "wb"); + if (!fp) { + printf(_("Error: Cannot open \"%s\" for writing\n"), file_name); + return image_destroy(&image); + } + + image->png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, + NULL, NULL, NULL); + if (!image->png_ptr) { + return image_destroy(&image); + } + + image->info_ptr = png_create_info_struct(image->png_ptr); + if (!image->info_ptr) { + return image_destroy(&image); + } + + png_init_io(image->png_ptr, fp); + + png_set_IHDR(image->png_ptr, image->info_ptr, width, height, + BIT_DEPTH, PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + png_set_PLTE(image->png_ptr, image->info_ptr, palette, PALETTE_SIZE); + + image->rows = png_malloc(image->png_ptr, height * sizeof(*image->rows)); + for (i = 0; i < height; ++i) { + image->rows[i] = png_malloc(image->png_ptr, width * PIXEL_SIZE); + } + png_set_rows(image->png_ptr, image->info_ptr, image->rows); + + return image; +} + +void +image_render(struct image *image) +{ + png_write_png(image->png_ptr, image->info_ptr, PNG_TRANSFORM_IDENTITY, + NULL); +} + +struct image * +image_destroy(struct image **image_p) +{ + struct image *image; + size_t i; + + image = *image_p; + + for (i = 0; i < 32; ++i) { + png_free(image->png_ptr, image->rows[i]); + } + png_free(image->png_ptr, image->rows); + png_destroy_write_struct(&image->png_ptr, &image->info_ptr); + free(image); + return image = NULL; +} diff --git a/src/image.h b/src/image.h new file mode 100644 index 0000000..5a61d10 --- /dev/null +++ b/src/image.h @@ -0,0 +1,15 @@ +#ifndef IMAGE_H +#define IMAGE_H + +struct image; + +struct image * +image_new(const char *file_name); + +void +image_render(struct image *image); + +struct image * +image_destroy(struct image **image); + +#endif /* IMAGE_H */ diff --git a/src/local.mk b/src/local.mk index 3ff4de7..f6a381d 100644 --- a/src/local.mk +++ b/src/local.mk @@ -1,2 +1,3 @@ -fbcon2png_SOURCES += +fbcon2png_SOURCES += \ + %reldir%/image.c \ %reldir%/main.c diff --git a/src/main.c b/src/main.c index e69de29..c7ae46d 100644 --- a/src/main.c +++ b/src/main.c @@ -0,0 +1,13 @@ +#include "image.h" + +int +main(int __attribute__((unused)) argc, char __attribute__((unused)) **argv) +{ + struct image *image; + + image = image_new("test.png"); + image_render(image); + image_destroy(&image); + + return 0; +} -- cgit v0.9.1