From d03f0ee04e8b2fe800bf66082c7afbbb45de9d09 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Fri, 15 Jul 2016 14:37:54 +0100 Subject: use the correct png type when reading header width and height --- frontends/framebuffer/convert_image.c | 330 ++++++++++++++++------------------ 1 file changed, 159 insertions(+), 171 deletions(-) (limited to 'frontends/framebuffer') diff --git a/frontends/framebuffer/convert_image.c b/frontends/framebuffer/convert_image.c index 838a90703..daa0ed256 100644 --- a/frontends/framebuffer/convert_image.c +++ b/frontends/framebuffer/convert_image.c @@ -56,176 +56,76 @@ static int raw_hot_x, raw_hot_y; #define B_AT(x,y) *(PPIX_AT(x,y) + B_OFF) #define A_AT(x,y) *(PPIX_AT(x,y) + A_OFF) -static void info_callback(png_structp png, png_infop info); -static void row_callback(png_structp png, png_bytep new_row, - png_uint_32 row_num, int pass); -static void end_callback(png_structp png, png_infop info); - - static void usage(void) { - fprintf(stderr, "usage: fb_convert_image input.png output.inc varname\n"); + fprintf(stderr, "usage: fb_convert_image input.png output.inc varname\n"); } -static void info_callback(png_structp png, png_infop info); -static void row_callback(png_structp png, png_bytep new_row, - png_uint_32 row_num, int pass); -static void end_callback(png_structp png, png_infop info); - static void detect_hotspot(void) { - int i; - int greenpixels = 0; - - for (i = 0; i < raw_width; ++i) { - if (A_AT(i, 0) == 255) { - if (G_AT(i, 0) == 255) { - greenpixels++; - raw_hot_x = i; - } - if ((B_AT(i, 0) != 0) || (R_AT(i, 0) != 0)) { - is_cursor = false; - return; - } - } else if (A_AT(i, 0) != 0) { - is_cursor = false; - return; - } - } - if (greenpixels != 1) { - is_cursor = false; - return; - } - - for (i = 0; i < raw_height; ++i) { - if (A_AT(0, i) == 255) { - if (G_AT(0, i) == 255) { - greenpixels++; - raw_hot_y = i; - } - if ((B_AT(0, i) != 0) || (R_AT(0, i) != 0)) { - is_cursor = false; - return; - } - } else if (A_AT(0, i) != 0) { - is_cursor = false; - return; - } - } - if (greenpixels != 2) { - is_cursor = false; - return; - } - printf(" Pointer detected. Adjusted hotspot at %d, %d (0-based)\n", - raw_hot_x - 1, raw_hot_y - 1); -} + int i; + int greenpixels = 0; -int -main(int argc, char **argv) -{ - FILE *f; - unsigned char buffer[1024]; - int br; - int x, y, c; - - if (argc != 4) { - usage(); - return 1; - } - - printf(" CONVERT: %s (%s)\n", argv[1], argv[3]); - - png = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); - info = png_create_info_struct(png); - - png_set_progressive_read_fn(png, NULL, info_callback, row_callback, end_callback); - - f = fopen(argv[1], "rb"); - if (f == NULL) { - printf(" Unable to open %s\n", argv[1]); - return 1; - } - - do { - br = fread(buffer, 1, 1024, f); - if (br > 0) { - png_process_data(png, info, buffer, br); - } - } while (br > 0); - - if (br < 0) { - printf("Error reading input: %s\n", strerror(errno)); - fclose(f); - return 1; - } - - fclose(f); - - detect_hotspot(); - - f = fopen(argv[2], "w"); - if (f == NULL) { - printf(" Unable to open %s\n", argv[2]); - return 2; - } - - fprintf(f, "/* This file is auto-generated from %s\n", argv[1]); - fprintf(f, " *\n * Do not edit this file directly.\n */\n\n"); - fprintf(f, "#include \n\n"); - fprintf(f, "#include \n\n"); - fprintf(f, "#include \n\n"); - fprintf(f, "#include \n\n"); - fprintf(f, "#include \"desktop/plot_style.h\"\n"); - fprintf(f, "#include \"framebuffer/gui.h\"\n"); - fprintf(f, "#include \"framebuffer/fbtk.h\"\n\n"); - - fprintf(f, "static uint8_t %s_pixdata[] = {\n", argv[3]); - for (y = 0; y < HEIGHT; ++y) { - unsigned char *rowptr = bitmap_data + (rowstride * y); - if (is_cursor) { - /* If it's a cursor, skip one row and one column */ - rowptr += rowstride + 4; - } - fprintf(f, "\t"); - for (x = 0; x < WIDTH; ++x) { - for (c = 0; c < 4; ++c) { - unsigned char b = *rowptr++; - fprintf(f, "0x%02x, ", b); - } - } - fprintf(f, "\n"); - } - fprintf(f, "};\n\n"); - - fprintf(f, "struct fbtk_bitmap %s = {\n", argv[3]); - fprintf(f, "\t.width\t\t= %d,\n", WIDTH); - fprintf(f, "\t.height\t\t= %d,\n", HEIGHT); - fprintf(f, "\t.hot_x\t\t= %d,\n", HOT_X); - fprintf(f, "\t.hot_y\t\t= %d,\n", HOT_Y); - fprintf(f, "\t.pixdata\t= %s_pixdata,\n", argv[3]); - - fprintf(f, "};\n\n"); - fclose(f); - - return 0; + for (i = 0; i < raw_width; ++i) { + if (A_AT(i, 0) == 255) { + if (G_AT(i, 0) == 255) { + greenpixels++; + raw_hot_x = i; + } + if ((B_AT(i, 0) != 0) || (R_AT(i, 0) != 0)) { + is_cursor = false; + return; + } + } else if (A_AT(i, 0) != 0) { + is_cursor = false; + return; + } + } + if (greenpixels != 1) { + is_cursor = false; + return; + } + + for (i = 0; i < raw_height; ++i) { + if (A_AT(0, i) == 255) { + if (G_AT(0, i) == 255) { + greenpixels++; + raw_hot_y = i; + } + if ((B_AT(0, i) != 0) || (R_AT(0, i) != 0)) { + is_cursor = false; + return; + } + } else if (A_AT(0, i) != 0) { + is_cursor = false; + return; + } + } + if (greenpixels != 2) { + is_cursor = false; + return; + } + printf(" Pointer detected. Adjusted hotspot at %d, %d (0-based)\n", + raw_hot_x - 1, raw_hot_y - 1); } + static void info_callback(png_structp png, png_infop info) { int bit_depth, color_type, interlace, intent; double gamma; - unsigned long width, height; - + png_uint_32 width, height; + /* Read the PNG details */ png_get_IHDR(png, info, &width, &height, &bit_depth, &color_type, &interlace, 0, 0); - - /* Set up our transformations */ + + /* Set up our transformations */ if (color_type == PNG_COLOR_TYPE_PALETTE) png_set_palette_to_rgb(png); if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) @@ -244,12 +144,12 @@ info_callback(png_structp png, png_infop info) * see http://www.w3.org/Graphics/PNG/all_seven.html for a test case */ if (png_get_sRGB(png, info, &intent)) - png_set_gamma(png, 2.2, 0.45455); + png_set_gamma(png, 2.2, 0.45455); else { - if (png_get_gAMA(png, info, &gamma)) - png_set_gamma(png, 2.2, gamma); - else - png_set_gamma(png, 2.2, 0.45455); + if (png_get_gAMA(png, info, &gamma)) + png_set_gamma(png, 2.2, gamma); + else + png_set_gamma(png, 2.2, 0.45455); } @@ -259,9 +159,9 @@ info_callback(png_structp png, png_infop info) interlace = (interlace == PNG_INTERLACE_ADAM7); raw_width = width; raw_height = height; - - rowstride = raw_width * 4; - bitmap_data = malloc(rowstride * raw_height); + + rowstride = raw_width * 4; + bitmap_data = malloc(rowstride * raw_height); } static unsigned int interlace_start[8] = {0, 16, 0, 8, 0, 4, 0}; @@ -271,33 +171,33 @@ static unsigned int interlace_row_step[8] = {8, 8, 8, 4, 4, 2, 2}; static void row_callback(png_structp png, png_bytep new_row, - png_uint_32 row_num, int pass) + png_uint_32 row_num, int pass) { unsigned long i, j; unsigned int start, step; - unsigned char *row = bitmap_data + (rowstride * row_num); - - if (new_row == 0) - return; - - if (interlace) { + unsigned char *row = bitmap_data + (rowstride * row_num); + + if (new_row == 0) + return; + + if (interlace) { start = interlace_start[pass]; - step = interlace_step[pass]; + step = interlace_step[pass]; row_num = interlace_row_start[pass] + - interlace_row_step[pass] * row_num; + interlace_row_step[pass] * row_num; /* Copy the data to our current row taking interlacing * into consideration */ - row = bitmap_data + (rowstride * row_num); + row = bitmap_data + (rowstride * row_num); for (j = 0, i = start; i < rowbytes; i += step) { row[i++] = new_row[j++]; row[i++] = new_row[j++]; row[i++] = new_row[j++]; row[i++] = new_row[j++]; } - } else { - memcpy(row, new_row, rowbytes); - } + } else { + memcpy(row, new_row, rowbytes); + } } static void @@ -306,10 +206,98 @@ end_callback(png_structp png, png_infop info) } +int +main(int argc, char **argv) +{ + FILE *f; + unsigned char buffer[1024]; + int br; + int x, y, c; + + if (argc != 4) { + usage(); + return 1; + } + + printf(" CONVERT: %s (%s)\n", argv[1], argv[3]); + + png = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); + info = png_create_info_struct(png); + + png_set_progressive_read_fn(png, NULL, info_callback, row_callback, end_callback); + + f = fopen(argv[1], "rb"); + if (f == NULL) { + printf(" Unable to open %s\n", argv[1]); + return 1; + } + + do { + br = fread(buffer, 1, 1024, f); + if (br > 0) { + png_process_data(png, info, buffer, br); + } + } while (br > 0); + + if (br < 0) { + printf("Error reading input: %s\n", strerror(errno)); + fclose(f); + return 1; + } + + fclose(f); + + detect_hotspot(); + + f = fopen(argv[2], "w"); + if (f == NULL) { + printf(" Unable to open %s\n", argv[2]); + return 2; + } + + fprintf(f, "/* This file is auto-generated from %s\n", argv[1]); + fprintf(f, " *\n * Do not edit this file directly.\n */\n\n"); + fprintf(f, "#include \n\n"); + fprintf(f, "#include \n\n"); + fprintf(f, "#include \n\n"); + fprintf(f, "#include \n\n"); + fprintf(f, "#include \"desktop/plot_style.h\"\n"); + fprintf(f, "#include \"framebuffer/gui.h\"\n"); + fprintf(f, "#include \"framebuffer/fbtk.h\"\n\n"); + + fprintf(f, "static uint8_t %s_pixdata[] = {\n", argv[3]); + for (y = 0; y < HEIGHT; ++y) { + unsigned char *rowptr = bitmap_data + (rowstride * y); + if (is_cursor) { + /* If it's a cursor, skip one row and one column */ + rowptr += rowstride + 4; + } + fprintf(f, "\t"); + for (x = 0; x < WIDTH; ++x) { + for (c = 0; c < 4; ++c) { + unsigned char b = *rowptr++; + fprintf(f, "0x%02x, ", b); + } + } + fprintf(f, "\n"); + } + fprintf(f, "};\n\n"); + + fprintf(f, "struct fbtk_bitmap %s = {\n", argv[3]); + fprintf(f, "\t.width\t\t= %d,\n", WIDTH); + fprintf(f, "\t.height\t\t= %d,\n", HEIGHT); + fprintf(f, "\t.hot_x\t\t= %d,\n", HOT_X); + fprintf(f, "\t.hot_y\t\t= %d,\n", HOT_Y); + fprintf(f, "\t.pixdata\t= %s_pixdata,\n", argv[3]); + + fprintf(f, "};\n\n"); + fclose(f); + + return 0; +} /* * Local Variables: * c-basic-offset:8 * End: */ - -- cgit v1.2.3