From 4627f895d1f266b2c0a18c952a1eb703e59aeeb9 Mon Sep 17 00:00:00 2001 From: Kevin Chabowski Date: Sun, 4 Aug 2013 23:56:50 +0200 Subject: Formatted code --- bmp.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'bmp.c') diff --git a/bmp.c b/bmp.c index 5ca1594..246b5d3 100644 --- a/bmp.c +++ b/bmp.c @@ -22,59 +22,59 @@ static const char* header_template = "BM \0\0\0\0\x36\0\0\0\x28\0\0\0 static int bmp_write_header(bmp_write_handle_t* bmph) { - char* header; + char* header; uint32_t filesize; - int32_t height; - + int32_t height; + if(!(header = malloc(HEADERSIZE))) { fputs("Could not allocate memory for BMP header.\n", stderr); return 0; } - + filesize = HEADERSIZE + (bmph->width * BYTES_PER_PIXEL + bmph->line_padding) * bmph->height; - height = -(bmph->height); - + height = -(bmph->height); + memcpy(header, header_template, HEADERSIZE); memcpy(header + OFFSET_bfSize, &filesize, 4); memcpy(header + OFFSET_biWidth, &(bmph->width), 4); memcpy(header + OFFSET_biHeight, &height, 4); - + if(fwrite(header, HEADERSIZE, 1, bmph->fh) != 1) { fprintf(stderr, "Could not write BMP header: %s\n", strerror(errno)); free(header); return 0; } - + free(header); return 1; } bmp_write_handle_t* bmp_create(const char* fn, int32_t width, int32_t height) { - FILE* fh = NULL; + FILE* fh = NULL; bmp_write_handle_t* rv; - + if(!(fh = fopen(fn, "wb"))) { return NULL; } - + if(!(rv = malloc(sizeof(bmp_write_handle_t)))) { fclose(fh); return NULL; } - - rv->fh = fh; - rv->width = width; - rv->height = height; - rv->line_left = width; + + rv->fh = fh; + rv->width = width; + rv->height = height; + rv->line_left = width; rv->line_padding = bmp_calc_padding(width); - + if(!bmp_write_header(rv)) { fclose(fh); free(rv); return NULL; } - + return rv; } @@ -86,19 +86,19 @@ bmp_write_pixel(bmp_write_handle_t* bmph, color_t col) { pixel[0] = col.b; pixel[1] = col.g; pixel[2] = col.r; - + if(fwrite(pixel, 3, 1, bmph->fh) != 1) { return 0; } - + if(bmph->line_padding != 0) { if(--(bmph->line_left) == 0) { bmph->line_left = bmph->width; - + return (fwrite(padding, bmph->line_padding, 1, bmph->fh) == 1); } } - + return 1; } @@ -107,6 +107,6 @@ bmp_destroy(bmp_write_handle_t* bmph) { if(bmph->fh) { fclose(bmph->fh); } - + free(bmph); } -- cgit v1.2.3-54-g00ecf