From 39f271589fb9db3d6a383857817b13a9bb59d981 Mon Sep 17 00:00:00 2001 From: Miguel Date: Mon, 15 Oct 2018 23:06:47 +0200 Subject: ported zlib and libpng and improved compositor to handle 32 AND 24 bit depth --- userspace/pain/Makefile | 6 ++ userspace/pain/pain1.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+) create mode 100644 userspace/pain/Makefile create mode 100644 userspace/pain/pain1.c (limited to 'userspace/pain') diff --git a/userspace/pain/Makefile b/userspace/pain/Makefile new file mode 100644 index 0000000..bfa31c8 --- /dev/null +++ b/userspace/pain/Makefile @@ -0,0 +1,6 @@ +CC=i686-foolos-gcc + +pain1 : pain1.c + i686-foolos-gcc pain1.c -lpng -lz -o pain1 +clean: + -rm pain1 diff --git a/userspace/pain/pain1.c b/userspace/pain/pain1.c new file mode 100644 index 0000000..a3fb03a --- /dev/null +++ b/userspace/pain/pain1.c @@ -0,0 +1,200 @@ +// http://zarb.org/~gc/html/libpng.html + +#include "../put_pixel.h" + +#include +#include + +#define dimx 640 +#define dimy 480 + +/* + * Copyright 2002-2010 Guillaume Cottenceau. + * + * This software may be freely redistributed under the terms + * of the X11 license. + * + */ + +#include +#include +#include +#include +#include + +#define PNG_DEBUG 3 +#include + +void abort_(const char * s, ...) +{ + va_list args; + va_start(args, s); + vfprintf(stderr, s, args); + fprintf(stderr, "\n"); + va_end(args); + abort(); +} + +int x, y; + +int width, height; +png_byte color_type; +png_byte bit_depth; + +png_structp png_ptr; +png_infop info_ptr; +int number_of_passes; +png_bytep * row_pointers; + +void read_png_file(char* file_name) +{ + char header[8]; // 8 is the maximum size that can be checked + + /* open file and test for it being a png */ + FILE *fp = fopen(file_name, "rb"); + if (!fp) + abort_("[read_png_file] File %s could not be opened for reading", file_name); + fread(header, 1, 8, fp); + if (png_sig_cmp(header, 0, 8)) + abort_("[read_png_file] File %s is not recognized as a PNG file", file_name); + + + /* initialize stuff */ + png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + + if (!png_ptr) + abort_("[read_png_file] png_create_read_struct failed"); + + info_ptr = png_create_info_struct(png_ptr); + if (!info_ptr) + abort_("[read_png_file] png_create_info_struct failed"); + + if (setjmp(png_jmpbuf(png_ptr))) + abort_("[read_png_file] Error during init_io"); + + png_init_io(png_ptr, fp); + png_set_sig_bytes(png_ptr, 8); + + png_read_info(png_ptr, info_ptr); + + width = png_get_image_width(png_ptr, info_ptr); + height = png_get_image_height(png_ptr, info_ptr); + color_type = png_get_color_type(png_ptr, info_ptr); + bit_depth = png_get_bit_depth(png_ptr, info_ptr); + + number_of_passes = png_set_interlace_handling(png_ptr); + png_read_update_info(png_ptr, info_ptr); + + + /* read file */ + if (setjmp(png_jmpbuf(png_ptr))) + abort_("[read_png_file] Error during read_image"); + + row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * height); + for (y=0; y"); + + _gui_win(); + read_png_file(argv[1]); + process_file(); + _gui_rect(); + while(1); +// write_png_file(argv[2]); + + return 0; +} -- cgit v1.2.3