- Gfxprim - ucw.cz

[repo.or.cz] gfxprim.git branch master updated: 97369ab9d2fc879e4d491f7f0813db4fa191b5e8
by metan 14 Jan '12

14 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 97369ab9d2fc879e4d491f7f0813db4fa191b5e8 (commit) from b02edef9bfce2083f3692ffccd6a3acd750b79da (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/97369ab9d2fc879e4d491f7f0813db4fa191… commit 97369ab9d2fc879e4d491f7f0813db4fa191b5e8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Jan 14 18:53:47 2012 +0100 core: Fix GP_Counter warnings. diff --git a/include/core/GP_Counter.h b/include/core/GP_Counter.h index f9e501e..21eaccf 100644 --- a/include/core/GP_Counter.h +++ b/include/core/GP_Counter.h @@ -17,11 +17,12 @@ * Boston, MA 02110-1301 USA * * * * Copyright (C) 2011 Tomas Gavenciak <gavento(a)ucw.cz> * + * Copyright (C) 2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ -#ifndef GP_COUNTER_H -#define GP_COUNTER_H +#ifndef CORE_GP_COUNTER_H +#define CORE_GP_COUNTER_H /* * Simple global named 64-bit counters. @@ -32,14 +33,12 @@ * If GP_IMPLEMENT_COUNTERS is undefined, all operations are NOP and * no memory is allocated. */ - #define GP_IMPLEMENT_COUNTERS /* * Maximum length of counter name, * maximum number of counters (~40 bytes each) */ - #define GP_COUNTER_NAME_LEN 24 #define GP_COUNTER_MAX 256 @@ -47,19 +46,18 @@ * Basic types. * Only use GP_Counter in your programs. */ - typedef int64_t GP_Counter_t; typedef GP_Counter_t *GP_Counter; /* * Increase a counter by 1. */ - static inline void GP_IncCounter(GP_Counter counter) { #ifdef GP_IMPLEMENT_COUNTERS - if (!counter) return; - (*counter) ++; + if (!counter) + return; + (*counter)++; #endif /* GP_IMPLEMENT_COUNTERS */ } @@ -67,11 +65,11 @@ static inline void GP_IncCounter(GP_Counter counter) * Increase a counter by delta (may be negative). * No checks for underflow. */ - static inline void GP_AddCounter(GP_Counter counter, GP_Counter_t delta) { #ifdef GP_IMPLEMENT_COUNTERS - if (!counter) return; + if (!counter) + return; (*counter) += delta; #endif /* GP_IMPLEMENT_COUNTERS */ } @@ -79,11 +77,11 @@ static inline void GP_AddCounter(GP_Counter counter, GP_Counter_t delta) /* * Set counter to given value. */ - static inline void GP_SetCounter(GP_Counter counter, GP_Counter_t value) { #ifdef GP_IMPLEMENT_COUNTERS - if (!counter) return; + if (!counter) + return; (*counter) = value; #endif /* GP_IMPLEMENT_COUNTERS */ } @@ -91,11 +89,11 @@ static inline void GP_SetCounter(GP_Counter counter, GP_Counter_t value) /* * Return counter value */ - -inline GP_Counter_t GP_CounterVal(GP_Counter counter) +static inline GP_Counter_t GP_CounterVal(GP_Counter counter) { #ifdef GP_IMPLEMENT_COUNTERS - if (!counter) return 0; + if (!counter) + return 0; return *counter; #else /* GP_IMPLEMENT_COUNTERS */ return 0; @@ -106,9 +104,8 @@ inline GP_Counter_t GP_CounterVal(GP_Counter counter) * Pretty-printing of all counters and their values to f * Includes info about counter-list overflow */ - -struct FILE; -void GP_PrintCounters(struct FILE *f); +#include <stdio.h> +void GP_PrintCounters(FILE *f); /* * Lookup a counter by name, possibly creating a new one. @@ -119,7 +116,6 @@ void GP_PrintCounters(struct FILE *f); * NOTE: Current implementation has very slow adds (O(current_counters)), * but the lookup is reasonably fast (bisection) */ - GP_Counter GP_GetCounter(const char *name); -#endif /* GP_COUNTER_H */ +#endif /* CORE_GP_COUNTER_H */ diff --git a/libs/core/GP_Counter.c b/libs/core/GP_Counter.c index a7809d3..7ba619e 100644 --- a/libs/core/GP_Counter.c +++ b/libs/core/GP_Counter.c @@ -17,28 +17,25 @@ * Boston, MA 02110-1301 USA * * * * Copyright (C) 2011 Tomas Gavenciak <gavento(a)ucw.cz> * + * Copyright (C) 2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ #include <string.h> -#include <stdio.h> #include "GP_Common.h" #include "GP_Counter.h" /* * Internal struct used in counter list */ - struct GP_CounterRecord { char name[GP_COUNTER_NAME_LEN]; GP_Counter counter; }; - /* * variables local to module (static) */ - #ifdef GP_IMPLEMENT_COUNTERS static GP_Counter_t GP_counters[GP_COUNTER_MAX]; @@ -48,19 +45,20 @@ static GP_Counter_t GP_counter_list_overflow = 0; #endif /* GP_IMPLEMENT_COUNTERS */ -void GP_PrintCounters(struct FILE *f) +void GP_PrintCounters(FILE *f) { #ifdef GP_IMPLEMENT_COUNTERS int i; GP_CHECK(f != NULL); if (GP_used_counters == 0) - fprintf((FILE *) f, "[ no counters defined ]n"); + fprintf(f, "[ no counters defined ]n"); for (i = 0; i < GP_used_counters; i++) - fprintf((FILE *) f, "%*s : %lldn", -GP_COUNTER_NAME_LEN, - GP_counter_list[i].name, *(GP_counter_list[i].counter)); + fprintf(f, "%*s : %llun", -GP_COUNTER_NAME_LEN, + GP_counter_list[i].name, + (long long unsigned int)*(GP_counter_list[i].counter)); if (GP_counter_list_overflow > 0) - fprintf((FILE *) f, "[ unable to allocate new counter %lld times ]n", - GP_counter_list_overflow); + fprintf(f, "[ unable to allocate new counter %llu times ]n", + (long long unsigned int)GP_counter_list_overflow); #endif /* GP_IMPLEMENT_COUNTERS */ } @@ -73,9 +71,11 @@ GP_Counter GP_GetCounter(const char *name) GP_CHECK(name != NULL); GP_CHECK(strlen(name) + 1 <= GP_COUNTER_NAME_LEN); - /* Bisect GP_counter_list to find either the counter or a place for it - * interval [l, r) (not incl. r) */ - while(r > l) { + /* + * Bisect GP_counter_list to find either the counter or a place for it + * interval [l, r) (not incl. r) + */ + while (r > l) { int med = (r + l) / 2; /* Here never equal to r, might be l */ int cmp = strcmp(GP_counter_list[med].name, name); if (cmp == 0) @@ -91,7 +91,7 @@ GP_Counter GP_GetCounter(const char *name) /* Add a new counter */ if (GP_used_counters >= GP_COUNTER_MAX) { - GP_counter_list_overflow ++; + GP_counter_list_overflow++; return NULL; } @@ -101,7 +101,7 @@ GP_Counter GP_GetCounter(const char *name) strcpy(GP_counter_list[l].name, name); GP_counter_list[l].counter = GP_counters + GP_used_counters; - GP_used_counters ++; + GP_used_counters++; return GP_counter_list[l].counter; #else /* GP_IMPLEMENT_COUNTERS */ return NULL; ----------------------------------------------------------------------- Summary of changes: include/core/GP_Counter.h | 36 ++++++++++++++++-------------------- libs/core/GP_Counter.c | 30 +++++++++++++++--------------- 2 files changed, 31 insertions(+), 35 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: b02edef9bfce2083f3692ffccd6a3acd750b79da
by metan 14 Jan '12

14 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via b02edef9bfce2083f3692ffccd6a3acd750b79da (commit) from 4134b186f31ff445db42c9ef938b05abe240d689 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/b02edef9bfce2083f3692ffccd6a3acd750b… commit b02edef9bfce2083f3692ffccd6a3acd750b79da Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Jan 14 17:03:06 2012 +0100 loaders: Add support for OS/2 header type. diff --git a/libs/loaders/GP_BMP.c b/libs/loaders/GP_BMP.c index b737b71..97b1b0b 100644 --- a/libs/loaders/GP_BMP.c +++ b/libs/loaders/GP_BMP.c @@ -41,9 +41,7 @@ #include "core/GP_GetPutPixel.h" #include "GP_BMP.h" -#define BMP_HEADER_OFFSET 0x0e /* info header offset */ -#define BMP_PIXELS_OFFSET_OFFSET 0x0a /* offset to offset to pixel data */ -#define BMP_PALETTE_OFFSET 54 /* offset to the palette */ +#define BMP_HEADER_OFFSET 0x0a /* info header offset - 4 bytes */ #define BUF_TO_4(buf, off) (buf[off] + (buf[off+1]<<8) + (buf[off+2]<<16) + (buf[off+3]<<24)) @@ -53,11 +51,23 @@ struct bitmap_info_header { - int32_t w; + /* + * Offset to image data. + */ + uint32_t pixel_offset; + + /* + * Header size (palette is on offset header_size + 14) + */ + uint32_t header_size; + /* - * If negative imge is top-down (bottom-up is default) + * Image size in pixels. + * If h is negative image is top-down (bottom-up is default) */ + int32_t w; int32_t h; + uint16_t bpp; uint32_t compress_type; /* @@ -105,7 +115,7 @@ enum bitmap_info_header_sizes { BITMAPINFOHEADER5 = 124, /* adds ICC color profiles win 98+ */ }; -static const char *bitmap_info_header_size_name(uint32_t size) +static const char *bitmap_header_size_name(uint32_t size) { switch (size) { case BITMAPCOREHEADER: @@ -139,28 +149,92 @@ static uint32_t get_palette_size(struct bitmap_info_header *header) static GP_RetCode read_bitmap_info_header(FILE *f, struct bitmap_info_header *header) { + uint8_t buf[36]; + + if (fread(buf, 1, sizeof(buf), f) != sizeof(buf)) { + GP_DEBUG(1, "Failed to read bitmap info header"); + return GP_EBADFILE; + } + + header->w = BUF_TO_4(buf, 0); + header->h = BUF_TO_4(buf, 4); + header->bpp = BUF_TO_2(buf, 10); + header->compress_type = BUF_TO_4(buf, 12); + header->palette_colors = BUF_TO_4(buf, 28); + + uint16_t nr_planes = BUF_TO_2(buf, 8); + + /* This must be 1 according to specs */ + if (nr_planes != 1) + GP_DEBUG(1, "Number of planes is %"PRId16" should be 1", + nr_planes); + + GP_DEBUG(2, "Have BMP bitmap size %"PRId32"x%"PRId32" %"PRIu16" " + "bpp, %"PRIu32" pallete colors, '%s' compression", + header->w, header->h, header->bpp, + get_palette_size(header), + bitmap_compress_name(header->compress_type)); + + return GP_ESUCCESS; +} + +static GP_RetCode read_bitmap_core_header(FILE *f, + struct bitmap_info_header *header) +{ + uint8_t buf[12]; + + if (fread(buf, 1, sizeof(buf), f) != sizeof(buf)) { + GP_DEBUG(1, "Failed to read bitmap core header"); + return GP_EBADFILE; + } + + header->w = BUF_TO_2(buf, 0); + header->h = BUF_TO_2(buf, 2); + header->bpp = BUF_TO_2(buf, 6); + header->compress_type = COMPRESS_RGB; + header->palette_colors = 0; + + uint16_t nr_planes = BUF_TO_2(buf, 4); + + /* This must be 1 according to specs */ + if (nr_planes != 1) + GP_DEBUG(1, "Number of planes is %"PRId16" should be 1", + nr_planes); + + GP_DEBUG(2, "Have BMP bitmap size %"PRId32"x%"PRId32" %"PRIu16" bpp", + header->h, header->w, header->bpp); + + return GP_ESUCCESS; +} + +static GP_RetCode read_bitmap_header(FILE *f, + struct bitmap_info_header *header) +{ + uint8_t buf[8]; + GP_RetCode ret; + if (fseek(f, BMP_HEADER_OFFSET, SEEK_SET)) { GP_DEBUG(1, "fseek(f, 0x%02x) failed: '%s'", BMP_HEADER_OFFSET, strerror(errno)); return GP_EBADFILE; } - - char buf[32]; - uint32_t header_size; /* Read info header size, header size determines header type */ - if (fread(buf, 1, 4, f) != 4) { + if (fread(buf, 1, sizeof(buf), f) != sizeof(buf)) { GP_DEBUG(1, "Failed to read info header size"); return GP_EBADFILE; } - header_size = BUF_TO_4(buf, 0); + header->pixel_offset = BUF_TO_4(buf, 0); + header->header_size = BUF_TO_4(buf, 4); GP_DEBUG(2, "BMP header type '%s'", - bitmap_info_header_size_name(header_size)); + bitmap_header_size_name(header->header_size)); - switch (header_size) { + switch (header->header_size) { case BITMAPCOREHEADER: + ret = read_bitmap_core_header(f, header); + break; case BITMAPCOREHEADER2: return GP_ENOIMPL; /* The bitmap core header only adds filelds to the end of the header */ @@ -168,38 +242,15 @@ static GP_RetCode read_bitmap_info_header(FILE *f, case BITMAPINFOHEADER2: case BITMAPINFOHEADER3: case BITMAPINFOHEADER4: + ret = read_bitmap_info_header(f, header); break; default: GP_DEBUG(1, "Unknown header type, continuing anyway"); + ret = read_bitmap_info_header(f, header); break; }; - - if (fread(buf, 1, sizeof(buf), f) != sizeof(buf)) { - GP_DEBUG(1, "Failed to read bitmap info header"); - return 1; - } - - header->w = BUF_TO_4(buf, 0); - header->h = BUF_TO_4(buf, 4); - header->bpp = BUF_TO_2(buf, 10); - header->compress_type = BUF_TO_4(buf, 12); - header->palette_colors = BUF_TO_4(buf, 28); - - uint16_t nr_planes = BUF_TO_2(buf, 8); - - /* This must be 1 according to specs */ - if (nr_planes != 1) - GP_DEBUG(1, "Number of planes is %"PRId16" should be 1", - nr_planes); - - - GP_DEBUG(2, "Have BMP bitmap size %"PRId32"x%"PRId32" %"PRIu16" " - "bpp, %"PRIu32" pallete colors, '%s' compression", - header->w, header->h, header->bpp, - get_palette_size(header), - bitmap_compress_name(header->compress_type)); - - return 0; + + return ret; } /* @@ -210,8 +261,23 @@ GP_RetCode read_bitmap_palette(FILE *f, struct bitmap_info_header *header, { uint32_t i; uint32_t palette_colors = get_palette_size(header); + uint32_t palette_offset = header->header_size + 14; + uint8_t pixel_size; + + switch (header->header_size) { + case BITMAPCOREHEADER: + pixel_size = 3; + break; + default: + pixel_size = 4; + break; + } - if (fseek(f, BMP_PALETTE_OFFSET, SEEK_SET)) { + GP_DEBUG(2, "Offset to BMP palette is 0x%x (%ubytes) " + "pixel size %"PRIu8"bytes", + palette_offset, palette_offset, pixel_size); + + if (fseek(f, palette_offset, SEEK_SET)) { GP_DEBUG(1, "fseek(f, 0x%02x) failed: '%s'", BMP_HEADER_OFFSET, strerror(errno)); return GP_EBADFILE; @@ -220,7 +286,7 @@ GP_RetCode read_bitmap_palette(FILE *f, struct bitmap_info_header *header, for (i = 0; i < palette_colors; i++) { uint8_t buf[4]; - if (fread(buf, 1, 4, f) != 4) { + if (fread(buf, 1, pixel_size, f) != pixel_size) { GP_DEBUG(1, "Failed to read palette %"PRIu32, i); return GP_EBADFILE; } @@ -236,31 +302,15 @@ GP_RetCode read_bitmap_palette(FILE *f, struct bitmap_info_header *header, return GP_ESUCCESS; } -GP_RetCode seek_pixels_offset(FILE *f) +GP_RetCode seek_pixels_offset(struct bitmap_info_header *header, + FILE *f) { - uint32_t offset; - - if (fseek(f, BMP_PIXELS_OFFSET_OFFSET, SEEK_SET)) { - GP_DEBUG(1, "fseek(f, 0x%02x) failed: '%s'", - BMP_HEADER_OFFSET, strerror(errno)); - return GP_EBADFILE; - } - - uint8_t buf[4]; - - if (fread(buf, 1, 4, f) != 4) { - GP_DEBUG(1, "Failed to read pixel offset size"); - return GP_EBADFILE; - } - - offset = BUF_TO_4(buf, 0); - GP_DEBUG(2, "Offset to BMP pixels is 0x%x (%ubytes)", - offset, offset); + header->pixel_offset, header->pixel_offset); - if (fseek(f, offset, SEEK_SET)) { + if (fseek(f, header->pixel_offset, SEEK_SET)) { GP_DEBUG(1, "fseek(f, 0x%02x) failed: '%s'", - offset, strerror(errno)); + header->pixel_offset, strerror(errno)); return GP_EBADFILE; } @@ -271,6 +321,7 @@ GP_PixelType match_pixel_type(struct bitmap_info_header *header) { switch (header->bpp) { case 1: + case 2: case 4: case 8: case 24: @@ -349,7 +400,7 @@ GP_RetCode read_palette(FILE *f, struct bitmap_info_header *header, if ((ret = read_bitmap_palette(f, header, palette))) return ret; - if ((ret = seek_pixels_offset(f))) + if ((ret = seek_pixels_offset(header, f))) return ret; uint32_t row_size = bitmap_row_size(header); @@ -403,7 +454,7 @@ GP_RetCode read_rgb888(FILE *f, struct bitmap_info_header *header, uint32_t row_size = 3 * header->w; int32_t y; - if ((ret = seek_pixels_offset(f))) + if ((ret = seek_pixels_offset(header, f))) return ret; for (y = 0; y < GP_ABS(header->h); y++) { @@ -485,7 +536,7 @@ GP_RetCode GP_OpenBMP(const char *src_path, FILE **f, if (w != NULL || h != NULL || pixel_type != NULL) { struct bitmap_info_header header; - if ((ret = read_bitmap_info_header(*f, &header))) + if ((ret = read_bitmap_header(*f, &header))) goto err; if (w != NULL) @@ -508,7 +559,7 @@ GP_RetCode GP_ReadBMP(FILE *f, GP_Context **res, GP_RetCode ret; GP_PixelType pixel_type; - if ((ret = read_bitmap_info_header(f, &header))) + if ((ret = read_bitmap_header(f, &header))) goto err; if (header.compress_type != COMPRESS_RGB) { ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_BMP.c | 185 +++++++++++++++++++++++++++++++------------------ 1 files changed, 118 insertions(+), 67 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 4134b186f31ff445db42c9ef938b05abe240d689
by metan 14 Jan '12

14 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 4134b186f31ff445db42c9ef938b05abe240d689 (commit) from 85ff34bf491fb4653020c474b9bc79d54d69a167 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/4134b186f31ff445db42c9ef938b05abe240… commit 4134b186f31ff445db42c9ef938b05abe240d689 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Jan 14 15:59:39 2012 +0100 loaders: BMP palette formats are loaded correctly. diff --git a/libs/loaders/GP_BMP.c b/libs/loaders/GP_BMP.c index 3ebd88f..b737b71 100644 --- a/libs/loaders/GP_BMP.c +++ b/libs/loaders/GP_BMP.c @@ -202,7 +202,9 @@ static GP_RetCode read_bitmap_info_header(FILE *f, return 0; } - +/* + * Reads palette, the format is R G B X, each one byte. + */ GP_RetCode read_bitmap_palette(FILE *f, struct bitmap_info_header *header, GP_Pixel *palette) { @@ -216,19 +218,21 @@ GP_RetCode read_bitmap_palette(FILE *f, struct bitmap_info_header *header, } for (i = 0; i < palette_colors; i++) { - char buf[4]; + uint8_t buf[4]; - if (fread(buf, 1, 4, f) != 4) + if (fread(buf, 1, 4, f) != 4) { + GP_DEBUG(1, "Failed to read palette %"PRIu32, i); return GP_EBADFILE; - + } + palette[i] = GP_Pixel_CREATE_RGB888(buf[2], buf[1], buf[0]); + + GP_DEBUG(3, "Palette[%"PRIu32"] = [0x%02x, 0x%02x, 0x%02x]", i, + GP_Pixel_GET_R_RGB888(palette[i]), + GP_Pixel_GET_G_RGB888(palette[i]), + GP_Pixel_GET_B_RGB888(palette[i])); } - GP_DEBUG(2, "Palette [0x%02x, 0x%02x, 0x%02x], ...", - GP_Pixel_GET_R_RGB888(palette[0]), - GP_Pixel_GET_G_RGB888(palette[0]), - GP_Pixel_GET_B_RGB888(palette[0])); - return GP_ESUCCESS; } @@ -242,11 +246,10 @@ GP_RetCode seek_pixels_offset(FILE *f) return GP_EBADFILE; } - char buf[4]; + uint8_t buf[4]; - /* Read info header size, header size determines header type */ if (fread(buf, 1, 4, f) != 4) { - GP_DEBUG(1, "Failed to read info header size"); + GP_DEBUG(1, "Failed to read pixel offset size"); return GP_EBADFILE; } @@ -268,6 +271,8 @@ GP_PixelType match_pixel_type(struct bitmap_info_header *header) { switch (header->bpp) { case 1: + case 4: + case 8: case 24: return GP_PIXEL_RGB888; } @@ -275,28 +280,92 @@ GP_PixelType match_pixel_type(struct bitmap_info_header *header) return GP_PIXEL_UNKNOWN; } -GP_RetCode read_p1(FILE *f, struct bitmap_info_header *header, - GP_Context *context, GP_ProgressCallback *callback) +/* + * Returns four byte aligned row size for palette formats. + */ +static uint32_t bitmap_row_size(struct bitmap_info_header *header) +{ + uint32_t row_size = 0; + + /* align width to whole bytes */ + switch (header->bpp) { + case 1: + row_size = header->w / 8 + !!(header->w%8); + break; + case 2: + row_size = header->w / 4 + !!(header->w%4); + break; + case 4: + row_size = header->w / 2 + !!(header->w%2); + break; + case 8: + row_size = header->w; + break; + } + + /* align row_size to four byte boundary */ + switch (row_size % 4) { + case 1: + row_size++; + case 2: + row_size++; + case 3: + row_size++; + case 0: + break; + } + + GP_DEBUG(2, "bpp = %"PRIu16", width = %"PRId32", row_size = %"PRIu32, + header->bpp, header->w, row_size); + + return row_size; +} + +static uint8_t get_idx(struct bitmap_info_header *header, + uint8_t row[], int32_t x) +{ + switch (header->bpp) { + case 1: + return !!(row[x/8] & (1<<(7 - x%8))); + case 2: + return (row[x/4] >> (2*(3 - x%4))) & 0x03; + case 4: + return (row[x/2] >> (4*(!(x%2)))) & 0x0f; + break; + case 8: + return row[x]; + } + + return 0; +} + +GP_RetCode read_palette(FILE *f, struct bitmap_info_header *header, + GP_Context *context, GP_ProgressCallback *callback) { GP_RetCode ret; uint32_t palette_size = get_palette_size(header); GP_Pixel palette[get_palette_size(header)]; - uint32_t row_size = header->w / 8 + !!(header->w%8); - int32_t y; if ((ret = read_bitmap_palette(f, header, palette))) return ret; + + if ((ret = seek_pixels_offset(f))) + return ret; + + uint32_t row_size = bitmap_row_size(header); + int32_t y; - //TODO: if header->h < 0, the bitmap is top down - for (y = header->h - 1; y >= 0; y--) { + for (y = 0; y < GP_ABS(header->h); y++) { int32_t x; uint8_t row[row_size]; - if (fread(row, 1, row_size, f) != row_size) + if (fread(row, 1, row_size, f) != row_size) { + GP_DEBUG(1, "Failed to read row %"PRId32, y); return GP_EBADFILE; + } for (x = 0; x < header->w; x++) { - uint8_t idx = !!(row[x/8] & (1<<(7 - x%8))); + uint8_t idx = get_idx(header, row, x); GP_Pixel p; if (idx >= palette_size) { @@ -305,20 +374,15 @@ GP_RetCode read_p1(FILE *f, struct bitmap_info_header *header, } else { p = palette[idx]; } + + int32_t ry; - GP_PutPixel_Raw_24BPP(context, x, y, p); - } + if (header->h < 0) + ry = y; + else + ry = GP_ABS(header->h) - 1 - y; - /* Rows are four byte aligned */ - switch (row_size % 4) { - case 1: - fgetc(f); - case 2: - fgetc(f); - case 3: - fgetc(f); - case 0: - break; + GP_PutPixel_Raw_24BPP(context, x, ry, p); } if (GP_ProgressCallbackReport(callback, header->h - y -1, @@ -342,9 +406,15 @@ GP_RetCode read_rgb888(FILE *f, struct bitmap_info_header *header, if ((ret = seek_pixels_offset(f))) return ret; - //TODO: if header->h < 0, the bitmap is top down - for (y = header->h - 1; y >= 0; y--) { - uint8_t *row = GP_PIXEL_ADDR(context, 0, y); + for (y = 0; y < GP_ABS(header->h); y++) { + int32_t ry; + + if (header->h < 0) + ry = y; + else + ry = GP_ABS(header->h) - 1 - y; + + uint8_t *row = GP_PIXEL_ADDR(context, 0, ry); if (fread(row, 1, row_size, f) != row_size) return GP_EBADFILE; @@ -377,7 +447,11 @@ GP_RetCode read_bitmap_pixels(FILE *f, struct bitmap_info_header *header, { switch (header->bpp) { case 1: - return read_p1(f, header, context, callback); + /* I haven't been able to locate 2bpp palette bmp file => not tested */ + case 2: + case 4: + case 8: + return read_palette(f, header, context, callback); case 24: return read_rgb888(f, header, context, callback); } ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_BMP.c | 146 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 110 insertions(+), 36 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 85ff34bf491fb4653020c474b9bc79d54d69a167
by metan 10 Jan '12

10 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 85ff34bf491fb4653020c474b9bc79d54d69a167 (commit) from 59bcc6a412d016392c5ea5aaf5f0fac674e06150 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/85ff34bf491fb4653020c474b9bc79d54d69… commit 85ff34bf491fb4653020c474b9bc79d54d69a167 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Jan 10 00:17:49 2012 +0100 loaders: BMP 1BPP palette works now. diff --git a/include/core/GP_Pixel.h b/include/core/GP_Pixel.h index 2b06cee..b2f3804 100644 --- a/include/core/GP_Pixel.h +++ b/include/core/GP_Pixel.h @@ -56,6 +56,7 @@ typedef uint32_t GP_Pixel; /* Generated header */ #include "GP_Pixel.gen.h" +#include "GP_GetSetBits.h" /* * Information about ordering of pixels in byte for 1, 2 and 4 bpp diff --git a/libs/loaders/GP_BMP.c b/libs/loaders/GP_BMP.c index 566efb6..3ebd88f 100644 --- a/libs/loaders/GP_BMP.c +++ b/libs/loaders/GP_BMP.c @@ -37,10 +37,13 @@ #include <stdio.h> #include "core/GP_Debug.h" +#include "core/GP_Pixel.h" +#include "core/GP_GetPutPixel.h" #include "GP_BMP.h" #define BMP_HEADER_OFFSET 0x0e /* info header offset */ #define BMP_PIXELS_OFFSET_OFFSET 0x0a /* offset to offset to pixel data */ +#define BMP_PALETTE_OFFSET 54 /* offset to the palette */ #define BUF_TO_4(buf, off) (buf[off] + (buf[off+1]<<8) + (buf[off+2]<<16) + (buf[off+3]<<24)) @@ -51,17 +54,23 @@ struct bitmap_info_header { int32_t w; - int32_t h; + /* + * If negative imge is top-down (bottom-up is default) + */ + int32_t h; uint16_t bpp; uint32_t compress_type; - uint32_t palette_colors; + /* + * if 0 image uses whole range (2^bpp colors) + */ + uint32_t palette_colors; }; enum bitmap_compress { - COMPRESS_NONE = 0, - COMPRESS_RLE8 = 1, - COMPRESS_RLE4 = 2, - COMPRESS_BITFIELDS = 3, + COMPRESS_RGB = 0, /* uncompressed */ + COMPRESS_RLE8 = 1, /* run-length encoded bitmap */ + COMPRESS_RLE4 = 2, /* run-length encoded bitmap */ + COMPRESS_BITFIELDS = 3, /* bitfield for each channel */ COMPRESS_JPEG = 4, /* only for printers */ COMPRESS_PNG = 5, /* only for printers */ COMPRESS_ALPHABITFIELDS = 6, @@ -69,7 +78,7 @@ enum bitmap_compress { }; static const char *bitmap_compress_names[] = { - "None", + "RGB", "RLE8", "RLE4", "BITFIELDS", @@ -118,6 +127,15 @@ static const char *bitmap_info_header_size_name(uint32_t size) return "Unknown"; } +static uint32_t get_palette_size(struct bitmap_info_header *header) +{ + + if (header->palette_colors) + return header->palette_colors; + + return (1 << header->bpp); +} + static GP_RetCode read_bitmap_info_header(FILE *f, struct bitmap_info_header *header) { @@ -127,7 +145,7 @@ static GP_RetCode read_bitmap_info_header(FILE *f, return GP_EBADFILE; } - char buf[36]; + char buf[32]; uint32_t header_size; /* Read info header size, header size determines header type */ @@ -146,7 +164,13 @@ static GP_RetCode read_bitmap_info_header(FILE *f, case BITMAPCOREHEADER2: return GP_ENOIMPL; /* The bitmap core header only adds filelds to the end of the header */ + case BITMAPINFOHEADER: + case BITMAPINFOHEADER2: + case BITMAPINFOHEADER3: + case BITMAPINFOHEADER4: + break; default: + GP_DEBUG(1, "Unknown header type, continuing anyway"); break; }; @@ -159,20 +183,59 @@ static GP_RetCode read_bitmap_info_header(FILE *f, header->h = BUF_TO_4(buf, 4); header->bpp = BUF_TO_2(buf, 10); header->compress_type = BUF_TO_4(buf, 12); - header->palette_colors = BUF_TO_4(buf, 32); + header->palette_colors = BUF_TO_4(buf, 28); + + uint16_t nr_planes = BUF_TO_2(buf, 8); + + /* This must be 1 according to specs */ + if (nr_planes != 1) + GP_DEBUG(1, "Number of planes is %"PRId16" should be 1", + nr_planes); - //TODO: assert that bitmap planes are set to 1 GP_DEBUG(2, "Have BMP bitmap size %"PRId32"x%"PRId32" %"PRIu16" " "bpp, %"PRIu32" pallete colors, '%s' compression", - header->w, header->h, header->bpp, header->palette_colors, - bitmap_compress_name(header->compress_type)); + header->w, header->h, header->bpp, + get_palette_size(header), + bitmap_compress_name(header->compress_type)); return 0; } -GP_RetCode read_pixels_offset(FILE *f, uint32_t *offset) + +GP_RetCode read_bitmap_palette(FILE *f, struct bitmap_info_header *header, + GP_Pixel *palette) +{ + uint32_t i; + uint32_t palette_colors = get_palette_size(header); + + if (fseek(f, BMP_PALETTE_OFFSET, SEEK_SET)) { + GP_DEBUG(1, "fseek(f, 0x%02x) failed: '%s'", + BMP_HEADER_OFFSET, strerror(errno)); + return GP_EBADFILE; + } + + for (i = 0; i < palette_colors; i++) { + char buf[4]; + + if (fread(buf, 1, 4, f) != 4) + return GP_EBADFILE; + + palette[i] = GP_Pixel_CREATE_RGB888(buf[2], buf[1], buf[0]); + } + + GP_DEBUG(2, "Palette [0x%02x, 0x%02x, 0x%02x], ...", + GP_Pixel_GET_R_RGB888(palette[0]), + GP_Pixel_GET_G_RGB888(palette[0]), + GP_Pixel_GET_B_RGB888(palette[0])); + + return GP_ESUCCESS; +} + +GP_RetCode seek_pixels_offset(FILE *f) { + uint32_t offset; + if (fseek(f, BMP_PIXELS_OFFSET_OFFSET, SEEK_SET)) { GP_DEBUG(1, "fseek(f, 0x%02x) failed: '%s'", BMP_HEADER_OFFSET, strerror(errno)); @@ -187,7 +250,16 @@ GP_RetCode read_pixels_offset(FILE *f, uint32_t *offset) return GP_EBADFILE; } - *offset = BUF_TO_4(buf, 0); + offset = BUF_TO_4(buf, 0); + + GP_DEBUG(2, "Offset to BMP pixels is 0x%x (%ubytes)", + offset, offset); + + if (fseek(f, offset, SEEK_SET)) { + GP_DEBUG(1, "fseek(f, 0x%02x) failed: '%s'", + offset, strerror(errno)); + return GP_EBADFILE; + } return GP_ESUCCESS; } @@ -196,8 +268,6 @@ GP_PixelType match_pixel_type(struct bitmap_info_header *header) { switch (header->bpp) { case 1: - /* context->bitendian = 1 */ - return GP_PIXEL_G1; case 24: return GP_PIXEL_RGB888; } @@ -205,21 +275,40 @@ GP_PixelType match_pixel_type(struct bitmap_info_header *header) return GP_PIXEL_UNKNOWN; } -GP_RetCode read_g1(FILE *f, struct bitmap_info_header *header, +GP_RetCode read_p1(FILE *f, struct bitmap_info_header *header, GP_Context *context, GP_ProgressCallback *callback) { - int32_t y; + GP_RetCode ret; + uint32_t palette_size = get_palette_size(header); + GP_Pixel palette[get_palette_size(header)]; uint32_t row_size = header->w / 8 + !!(header->w%8); + int32_t y; - context->bit_endian = 1; + if ((ret = read_bitmap_palette(f, header, palette))) + return ret; //TODO: if header->h < 0, the bitmap is top down for (y = header->h - 1; y >= 0; y--) { - uint8_t *row = GP_PIXEL_ADDR(context, 0, y); + int32_t x; + uint8_t row[row_size]; if (fread(row, 1, row_size, f) != row_size) return GP_EBADFILE; + for (x = 0; x < header->w; x++) { + uint8_t idx = !!(row[x/8] & (1<<(7 - x%8))); + GP_Pixel p; + + if (idx >= palette_size) { + GP_DEBUG(1, "Index out of palette, ignoring"); + p = 0; + } else { + p = palette[idx]; + } + + GP_PutPixel_Raw_24BPP(context, x, y, p); + } + /* Rows are four byte aligned */ switch (row_size % 4) { case 1: @@ -246,8 +335,12 @@ GP_RetCode read_g1(FILE *f, struct bitmap_info_header *header, GP_RetCode read_rgb888(FILE *f, struct bitmap_info_header *header, GP_Context *context, GP_ProgressCallback *callback) { - int32_t y; + GP_RetCode ret; uint32_t row_size = 3 * header->w; + int32_t y; + + if ((ret = seek_pixels_offset(f))) + return ret; //TODO: if header->h < 0, the bitmap is top down for (y = header->h - 1; y >= 0; y--) { @@ -282,24 +375,9 @@ GP_RetCode read_rgb888(FILE *f, struct bitmap_info_header *header, GP_RetCode read_bitmap_pixels(FILE *f, struct bitmap_info_header *header, GP_Context *context, GP_ProgressCallback *callback) { - uint32_t pixels_offset; - GP_RetCode ret; - - if ((ret = read_pixels_offset(f, &pixels_offset))) - return ret; - - GP_DEBUG(2, "Offset to BMP pixels is 0x%x (%ubytes)", - pixels_offset, pixels_offset); - - if (fseek(f, pixels_offset, SEEK_SET)) { - GP_DEBUG(1, "fseek(f, 0x%02x (pixels_offset)) failed: '%s'", - pixels_offset, strerror(errno)); - return GP_EBADFILE; - } - switch (header->bpp) { case 1: - return read_g1(f, header, context, callback); + return read_p1(f, header, context, callback); case 24: return read_rgb888(f, header, context, callback); } @@ -359,7 +437,7 @@ GP_RetCode GP_ReadBMP(FILE *f, GP_Context **res, if ((ret = read_bitmap_info_header(f, &header))) goto err; - if (header.compress_type != COMPRESS_NONE) { + if (header.compress_type != COMPRESS_RGB) { ret = GP_ENOIMPL; goto err; } ----------------------------------------------------------------------- Summary of changes: include/core/GP_Pixel.h | 1 + libs/loaders/GP_BMP.c | 154 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 117 insertions(+), 38 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 59bcc6a412d016392c5ea5aaf5f0fac674e06150
by metan 09 Jan '12

09 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 59bcc6a412d016392c5ea5aaf5f0fac674e06150 (commit) from 2452f86d8fc399fb31bc2688a1c1f0cdea4c4156 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/59bcc6a412d016392c5ea5aaf5f0fac674e0… commit 59bcc6a412d016392c5ea5aaf5f0fac674e06150 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Jan 9 22:28:36 2012 +0100 loaders: Little cleanup for BMP source. diff --git a/libs/loaders/GP_BMP.c b/libs/loaders/GP_BMP.c index d6e514d..566efb6 100644 --- a/libs/loaders/GP_BMP.c +++ b/libs/loaders/GP_BMP.c @@ -42,6 +42,13 @@ #define BMP_HEADER_OFFSET 0x0e /* info header offset */ #define BMP_PIXELS_OFFSET_OFFSET 0x0a /* offset to offset to pixel data */ +#define BUF_TO_4(buf, off) + (buf[off] + (buf[off+1]<<8) + (buf[off+2]<<16) + (buf[off+3]<<24)) + +#define BUF_TO_2(buf, off) + (buf[off] + (buf[off+1]<<8)) + + struct bitmap_info_header { int32_t w; int32_t h; @@ -129,7 +136,7 @@ static GP_RetCode read_bitmap_info_header(FILE *f, return GP_EBADFILE; } - header_size = buf[0] + (buf[1]<<8) + (buf[2]<<16) + (buf[3]<<24); + header_size = BUF_TO_4(buf, 0); GP_DEBUG(2, "BMP header type '%s'", bitmap_info_header_size_name(header_size)); @@ -148,16 +155,13 @@ static GP_RetCode read_bitmap_info_header(FILE *f, return 1; } - header->w = buf[0] + (buf[1]<<8) + (buf[2]<<16) + (buf[3]<<24); - header->h = buf[4] + (buf[5]<<8) + (buf[6]<<16) + (buf[7]<<24); - - header->bpp = buf[10] + (buf[11]<<8); - - header->compress_type = buf[12] + (buf[13]<<8) + - (buf[14]<<16) + (buf[15]<<24); - - header->palette_colors = buf[32] + (buf[33]<<8) + - (buf[34]<<16) + (buf[35]<<24); + header->w = BUF_TO_4(buf, 0); + header->h = BUF_TO_4(buf, 4); + header->bpp = BUF_TO_2(buf, 10); + header->compress_type = BUF_TO_4(buf, 12); + header->palette_colors = BUF_TO_4(buf, 32); + + //TODO: assert that bitmap planes are set to 1 GP_DEBUG(2, "Have BMP bitmap size %"PRId32"x%"PRId32" %"PRIu16" " "bpp, %"PRIu32" pallete colors, '%s' compression", @@ -183,7 +187,7 @@ GP_RetCode read_pixels_offset(FILE *f, uint32_t *offset) return GP_EBADFILE; } - *offset = buf[0] + (buf[1]<<8) + (buf[2]<<16) + (buf[3]<<24); + *offset = BUF_TO_4(buf, 0); return GP_ESUCCESS; } @@ -209,6 +213,7 @@ GP_RetCode read_g1(FILE *f, struct bitmap_info_header *header, context->bit_endian = 1; + //TODO: if header->h < 0, the bitmap is top down for (y = header->h - 1; y >= 0; y--) { uint8_t *row = GP_PIXEL_ADDR(context, 0, y); @@ -244,6 +249,7 @@ GP_RetCode read_rgb888(FILE *f, struct bitmap_info_header *header, int32_t y; uint32_t row_size = 3 * header->w; + //TODO: if header->h < 0, the bitmap is top down for (y = header->h - 1; y >= 0; y--) { uint8_t *row = GP_PIXEL_ADDR(context, 0, y); @@ -363,7 +369,9 @@ GP_RetCode GP_ReadBMP(FILE *f, GP_Context **res, goto err; } - GP_Context *context = GP_ContextAlloc(header.w, header.h, pixel_type); + GP_Context *context; + + context = GP_ContextAlloc(header.w, GP_ABS(header.h), pixel_type); if (context == NULL) { ret = GP_ENOMEM; ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_BMP.c | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 2452f86d8fc399fb31bc2688a1c1f0cdea4c4156
by metan 09 Jan '12

09 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 2452f86d8fc399fb31bc2688a1c1f0cdea4c4156 (commit) from 1bd709f7b02e6cf8c47318125d75d21092a8bcd9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/2452f86d8fc399fb31bc2688a1c1f0cdea4c… commit 2452f86d8fc399fb31bc2688a1c1f0cdea4c4156 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Jan 9 19:11:50 2012 +0100 loaders: BMP loader, fix 24 BPP, add 1 BPP todo: palettes diff --git a/libs/loaders/GP_BMP.c b/libs/loaders/GP_BMP.c index b820dc8..d6e514d 100644 --- a/libs/loaders/GP_BMP.c +++ b/libs/loaders/GP_BMP.c @@ -148,8 +148,8 @@ static GP_RetCode read_bitmap_info_header(FILE *f, return 1; } - header->h = buf[0] + (buf[1]<<8) + (buf[2]<<16) + (buf[3]<<24); - header->w = buf[4] + (buf[5]<<8) + (buf[6]<<16) + (buf[7]<<24); + header->w = buf[0] + (buf[1]<<8) + (buf[2]<<16) + (buf[3]<<24); + header->h = buf[4] + (buf[5]<<8) + (buf[6]<<16) + (buf[7]<<24); header->bpp = buf[10] + (buf[11]<<8); @@ -191,6 +191,9 @@ GP_RetCode read_pixels_offset(FILE *f, uint32_t *offset) GP_PixelType match_pixel_type(struct bitmap_info_header *header) { switch (header->bpp) { + case 1: + /* context->bitendian = 1 */ + return GP_PIXEL_G1; case 24: return GP_PIXEL_RGB888; } @@ -198,6 +201,43 @@ GP_PixelType match_pixel_type(struct bitmap_info_header *header) return GP_PIXEL_UNKNOWN; } +GP_RetCode read_g1(FILE *f, struct bitmap_info_header *header, + GP_Context *context, GP_ProgressCallback *callback) +{ + int32_t y; + uint32_t row_size = header->w / 8 + !!(header->w%8); + + context->bit_endian = 1; + + for (y = header->h - 1; y >= 0; y--) { + uint8_t *row = GP_PIXEL_ADDR(context, 0, y); + + if (fread(row, 1, row_size, f) != row_size) + return GP_EBADFILE; + + /* Rows are four byte aligned */ + switch (row_size % 4) { + case 1: + fgetc(f); + case 2: + fgetc(f); + case 3: + fgetc(f); + case 0: + break; + } + + if (GP_ProgressCallbackReport(callback, header->h - y -1, + context->h, context->w)) { + GP_DEBUG(1, "Operation aborted"); + return GP_EINTR; + } + } + + GP_ProgressCallbackDone(callback); + return GP_ESUCCESS; +} + GP_RetCode read_rgb888(FILE *f, struct bitmap_info_header *header, GP_Context *context, GP_ProgressCallback *callback) { @@ -212,11 +252,11 @@ GP_RetCode read_rgb888(FILE *f, struct bitmap_info_header *header, /* Rows are four byte aligned */ switch (row_size % 4) { - case 3: + case 1: fgetc(f); case 2: fgetc(f); - case 1: + case 3: fgetc(f); case 0: break; @@ -252,6 +292,8 @@ GP_RetCode read_bitmap_pixels(FILE *f, struct bitmap_info_header *header, } switch (header->bpp) { + case 1: + return read_g1(f, header, context, callback); case 24: return read_rgb888(f, header, context, callback); } @@ -352,4 +394,3 @@ GP_RetCode GP_LoadBMP(const char *src_path, GP_Context **res, return GP_ReadBMP(f, res, callback); } - ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_BMP.c | 51 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 46 insertions(+), 5 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 1bd709f7b02e6cf8c47318125d75d21092a8bcd9
by metan 09 Jan '12

09 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 1bd709f7b02e6cf8c47318125d75d21092a8bcd9 (commit) from bf70bc758e8d915a99250ce0422f05f414785e5d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/1bd709f7b02e6cf8c47318125d75d21092a8… commit 1bd709f7b02e6cf8c47318125d75d21092a8bcd9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Jan 9 18:37:53 2012 +0100 loaders: Initial support for BMP images. diff --git a/include/loaders/GP_Loaders.h b/include/loaders/GP_BMP.h similarity index 67% copy from include/loaders/GP_Loaders.h copy to include/loaders/GP_BMP.h index b327744..2f81017 100644 --- a/include/loaders/GP_Loaders.h +++ b/include/loaders/GP_BMP.h @@ -16,37 +16,39 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ - /* - - Core include file for loaders API. - - */ - -#ifndef LOADERS_GP_LOADERS_H -#define LOADERS_GP_LOADERS_H +#ifndef LOADERS_GP_BMP_H +#define LOADERS_GP_BMP_H #include "core/GP_Context.h" #include "core/GP_ProgressCallback.h" -#include "GP_PBM.h" -#include "GP_PGM.h" -#include "GP_PPM.h" - -#include "GP_PNG.h" +/* + * Opens up a bmp file, checks signature, parses metadata. + * + * The width and height and pixel type are filled upon succcessful return. + */ +GP_RetCode GP_OpenBMP(const char *src_path, FILE **f, + GP_Size *w, GP_Size *h, GP_PixelType *pixel_type); -#include "GP_JPG.h" +/* + * Reads a BMP from a opened file. + * + * Upon successful return context to store bitmap is allocated and image is + * loaded. + * + */ +GP_RetCode GP_ReadBMP(FILE *f, GP_Context **res, + GP_ProgressCallback *callback); /* - * Tries to load image accordingly to extension. + * Does both GP_OpenBMP and GP_ReadBMP. */ -GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res, - GP_ProgressCallback *callback); +GP_RetCode GP_LoadBMP(const char *src_path, GP_Context **res, + GP_ProgressCallback *callback); + -#endif /* LOADERS_GP_LOADERS_H */ +#endif /* LOADERS_GP_BMP_H */ diff --git a/include/loaders/GP_Loaders.h b/include/loaders/GP_Loaders.h index b327744..96b26c8 100644 --- a/include/loaders/GP_Loaders.h +++ b/include/loaders/GP_Loaders.h @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -39,8 +39,8 @@ #include "GP_PGM.h" #include "GP_PPM.h" +#include "GP_BMP.h" #include "GP_PNG.h" - #include "GP_JPG.h" /* diff --git a/libs/loaders/GP_BMP.c b/libs/loaders/GP_BMP.c new file mode 100644 index 0000000..b820dc8 --- /dev/null +++ b/libs/loaders/GP_BMP.c @@ -0,0 +1,355 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +/* + + BMP loader. + + Thanks wikipedia for the format specification. + + */ + +#include <stdint.h> +#include <inttypes.h> + +#include <ctype.h> +#include <errno.h> +#include <string.h> +#include <stdio.h> + +#include "core/GP_Debug.h" +#include "GP_BMP.h" + +#define BMP_HEADER_OFFSET 0x0e /* info header offset */ +#define BMP_PIXELS_OFFSET_OFFSET 0x0a /* offset to offset to pixel data */ + +struct bitmap_info_header { + int32_t w; + int32_t h; + uint16_t bpp; + uint32_t compress_type; + uint32_t palette_colors; +}; + +enum bitmap_compress { + COMPRESS_NONE = 0, + COMPRESS_RLE8 = 1, + COMPRESS_RLE4 = 2, + COMPRESS_BITFIELDS = 3, + COMPRESS_JPEG = 4, /* only for printers */ + COMPRESS_PNG = 5, /* only for printers */ + COMPRESS_ALPHABITFIELDS = 6, + COMPRESS_MAX = COMPRESS_ALPHABITFIELDS, +}; + +static const char *bitmap_compress_names[] = { + "None", + "RLE8", + "RLE4", + "BITFIELDS", + "JPEG", + "PNG", + "ALPHABITFIELDS", +}; + +static const char *bitmap_compress_name(uint32_t compress) +{ + if (compress >= COMPRESS_MAX) + return "Unknown"; + + return bitmap_compress_names[compress]; +} + +enum bitmap_info_header_sizes { + BITMAPCOREHEADER = 12, /* old OS/2 format + win 3.0 */ + BITMAPCOREHEADER2 = 64, /* OS/2 */ + BITMAPINFOHEADER = 40, /* most common */ + BITMAPINFOHEADER2 = 52, /* Undocummented */ + BITMAPINFOHEADER3 = 56, /* Undocummented */ + BITMAPINFOHEADER4 = 108, /* adds color space + gamma - win 95/NT4 */ + BITMAPINFOHEADER5 = 124, /* adds ICC color profiles win 98+ */ +}; + +static const char *bitmap_info_header_size_name(uint32_t size) +{ + switch (size) { + case BITMAPCOREHEADER: + return "BitmapCoreHeader"; + case BITMAPCOREHEADER2: + return "BitmapCoreHeader2"; + case BITMAPINFOHEADER: + return "BitmapInfoHeader"; + case BITMAPINFOHEADER2: + return "BitmapInfoHeader2"; + case BITMAPINFOHEADER3: + return "BitmapInfoHeader3"; + case BITMAPINFOHEADER4: + return "BitmapInfoHeader4"; + case BITMAPINFOHEADER5: + return "BitmapInfoHeader5"; + } + + return "Unknown"; +} + +static GP_RetCode read_bitmap_info_header(FILE *f, + struct bitmap_info_header *header) +{ + if (fseek(f, BMP_HEADER_OFFSET, SEEK_SET)) { + GP_DEBUG(1, "fseek(f, 0x%02x) failed: '%s'", + BMP_HEADER_OFFSET, strerror(errno)); + return GP_EBADFILE; + } + + char buf[36]; + uint32_t header_size; + + /* Read info header size, header size determines header type */ + if (fread(buf, 1, 4, f) != 4) { + GP_DEBUG(1, "Failed to read info header size"); + return GP_EBADFILE; + } + + header_size = buf[0] + (buf[1]<<8) + (buf[2]<<16) + (buf[3]<<24); + + GP_DEBUG(2, "BMP header type '%s'", + bitmap_info_header_size_name(header_size)); + + switch (header_size) { + case BITMAPCOREHEADER: + case BITMAPCOREHEADER2: + return GP_ENOIMPL; + /* The bitmap core header only adds filelds to the end of the header */ + default: + break; + }; + + if (fread(buf, 1, sizeof(buf), f) != sizeof(buf)) { + GP_DEBUG(1, "Failed to read bitmap info header"); + return 1; + } + + header->h = buf[0] + (buf[1]<<8) + (buf[2]<<16) + (buf[3]<<24); + header->w = buf[4] + (buf[5]<<8) + (buf[6]<<16) + (buf[7]<<24); + + header->bpp = buf[10] + (buf[11]<<8); + + header->compress_type = buf[12] + (buf[13]<<8) + + (buf[14]<<16) + (buf[15]<<24); + + header->palette_colors = buf[32] + (buf[33]<<8) + + (buf[34]<<16) + (buf[35]<<24); + + GP_DEBUG(2, "Have BMP bitmap size %"PRId32"x%"PRId32" %"PRIu16" " + "bpp, %"PRIu32" pallete colors, '%s' compression", + header->w, header->h, header->bpp, header->palette_colors, + bitmap_compress_name(header->compress_type)); + + return 0; +} + +GP_RetCode read_pixels_offset(FILE *f, uint32_t *offset) +{ + if (fseek(f, BMP_PIXELS_OFFSET_OFFSET, SEEK_SET)) { + GP_DEBUG(1, "fseek(f, 0x%02x) failed: '%s'", + BMP_HEADER_OFFSET, strerror(errno)); + return GP_EBADFILE; + } + + char buf[4]; + + /* Read info header size, header size determines header type */ + if (fread(buf, 1, 4, f) != 4) { + GP_DEBUG(1, "Failed to read info header size"); + return GP_EBADFILE; + } + + *offset = buf[0] + (buf[1]<<8) + (buf[2]<<16) + (buf[3]<<24); + + return GP_ESUCCESS; +} + +GP_PixelType match_pixel_type(struct bitmap_info_header *header) +{ + switch (header->bpp) { + case 24: + return GP_PIXEL_RGB888; + } + + return GP_PIXEL_UNKNOWN; +} + +GP_RetCode read_rgb888(FILE *f, struct bitmap_info_header *header, + GP_Context *context, GP_ProgressCallback *callback) +{ + int32_t y; + uint32_t row_size = 3 * header->w; + + for (y = header->h - 1; y >= 0; y--) { + uint8_t *row = GP_PIXEL_ADDR(context, 0, y); + + if (fread(row, 1, row_size, f) != row_size) + return GP_EBADFILE; + + /* Rows are four byte aligned */ + switch (row_size % 4) { + case 3: + fgetc(f); + case 2: + fgetc(f); + case 1: + fgetc(f); + case 0: + break; + } + + if (GP_ProgressCallbackReport(callback, header->h - y -1, + context->h, context->w)) { + GP_DEBUG(1, "Operation aborted"); + return GP_EINTR; + } + } + + GP_ProgressCallbackDone(callback); + return GP_ESUCCESS; +} + +GP_RetCode read_bitmap_pixels(FILE *f, struct bitmap_info_header *header, + GP_Context *context, GP_ProgressCallback *callback) +{ + uint32_t pixels_offset; + GP_RetCode ret; + + if ((ret = read_pixels_offset(f, &pixels_offset))) + return ret; + + GP_DEBUG(2, "Offset to BMP pixels is 0x%x (%ubytes)", + pixels_offset, pixels_offset); + + if (fseek(f, pixels_offset, SEEK_SET)) { + GP_DEBUG(1, "fseek(f, 0x%02x (pixels_offset)) failed: '%s'", + pixels_offset, strerror(errno)); + return GP_EBADFILE; + } + + switch (header->bpp) { + case 24: + return read_rgb888(f, header, context, callback); + } + + return GP_ENOIMPL; +} + +GP_RetCode GP_OpenBMP(const char *src_path, FILE **f, + GP_Size *w, GP_Size *h, GP_PixelType *pixel_type) +{ + GP_RetCode ret = GP_EBADFILE; + + *f = fopen(src_path, "rb"); + + if (*f == NULL) { + GP_DEBUG(1, "Failed to open '%s' : %s", + src_path, strerror(errno)); + return GP_EBADFILE; + } + + int ch1 = fgetc(*f); + int ch2 = fgetc(*f); + + if (ch1 != 'B' || ch2 != 'M') { + GP_DEBUG(1, "Unexpected bitmap header 0x%02x (%c) 0x%02x (%c)", + ch1, isascii(ch1) ? ch1 : ' ', + ch2, isascii(ch2) ? ch2 : ' '); + goto err; + } + + if (w != NULL || h != NULL || pixel_type != NULL) { + struct bitmap_info_header header; + + if ((ret = read_bitmap_info_header(*f, &header))) + goto err; + + if (w != NULL) + *w = header.w; + + if (h != NULL) + *h = header.h; + } + + return GP_ESUCCESS; +err: + fclose(*f); + return GP_EBADFILE; +} + +GP_RetCode GP_ReadBMP(FILE *f, GP_Context **res, + GP_ProgressCallback *callback) +{ + struct bitmap_info_header header; + GP_RetCode ret; + GP_PixelType pixel_type; + + if ((ret = read_bitmap_info_header(f, &header))) + goto err; + + if (header.compress_type != COMPRESS_NONE) { + ret = GP_ENOIMPL; + goto err; + } + + if ((pixel_type = match_pixel_type(&header)) == GP_PIXEL_UNKNOWN) { + ret = GP_ENOIMPL; + goto err; + } + + GP_Context *context = GP_ContextAlloc(header.w, header.h, pixel_type); + + if (context == NULL) { + ret = GP_ENOMEM; + goto err; + } + + if ((ret = read_bitmap_pixels(f, &header, context, callback))) + goto err1; + + *res = context; + + return GP_ESUCCESS; +err1: + GP_ContextFree(context); +err: + fclose(f); + return ret; +} + +GP_RetCode GP_LoadBMP(const char *src_path, GP_Context **res, + GP_ProgressCallback *callback) +{ + FILE *f; + GP_RetCode ret; + + if ((ret = GP_OpenBMP(src_path, &f, NULL, NULL, NULL))) + return ret; + + return GP_ReadBMP(f, res, callback); +} + diff --git a/libs/loaders/GP_Loaders.c b/libs/loaders/GP_Loaders.c index 8a57c59..8ef8c63 100644 --- a/libs/loaders/GP_Loaders.c +++ b/libs/loaders/GP_Loaders.c @@ -46,6 +46,9 @@ GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res, return GP_EBADFILE; } + if (len < 3) + goto skip_filename_check; + switch (src_path[len - 1]) { /* PNG, JPG, JPEG */ case 'g': @@ -97,8 +100,22 @@ GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res, break; } break; + /* BMP */ + case 'P': + case 'p': + switch (src_path[len - 2]) { + case 'M': + case 'm': + if (src_path[len - 3] == 'B' || + src_path[len - 3] == 'b') + ret = GP_LoadBMP(src_path, res, callback); + break; + } + break; } +skip_filename_check: + //TODO file signature based check return ret; ----------------------------------------------------------------------- Summary of changes: include/loaders/{GP_JPG.h => GP_BMP.h} | 40 ++-- include/loaders/GP_Loaders.h | 4 +- libs/loaders/GP_BMP.c | 355 ++++++++++++++++++++++++++++++++ libs/loaders/GP_Loaders.c | 17 ++ 4 files changed, 391 insertions(+), 25 deletions(-) copy include/loaders/{GP_JPG.h => GP_BMP.h} (71%) create mode 100644 libs/loaders/GP_BMP.c repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: bf70bc758e8d915a99250ce0422f05f414785e5d
by metan 08 Jan '12

08 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via bf70bc758e8d915a99250ce0422f05f414785e5d (commit) from e5db2b1f3508e1630b9af36a397a68ef069a56a2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/bf70bc758e8d915a99250ce0422f05f41478… commit bf70bc758e8d915a99250ce0422f05f414785e5d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jan 8 20:26:11 2012 +0100 gfx: Fix CircleSeg orientation. diff --git a/libs/gfx/GP_CircleSeg.c b/libs/gfx/GP_CircleSeg.c index 56179c6..512699e 100644 --- a/libs/gfx/GP_CircleSeg.c +++ b/libs/gfx/GP_CircleSeg.c @@ -39,7 +39,7 @@ static uint8_t transform_segments(GP_Context *context, uint8_t seg_flags) uint8_t seg4 = seg_flags & GP_CIRCLE_SEG4; if (context->axes_swap) - GP_SWAP(seg2, seg4); + GP_SWAP(seg1, seg3); if (context->x_swap) { GP_SWAP(seg1, seg2); diff --git a/libs/gfx/algo/CircleSeg.algo.h b/libs/gfx/algo/CircleSeg.algo.h index 9812888..dc176a3 100644 --- a/libs/gfx/algo/CircleSeg.algo.h +++ b/libs/gfx/algo/CircleSeg.algo.h @@ -84,25 +84,25 @@ void FN_NAME(CONTEXT_T context, int xcenter, int ycenter, unsigned int r, while (error < 0) { error += 2*x + 1; x++; - if (seg_flags & GP_CIRCLE_SEG3) + if (seg_flags & GP_CIRCLE_SEG2) PUTPIXEL(context, xcenter-x+1, ycenter-y, pixval); - if (seg_flags & GP_CIRCLE_SEG4) + if (seg_flags & GP_CIRCLE_SEG1) PUTPIXEL(context, xcenter+x-1, ycenter-y, pixval); - if (seg_flags & GP_CIRCLE_SEG2) + if (seg_flags & GP_CIRCLE_SEG3) PUTPIXEL(context, xcenter-x+1, ycenter+y, pixval); - if (seg_flags & GP_CIRCLE_SEG1) + if (seg_flags & GP_CIRCLE_SEG4) PUTPIXEL(context, xcenter+x-1, ycenter+y, pixval); } /* Enough changes accumulated, go to next line. */ error += -2*y + 1; - if (seg_flags & GP_CIRCLE_SEG3) + if (seg_flags & GP_CIRCLE_SEG2) PUTPIXEL(context, xcenter-x+1, ycenter-y, pixval); - if (seg_flags & GP_CIRCLE_SEG4) + if (seg_flags & GP_CIRCLE_SEG1) PUTPIXEL(context, xcenter+x-1, ycenter-y, pixval) ; - if (seg_flags & GP_CIRCLE_SEG2) + if (seg_flags & GP_CIRCLE_SEG3) PUTPIXEL(context, xcenter-x+1, ycenter+y, pixval); - if (seg_flags & GP_CIRCLE_SEG1) + if (seg_flags & GP_CIRCLE_SEG4) PUTPIXEL(context, xcenter+x-1, ycenter+y, pixval); } } ----------------------------------------------------------------------- Summary of changes: libs/gfx/GP_CircleSeg.c | 2 +- libs/gfx/algo/CircleSeg.algo.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: e5db2b1f3508e1630b9af36a397a68ef069a56a2
by metan 08 Jan '12

08 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via e5db2b1f3508e1630b9af36a397a68ef069a56a2 (commit) from 566ed587e8f01232c84c2aba46d1861a20cd0c27 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/e5db2b1f3508e1630b9af36a397a68ef069a… commit e5db2b1f3508e1630b9af36a397a68ef069a56a2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jan 8 18:53:24 2012 +0100 gfx: Add function for circle segment drawing. diff --git a/include/gfx/GP_Gfx.h b/include/gfx/GP_CircleSeg.h similarity index 53% copy from include/gfx/GP_Gfx.h copy to include/gfx/GP_CircleSeg.h index 6503952..fddc5ef 100644 --- a/include/gfx/GP_Gfx.h +++ b/include/gfx/GP_CircleSeg.h @@ -16,41 +16,52 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * + * Copyright (C) 2009-2011 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ -/* +#ifndef GFX_GP_CIRCLE_H +#define GFX_GP_CIRCLE_H - This is a main header for gfx part. +#include "core/GP_Context.h" +/* + * Quadrants in cartesian space the center is set in the middle of the circle. + * + * First segment is where both x and y are possitive, second is where only y is + * possitive, third is for both x and y negative and the last one for only y + * negative. + * + * Note that on computer screen (and in in-memory bitmaps) cordinates for y + * grows in the opposite direction to the standard cartesian plane. + * + * So first segment is actually down right, second is down left, third is up + * left, and fourth is up right. */ +enum GP_CircleSegments { + GP_CIRCLE_SEG1 = 0x01, /* First Quadrant */ + GP_CIRCLE_SEG2 = 0x02, /* Second Quadrant */ + GP_CIRCLE_SEG3 = 0x04, /* Third Quadrant */ + GP_CIRCLE_SEG4 = 0x08, /* Fourth Quadrant */ +}; -#ifndef GP_GFX_H -#define GP_GFX_H +/* Circle Segment */ -/* basic definitions and structures */ -#include "core/GP_Context.h" -#include "core/GP_GetPutPixel.h" -#include "core/GP_WritePixel.h" - -/* public drawing API */ -#include "GP_Fill.h" -#include "GP_HLine.h" -#include "GP_VLine.h" -#include "GP_Line.h" -#include "GP_Rect.h" -#include "GP_Triangle.h" -#include "GP_Tetragon.h" -#include "GP_Circle.h" -#include "GP_Ellipse.h" -#include "GP_Arc.h" -#include "GP_Polygon.h" -#include "GP_Symbol.h" - -#include "GP_RectAA.h" - -#endif /* GP_GFX_H */ +void GP_CircleSeg(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size r, uint8_t seg_flag, GP_Pixel pixel); + +void GP_CircleSeg_Raw(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size r, uint8_t seg_flag, GP_Pixel pixel); + +/* Filled Circle Segment */ + +void GP_FillCircleSeg(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size r, uint8_t seg_flag, GP_Pixel pixel); + +void GP_FillCircleSeg_Raw(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size r, uint8_t seg_flag, GP_Pixel pixel); + +#endif /* GFX_GP_CIRCLE_H */ diff --git a/include/gfx/GP_Gfx.h b/include/gfx/GP_Gfx.h index 6503952..54648a8 100644 --- a/include/gfx/GP_Gfx.h +++ b/include/gfx/GP_Gfx.h @@ -46,6 +46,7 @@ #include "GP_Triangle.h" #include "GP_Tetragon.h" #include "GP_Circle.h" +#include "GP_CircleSeg.h" #include "GP_Ellipse.h" #include "GP_Arc.h" #include "GP_Polygon.h" diff --git a/libs/gfx/GP_CircleSeg.c b/libs/gfx/GP_CircleSeg.c new file mode 100644 index 0000000..56179c6 --- /dev/null +++ b/libs/gfx/GP_CircleSeg.c @@ -0,0 +1,108 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2011 Jiri "BlueBear" Dluhos * + * <jiri.bluebear.dluhos(a)gmail.com> * + * * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include "GP_CircleSeg.h" +#include "GP_HLine.h" + +#include "core/GP_GetPutPixel.h" +#include "core/GP_FnPerBpp.h" + +#include "algo/CircleSeg.algo.h" + +static uint8_t transform_segments(GP_Context *context, uint8_t seg_flags) +{ + uint8_t seg1 = seg_flags & GP_CIRCLE_SEG1; + uint8_t seg2 = seg_flags & GP_CIRCLE_SEG2; + uint8_t seg3 = seg_flags & GP_CIRCLE_SEG3; + uint8_t seg4 = seg_flags & GP_CIRCLE_SEG4; + + if (context->axes_swap) + GP_SWAP(seg2, seg4); + + if (context->x_swap) { + GP_SWAP(seg1, seg2); + GP_SWAP(seg3, seg4); + } + + if (context->y_swap) { + GP_SWAP(seg1, seg4); + GP_SWAP(seg2, seg3); + } + + seg1 = seg1 ? GP_CIRCLE_SEG1 : 0; + seg2 = seg2 ? GP_CIRCLE_SEG2 : 0; + seg3 = seg3 ? GP_CIRCLE_SEG3 : 0; + seg4 = seg4 ? GP_CIRCLE_SEG4 : 0; + + return seg1|seg2|seg3|seg4; +} + +/* Generate drawing functions for various bit depths. */ +GP_DEF_DRAW_FN_PER_BPP(GP_CircleSeg_Raw, DEF_CIRCLE_SEG_FN) + +void GP_CircleSeg_Raw(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size r, uint8_t seg_flag, GP_Pixel pixel) +{ + GP_CHECK_CONTEXT(context); + + GP_FN_PER_BPP_CONTEXT(GP_CircleSeg_Raw, context, context, + xcenter, ycenter, r, seg_flag, pixel); +} + +void GP_CircleSeg(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size r, uint8_t seg_flag, GP_Pixel pixel) +{ + GP_CHECK_CONTEXT(context); + + GP_TRANSFORM_POINT(context, xcenter, ycenter); + + GP_CircleSeg_Raw(context, xcenter, ycenter, r, + transform_segments(context, seg_flag), pixel); +} + +/* +#include "algo/FillCircle.algo.h" + +GP_DEF_FILL_FN_PER_BPP(GP_FillCircle_Raw, DEF_FILLCIRCLE_FN) + +void GP_FillCircle_Raw(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size r, GP_Pixel pixel) +{ + GP_CHECK_CONTEXT(context); + + GP_FN_PER_BPP_CONTEXT(GP_FillCircle_Raw, context, context, + xcenter, ycenter, r, pixel); +} + +void GP_FillCircle(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size r, GP_Pixel pixel) +{ + GP_CHECK_CONTEXT(context); + + GP_TRANSFORM_POINT(context, xcenter, ycenter); + + GP_FillCircle_Raw(context, xcenter, ycenter, r, pixel); +} +*/ diff --git a/libs/gfx/algo/CircleSeg.algo.h b/libs/gfx/algo/CircleSeg.algo.h new file mode 100644 index 0000000..9812888 --- /dev/null +++ b/libs/gfx/algo/CircleSeg.algo.h @@ -0,0 +1,108 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2011 Jiri "BlueBear" Dluhos * + * <jiri.bluebear.dluhos(a)gmail.com> * + * * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +/* + * Circle drawing algorithm. + * + * The circle is drawn in a top-down manner. We start from the top, and + * at each line, we iterate X until we accumulate enough changes to Y + * to pass to the next line. In each step, 4 pixels are drawn: + * (X, Y), (-X, Y), (X, -Y) and (-X, -Y). + * + * The math: + * From the circle equation, for every point applies: + * + * x^2 + y^2 = r^2 -> x^2 + y^2 - r^2 = 0 + * + * which has an exact solution for a non-integer x. + * For an integer approximation, we want to find x + * for which + * + * x^2 + y^2 - r^2 = error + * + * where error should be as close to 0 as possible. + * We find the x by incrementing its value until + * we cross the zero error boundary. + * + * Optimization: + * Significant amount of multiplications can be + * saved when calculating error by re-using previous + * error values. For error(x+1) we have: + * + * error(x+1) = (x+1)^2 + y^2 - r^2 + * + * which can be expanded to (expanding (x+1)^2): + * + * error(x+1) = x^2 + 2*x + 1 + y^2 - r^2 + * + * and after substituting the error(x) we already know: + * + * error(x+1) = error(x) + 2*x + 1 + * + * The same can be done for calculating + * error(y-1) from error(y). + */ + +/* + * This macro defines a circle drawing function. + * Arguments: + * CONTEXT_T - user-defined type of drawing context (passed to PUTPIXEL) + * PIXVAL_T - user-defined pixel value type (passed to PUTPIXEL) + * PUTPIXEL - a pixel drawing function f(context, x, y, pixval) + * FN_NAME - name of the function to be defined + */ +#define DEF_CIRCLE_SEG_FN(FN_NAME, CONTEXT_T, PIXVAL_T, PUTPIXEL) +void FN_NAME(CONTEXT_T context, int xcenter, int ycenter, unsigned int r, + uint8_t seg_flags, PIXVAL_T pixval) +{ + int x, y, error; + for (x = 0, error = -r, y = r; y >= 0; y--) { ++ /* Iterate X until we can pass to the next line. */ + while (error < 0) { + error += 2*x + 1; + x++; + if (seg_flags & GP_CIRCLE_SEG3) + PUTPIXEL(context, xcenter-x+1, ycenter-y, pixval); + if (seg_flags & GP_CIRCLE_SEG4) + PUTPIXEL(context, xcenter+x-1, ycenter-y, pixval); + if (seg_flags & GP_CIRCLE_SEG2) + PUTPIXEL(context, xcenter-x+1, ycenter+y, pixval); + if (seg_flags & GP_CIRCLE_SEG1) + PUTPIXEL(context, xcenter+x-1, ycenter+y, pixval); + } ++ /* Enough changes accumulated, go to next line. */ + error += -2*y + 1; + if (seg_flags & GP_CIRCLE_SEG3) + PUTPIXEL(context, xcenter-x+1, ycenter-y, pixval); + if (seg_flags & GP_CIRCLE_SEG4) + PUTPIXEL(context, xcenter+x-1, ycenter-y, pixval); + if (seg_flags & GP_CIRCLE_SEG2) + PUTPIXEL(context, xcenter-x+1, ycenter+y, pixval); + if (seg_flags & GP_CIRCLE_SEG1) + PUTPIXEL(context, xcenter+x-1, ycenter+y, pixval); + } +} ----------------------------------------------------------------------- Summary of changes: include/gfx/{GP_Triangle.h => GP_CircleSeg.h} | 52 +++++++---- include/gfx/GP_Gfx.h | 1 + libs/gfx/{GP_Circle.c => GP_CircleSeg.c} | 98 ++++++++++----------- libs/gfx/algo/{Circle.algo.h => CircleSeg.algo.h} | 30 ++++--- 4 files changed, 99 insertions(+), 82 deletions(-) copy include/gfx/{GP_Triangle.h => GP_CircleSeg.h} (55%) copy libs/gfx/{GP_Circle.c => GP_CircleSeg.c} (59%) copy libs/gfx/algo/{Circle.algo.h => CircleSeg.algo.h} (85%) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 566ed587e8f01232c84c2aba46d1861a20cd0c27
by metan 07 Jan '12

07 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated discards 730f353131afe02ce53c9957b1e80009abba59e4 (commit) via 566ed587e8f01232c84c2aba46d1861a20cd0c27 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (730f353131afe02ce53c9957b1e80009abba59e4) N -- N -- N (566ed587e8f01232c84c2aba46d1861a20cd0c27) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/566ed587e8f01232c84c2aba46d1861a20cd… commit 566ed587e8f01232c84c2aba46d1861a20cd0c27 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Jan 6 20:36:48 2012 +0100 core: Use table for gamma correction. diff --git a/include/core/GP_GammaCorrection.h b/include/core/GP_GammaCorrection.h index d36b1a9..d7d9d9c 100644 --- a/include/core/GP_GammaCorrection.h +++ b/include/core/GP_GammaCorrection.h @@ -24,6 +24,36 @@ Gamma correction. + What is gamma and what is it doing in my computer? + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + First of all gamma is a function, or better there is a gamma function and + it's inverse function. Both gamma function and it's inverse are defined on + interval [0,1] and are defined as out = in^(gamma) and it's inverse as + out = in^(1/gamma). + + The purpose of this function is to compensate nonlinearity of human eye + perception. The human eye is more sensitive to dark tones than the light ones + so without gamma correction storage and manipulation with image data would + either be less efficient in space (in case you decided to use more bits and + encode the image lineary) or quantization in darker tones would be more + visible resulting in "pixelated" images (aliasing). + + So there is a gamma, the internet seems to suggest that usual values for + gamma are 2.5 for old CRT monitors and about 2.2 for LCD ones, ideally you + should have color profile for your device (you need special hardware to + measure it). So if you are trying to draw linear gradient on the screen + you need to generate sequence of numbers accordinly to gamma function + (the 50% intensity is around 186 for gamma = 2.2 and 8bit grayscale pixel). + + Moreover image formats tend to save data in nonlinear fashion (some formats + include gama value used to for the image) so before you apply filter that + manipulates with pixel values, you need to convert it to linear space (adding + some more bits to compensate for rounding errors). + + Also it's important to take gamma into accound if you start drawing anti + aliased shapes, you can't get right results if you don't consider gamma. + */ #ifndef CORE_GP_GAMMA_CORRECTION_H @@ -32,16 +62,17 @@ #include <stdint.h> #include <math.h> -#define GP_GAMMA 2.2 +extern uint8_t *GP_LinearToGamma_8bit; /* * Coverts linear 0 255 value into 0 255 gama value. * - * (this is used for Anti Aliased gfx primitives. + * (this is used for Anti Aliased gfx primitives.) */ -static inline uint8_t GP_GammaToLinear(uint8_t val) +static inline uint8_t GP_LinearToGamma(uint8_t val) { - return pow(1.00 * val/255, 1/GP_GAMMA) * 255 + 0.5; + + return GP_LinearToGamma_8bit[val]; } #endif /* CORE_GP_GAMMA_CORRECTION_H */ diff --git a/libs/core/GP_GammaCorrection.gen.c.t b/libs/core/GP_GammaCorrection.gen.c.t new file mode 100644 index 0000000..0fdd467 --- /dev/null +++ b/libs/core/GP_GammaCorrection.gen.c.t @@ -0,0 +1,30 @@ +%% extends "base.c.t" + +{% block descr %}Gamma correction tables for Gamma = 2.2{% endblock %} + +%% block body + +/* + * Gamma correction tables. + * + * Copyright (c) 2012 Cyril Hrubis <metan(a)ucw.cz> + */ + +#include <stdint.h> + +/* + * 8-bit linear to gamma translation table. + */ +static uint8_t linear_to_gamma_8bit[] = { +%% for i in range(0, 256) + {{ int(((float(i)/255) ** (1/2.2)) * 255 + 0.5) }}, /* {{i}} */ +%% endfor +}; + +/* + * Pointer to 8 bit translation table. + */ +uint8_t *GP_LinearToGamma_8bit = linear_to_gamma_8bit; + + +%% endblock body diff --git a/libs/core/Makefile b/libs/core/Makefile index 3af4933..2baef75 100644 --- a/libs/core/Makefile +++ b/libs/core/Makefile @@ -1,5 +1,6 @@ TOPDIR=../.. -GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c GP_Convert.gen.c +GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c GP_Convert.gen.c + GP_GammaCorrection.gen.c CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=core diff --git a/libs/gfx/GP_RectAA.c b/libs/gfx/GP_RectAA.c index 69ddd8f..a48d72e 100644 --- a/libs/gfx/GP_RectAA.c +++ b/libs/gfx/GP_RectAA.c @@ -53,7 +53,7 @@ void GP_FillRectXYXY_AA_Raw(GP_Context *context, GP_Coord x0, GP_Coord y0, /* Special case, vertical 1px line */ if (out_x0 == out_x1) { - uint8_t mix = GP_GammaToLinear(w); + uint8_t mix = GP_LinearToGamma(w); GP_Coord i; /* Special case 1px 100% width line */ @@ -71,7 +71,7 @@ void GP_FillRectXYXY_AA_Raw(GP_Context *context, GP_Coord x0, GP_Coord y0, /* Special case, horizontal 1px line */ if (out_y0 == out_y1) { - uint8_t mix = GP_GammaToLinear(h); + uint8_t mix = GP_LinearToGamma(h); GP_Coord i; /* Special case 1px 100% height line */ @@ -105,7 +105,7 @@ void GP_FillRectXYXY_AA_Raw(GP_Context *context, GP_Coord x0, GP_Coord y0, /* if the outer and innter coordinates doesn't match, draw blurred edge */ if (in_y0 != out_y0) { - uint8_t mix = GP_GammaToLinear(GP_FP_FROM_INT(in_y0) + GP_FP_1_2 - y0); + uint8_t mix = GP_LinearToGamma(GP_FP_FROM_INT(in_y0) + GP_FP_1_2 - y0); GP_Coord i; for (i = out_x0; i <= out_x1; i++) { @@ -116,7 +116,7 @@ void GP_FillRectXYXY_AA_Raw(GP_Context *context, GP_Coord x0, GP_Coord y0, } if (in_y1 != out_y1) { - uint8_t mix = GP_GammaToLinear(y1 - GP_FP_FROM_INT(in_y0) - GP_FP_1_2); + uint8_t mix = GP_LinearToGamma(y1 - GP_FP_FROM_INT(in_y0) - GP_FP_1_2); GP_Coord i; for (i = out_x0; i <= out_x1; i++) { @@ -127,7 +127,7 @@ void GP_FillRectXYXY_AA_Raw(GP_Context *context, GP_Coord x0, GP_Coord y0, } if (in_x0 != out_x0) { - uint8_t mix = GP_GammaToLinear(GP_FP_FROM_INT(in_x0) + GP_FP_1_2 - x0); + uint8_t mix = GP_LinearToGamma(GP_FP_FROM_INT(in_x0) + GP_FP_1_2 - x0); GP_Coord i; for (i = out_y0; i <= out_y1; i++) { @@ -138,7 +138,7 @@ void GP_FillRectXYXY_AA_Raw(GP_Context *context, GP_Coord x0, GP_Coord y0, } if (in_x1 != out_x1) { - uint8_t mix = GP_GammaToLinear(x1 - GP_FP_FROM_INT(in_x1) - GP_FP_1_2); + uint8_t mix = GP_LinearToGamma(x1 - GP_FP_FROM_INT(in_x1) - GP_FP_1_2); GP_Coord i; for (i = out_y0; i <= out_y1; i++) { ----------------------------------------------------------------------- Summary of changes: include/core/GP_GammaCorrection.h | 32 ++++++++++++++++++++++++++++++-- libs/core/GP_GammaCorrection.gen.c.t | 30 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 libs/core/GP_GammaCorrection.gen.c.t repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0