- Gfxprim - ucw.cz

[repo.or.cz] gfxprim.git branch master updated: 59b7db7636f17da18520d71c091dd9c23694ea91
by metan 09 Apr '13

09 Apr '13

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 59b7db7636f17da18520d71c091dd9c23694ea91 (commit) via c5adff16bfbf788991b9417d59a72d3d91645348 (commit) from 4e5922461f14819e66ba93de4097db1fd5343c4c (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/59b7db7636f17da18520d71c091dd9c23694… commit 59b7db7636f17da18520d71c091dd9c23694ea91 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Apr 9 13:59:05 2013 +0200 loaders: LoadImage: Fixes. * Set errno to ENOSYS when signature loader was not found * close file if image signature wasn't read (fixes memleak) Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/loaders/GP_Loader.c b/libs/loaders/GP_Loader.c index 07ef69c..4e154e9 100644 --- a/libs/loaders/GP_Loader.c +++ b/libs/loaders/GP_Loader.c @@ -217,26 +217,37 @@ static const GP_Loader *loader_by_signature(const char *path) FILE *f; int err; - GP_DEBUG(1, "Trying to load a file by signature"); + const GP_Loader *ret; + + GP_DEBUG(1, "Trying to load by file signature"); f = fopen(path, "rb"); if (f == NULL) { err = errno; GP_DEBUG(1, "Failed to open file '%s'", path); - errno = err; - return NULL; + goto err0; } if (fread(buf, sizeof(buf), 1, f) < 1) { GP_DEBUG(1, "Failed to read start of the file '%s'", path); - errno = EIO; - return NULL; + err = EIO; + goto err1; } fclose(f); - return GP_MatchSignature(buf); + ret = GP_MatchSignature(buf); + + if (ret == NULL) + errno = ENOSYS; + + return ret; +err1: + fclose(f); +err0: + errno = err; + return NULL; } GP_Context *GP_LoadImage(const char *src_path, GP_ProgressCallback *callback) http://repo.or.cz/w/gfxprim.git/commit/c5adff16bfbf788991b9417d59a72d3d9164… commit c5adff16bfbf788991b9417d59a72d3d91645348 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Apr 9 13:04:01 2013 +0200 tests: loaders_suite: Fixes. * Update the negative loader testcases - Write 32 zero bytes to the dummy file so that signature could be read by the loader - Add check malloc flag Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/tests/loaders/loaders_suite.c b/tests/loaders/loaders_suite.c index 3802caa..1de4fef 100644 --- a/tests/loaders/loaders_suite.c +++ b/tests/loaders/loaders_suite.c @@ -399,30 +399,70 @@ struct file_testcase { int expected_errno; }; +enum file_flags { + FILE_CREATE = 0x01, + FILE_FILL = 0x02, +}; + static struct file_testcase file_testcases[] = { - {"a", 1, ENOSYS}, - {".a", 1, ENOSYS}, - {"a.", 1, ENOSYS}, - {".bc", 1, ENOSYS}, - {"bc", 1, ENOSYS}, - {"abc", 1, ENOSYS}, - {"png.", 1, ENOSYS}, - {"jpg.", 1, ENOSYS}, - {"gif.", 1, ENOSYS}, - {"jpeg.", 1, ENOSYS}, - {"bmp.", 1, ENOSYS}, - {".jpg", 1, EIO}, - {"img.jpg", 1, EIO}, - {".png", 1, EIO}, - {"img.png", 1, EIO}, - {".gif", 1, EIO}, - {"img.gif", 1, EIO}, - {".bmp", 1, EIO}, - {"img.bmp", 1, EIO}, - {".pbm", 1, EIO}, - {".pgm", 1, EIO}, - {".ppm", 1, EIO}, + /* + * Should fail the file signature based loader + * as the signature could have been loaded but + * the file format is unknown. + */ + {"a", FILE_CREATE | FILE_FILL, ENOSYS}, + {".a", FILE_CREATE | FILE_FILL, ENOSYS}, + {"a.", FILE_CREATE | FILE_FILL, ENOSYS}, + {".bc", FILE_CREATE | FILE_FILL, ENOSYS}, + {"bc", FILE_CREATE | FILE_FILL, ENOSYS}, + {"abc", FILE_CREATE | FILE_FILL, ENOSYS}, + + /* + * Should fail the corresponding loader and + * then fail the signature based loader too. + */ + {"wrong.png", FILE_CREATE | FILE_FILL, ENOSYS}, + {"wrong.jpg", FILE_CREATE | FILE_FILL, ENOSYS}, + {"wrong.gif", FILE_CREATE | FILE_FILL, ENOSYS}, + {"wrong.jpeg", FILE_CREATE | FILE_FILL, ENOSYS}, + {"wrong.bmp", FILE_CREATE | FILE_FILL, ENOSYS}, + {"wrong.psp", FILE_CREATE | FILE_FILL, ENOSYS}, + {"wrong.tif", FILE_CREATE | FILE_FILL, ENOSYS}, + {"wrong.tiff", FILE_CREATE | FILE_FILL, ENOSYS}, + + /* + * Should start signature-based loader and + * fail it to read start of the file. + */ + {"b", FILE_CREATE, EIO}, + {".b", FILE_CREATE, EIO}, + {"b.", FILE_CREATE, EIO}, + {".dc", FILE_CREATE, EIO}, + {"dc", FILE_CREATE, EIO}, + {"cba", FILE_CREATE, EIO}, + + /* + * Dtto but for hits the extension based + * loader first and fail to read image header + * in the particular loader. + */ + {"empty.jpg", FILE_CREATE, EIO}, + {"empty.png", FILE_CREATE, EIO}, + {"empty.gif", FILE_CREATE, EIO}, + {"empty.jpeg", FILE_CREATE, EIO}, + {"empty.bmp", FILE_CREATE, EIO}, + {"empty.psp", FILE_CREATE, EIO}, + {"empty.tif", FILE_CREATE, EIO}, + {"empty.tiff", FILE_CREATE, EIO}, + + {".jpg", FILE_CREATE, EIO}, + {".png", FILE_CREATE, EIO}, + {".gif", FILE_CREATE, EIO}, + {".jpeg", FILE_CREATE, EIO}, + {".bmp", FILE_CREATE, EIO}, + {".psp", FILE_CREATE, EIO}, + {".tiff", FILE_CREATE, EIO}, {"not_here.jpg", 0, ENOENT}, @@ -437,14 +477,27 @@ static int test_Load(void) /* Create empty files */ for (i = 0; file_testcases[i].filename != NULL; i++) { - - if (file_testcases[i].create != 1) + + if (!(file_testcases[i].create & FILE_CREATE)) continue; - FILE *f = fopen(file_testcases[i].filename, "w"); + FILE *f = fopen(file_testcases[i].filename, "wb"); + + if (f != NULL) { + char buf[128] = {0}; + + if (file_testcases[i].create & FILE_FILL) { + if (fwrite(buf, sizeof(buf), 1, f) != 1) + tst_msg("Failed to write to '%s'", + file_testcases[i].filename); + + } - if (f != NULL) fclose(f); + } else { + tst_msg("Failed to open file '%s' for writing", + file_testcases[i].filename); + } } for (i = 0; file_testcases[i].filename != NULL; i++) { @@ -469,7 +522,7 @@ static int test_Load(void) continue; } - if (file_testcases[i].expected_errno != errno) { + if (file_testcases[i].expected_errno != saved_errno) { tst_msg("Expected errno %i (%s) got %i (%s) on '%s'", file_testcases[i].expected_errno, strerror(file_testcases[i].expected_errno), @@ -623,7 +676,7 @@ const struct tst_suite tst_suite = { /* Generic GP_LoadImage test */ {.name = "Image Load", .tst_fn = test_Load, - .flags = TST_TMPDIR}, + .flags = TST_TMPDIR | TST_CHECK_MALLOC}, /* Callback abort tests */ {.name = "PNG Load abort", .tst_fn = test_PNG_Load_abort, ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_Loader.c | 23 ++++++-- tests/loaders/loaders_suite.c | 109 ++++++++++++++++++++++++++++++----------- 2 files changed, 98 insertions(+), 34 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: 4e5922461f14819e66ba93de4097db1fd5343c4c
by metan 08 Apr '13

08 Apr '13

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 4e5922461f14819e66ba93de4097db1fd5343c4c (commit) via e721ab54137f3fd2507cca0c6263181b7738a245 (commit) via f8f2f1760b2b9cbfb7d1f08c8ef21c7e1520fd34 (commit) via 2cbd315068e8420d15539d287deaa9342129d1b2 (commit) via 75abfe3dd34074497567b4c373ab968a8c1a70c2 (commit) from 9616b4dac5b3d857003e4be82328b689b4d5194d (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/4e5922461f14819e66ba93de4097db1fd534… commit 4e5922461f14819e66ba93de4097db1fd5343c4c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 8 15:10:46 2013 +0200 core: ContextAlloc: Add check for zero width/height + test. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/core/GP_Context.c b/libs/core/GP_Context.c index ff65884..6279890 100644 --- a/libs/core/GP_Context.c +++ b/libs/core/GP_Context.c @@ -50,6 +50,12 @@ GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type) GP_DEBUG(1, "Allocating context %u x %u - %s", w, h, GP_PixelTypeName(type)); + if (w <= 0 || h <= 0) { + GP_WARN("Trying to allocate context with zero width and/or height"); + errno = EINVAL; + return NULL; + } + pixels = malloc(bpr * h); context = malloc(sizeof(GP_Context)); diff --git a/tests/core/Context.c b/tests/core/Context.c index af26656..fbabf17 100644 --- a/tests/core/Context.c +++ b/tests/core/Context.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -25,6 +25,7 @@ Very basic GP_Context tests. */ +#include <errno.h> #include <core/GP_Context.h> @@ -204,6 +205,43 @@ static int SubContext_Create(void) return TST_SUCCESS; } +static int context_zero_w(void) +{ + GP_Context *c; + + c = GP_ContextAlloc(0, 200, GP_PIXEL_G8); + + if (c != NULL) { + tst_msg("Context with zero width successfuly allocated"); + return TST_FAILED; + } + + if (errno != EINVAL) { + tst_msg("Expected errno set to EINVAL"); + return TST_FAILED; + } + + return TST_SUCCESS; +} + +static int context_zero_h(void) +{ + GP_Context *c; + + c = GP_ContextAlloc(200, 0, GP_PIXEL_G8); + + if (c != NULL) { + tst_msg("Context with zero height successfuly allocated"); + return TST_FAILED; + } + + if (errno != EINVAL) { + tst_msg("Expected errno set to EINVAL"); + return TST_FAILED; + } + + return TST_SUCCESS; +} const struct tst_suite tst_suite = { .suite_name = "Context Testsuite", @@ -215,6 +253,10 @@ const struct tst_suite tst_suite = { .flags = TST_CHECK_MALLOC}, {.name = "SubContext Create", .tst_fn = SubContext_Create}, + {.name = "Context Create w = 0", + .tst_fn = context_zero_w}, + {.name = "Context Create h = 0", + .tst_fn = context_zero_h}, {.name = NULL}, } }; http://repo.or.cz/w/gfxprim.git/commit/e721ab54137f3fd2507cca0c6263181b7738… commit e721ab54137f3fd2507cca0c6263181b7738a245 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 8 14:59:04 2013 +0200 loaders: BMP: Add check for non-zero width and height. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/loaders/GP_BMP.c b/libs/loaders/GP_BMP.c index d2c7683..cb7a61b 100644 --- a/libs/loaders/GP_BMP.c +++ b/libs/loaders/GP_BMP.c @@ -575,6 +575,12 @@ GP_Context *GP_ReadBMP(FILE *f, GP_ProgressCallback *callback) if ((err = read_bitmap_header(f, &header))) goto err1; + if (header.w <= 0 || header.h == 0) { + GP_WARN("Width and/or Height is not > 0"); + err = EIO; + goto err1; + } + if (header.compress_type != COMPRESS_RGB) { GP_DEBUG(2, "Unknown compression type"); err = ENOSYS; http://repo.or.cz/w/gfxprim.git/commit/f8f2f1760b2b9cbfb7d1f08c8ef21c7e1520… commit f8f2f1760b2b9cbfb7d1f08c8ef21c7e1520fd34 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 8 14:52:49 2013 +0200 loaders: BMP: Adapt to the ByteUtils. * Fix existing usage * Make use in header loader Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/loaders/GP_BMP.c b/libs/loaders/GP_BMP.c index 8254bac..d2c7683 100644 --- a/libs/loaders/GP_BMP.c +++ b/libs/loaders/GP_BMP.c @@ -150,21 +150,16 @@ static uint32_t get_palette_size(struct bitmap_info_header *header) static int read_bitmap_info_header(FILE *f, struct bitmap_info_header *header) { - uint8_t buf[36]; + uint16_t nr_planes; - if (fread(buf, 1, sizeof(buf), f) != sizeof(buf)) { + if (GP_FRead(f, "L4 L4 L2 L2 L4 I12 L4 I4", + &header->w, &header->h, &nr_planes, &header->bpp, + &header->compress_type, &header->palette_colors) != 8) { + GP_DEBUG(1, "Failed to read bitmap info header"); return EIO; } - 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", @@ -648,12 +643,12 @@ static int bmp_write_header(struct bitmap_info_header *header, FILE *f) uint32_t file_size = bitmap_size + header->header_size + 14; /* Bitmap Header */ - if (GP_FWrite(f, "%a2%l4%x00%x00%x00%x00%l4", "BM", + if (GP_FWrite(f, "A2 L4 0x00 0x00 0x00 0x00 L4", "BM", file_size, header->pixel_offset) != 7) return EIO; /* Bitmap Info Header */ - if (GP_FWrite(f, "%l4%l4%l4%l2%l2%l4%l4%l4%l4%l4%l4", + if (GP_FWrite(f, "L4 L4 L4 L2 L2 L4 L4 L4 L4 L4 L4", header->header_size, header->w, header->h, 1, header->bpp, header->compress_type, bitmap_size, 0, 0, header->palette_colors, 0) != 11) http://repo.or.cz/w/gfxprim.git/commit/2cbd315068e8420d15539d287deaa9342129… commit 2cbd315068e8420d15539d287deaa9342129d1b2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 8 14:30:49 2013 +0200 loaders: Change ByteUtils format string. Making the format string more readable. Also fix a few bugs. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/c_simple/byte_utils.c b/demos/c_simple/byte_utils.c index 0b122f0..4c9053f 100644 --- a/demos/c_simple/byte_utils.c +++ b/demos/c_simple/byte_utils.c @@ -50,7 +50,7 @@ static void write_file(void) uint8_t bpp = 4; char *sig = "MG"; - ret = GP_FWrite(f, "%a2%x00%x00%b2%b2%b1", sig, w, h, bpp); + ret = GP_FWrite(f, "A2 0x00 0x00 B2 B2 B1", sig, w, h, bpp); if (ret != 6) printf("Failed to write header, ret = %in", ret); @@ -75,9 +75,9 @@ static void read_file(void) uint8_t bpp; char sig[3] = {0}; - ret = GP_FRead(f, "%a2%x00%x00%b2%b2%b1", sig, &w, &h, &bpp); + ret = GP_FRead(f, "A2 I2 B2 B2 B1", sig, &w, &h, &bpp); - if (ret != 6) + if (ret != 5) printf("Failed to read header, ret = %in", ret); printf("SIG=%s, w=%u, h=%u, bpp=%un", sig, w, h, bpp); diff --git a/include/loaders/GP_ByteUtils.h b/include/loaders/GP_ByteUtils.h index 0ec4732..cfa4bea 100644 --- a/include/loaders/GP_ByteUtils.h +++ b/include/loaders/GP_ByteUtils.h @@ -34,10 +34,14 @@ /* * The format string examples: * - * %l1 or %b1 assigns one byte - * %l2 assign two bytes in little endian - * %b4 assign four bytes in big endian - * %a6 read six bytes into array + * Type Modifiers: + * + * L - little endian (passed as value to write, passed as pointer to read) + * B - big endian + * A - byte array (passed as bointer for both read and write) + * I - ignore xxx bytes, GP_Fread() only + * + * Size Modifiers are just numbers. * * To read and write header with two byte signature, two reserved zero bytes * and size in 16 bit unsigned little endian variables. @@ -46,10 +50,10 @@ * uint16_t h; * char sig[2]; * - * if (GP_FWrite(f, "%a2%x00%x00%l2%l2", "SG", w, h) != 5) + * if (GP_FWrite(f, "A2 0x00 0x00 L2 L2", "SG", w, h) != 5) * //ERROR * - * if (GP_FRead(f, "%a2%x00%x00%l2%l2", sig, &w, &h) != 5) + * if (GP_FRead(f, "A2 I2 L2 L2", sig, &w, &h) != 4) * //ERROR */ diff --git a/libs/loaders/GP_ByteUtils.c b/libs/loaders/GP_ByteUtils.c index 9c88319..32abdd1 100644 --- a/libs/loaders/GP_ByteUtils.c +++ b/libs/loaders/GP_ByteUtils.c @@ -45,7 +45,7 @@ static int ctoi(char c, int *i) { switch (c) { case '0' ... '9': - *i += c - '0'; + *i = c - '0'; break; default: return 1; @@ -83,31 +83,37 @@ static const char *get_hex(const char *fmt, int *type, int *val) *val = 0; - if (ctoh(fmt[0], val)) + if (fmt[0] != 'x') { + GP_BUG("Expected x after 0 in hex constant"); + return NULL; + } + + if (ctoh(fmt[1], val)) return NULL; (*val)<<=4; - if (ctoh(fmt[1], val)) + if (ctoh(fmt[2], val)) return NULL; - return fmt + 2; + return fmt + 3; } static const char *get_int(const char *fmt, int *val) { - int i = 0; + int i = 0, add = 0; *val = 0; if (ctoi(fmt[i++], val)) return fmt; - - while (!ctoi(fmt[i], val)) { + + while (!ctoi(fmt[i], &add)) { *val *= 10; + *val += add; i++; } - + return fmt + i; } @@ -126,10 +132,8 @@ static const char *get_array(const char *fmt, int *type, int *val) static const char *get_lb_size(const char *fmt, int *val) { - *val = 0; - if (ctoi(fmt[0], val)) { - GP_WARN("Expected number after %%l or %%b, got '%c'", fmt[0]); + GP_WARN("Expected number got '%c'", fmt[0]); return NULL; } @@ -146,38 +150,33 @@ static const char *get_lb_size(const char *fmt, int *val) static const char *get_next(const char *fmt, int *type, int *val) { - if (fmt[0] == '0') - return NULL; - - if (fmt[0] != '%') { - GP_BUG("Unexpected character in format string '%c'", fmt[0]); - return NULL; - } - - switch (fmt[1]) { - /* byte array */ - case 'a': - return get_array(fmt + 2, type, val); + /* Eat spaces */ + while (fmt[0] == ' ') + fmt++; + + switch (fmt[0]) { + /* Byte array */ + case 'A': + return get_array(fmt + 1, type, val); break; - /* hexadecimal constant */ - case 'x': - return get_hex(fmt + 2, type, val); + /* Hexadecimal constant */ + case '0': + return get_hex(fmt + 1, type, val); break; /* 1, 2, 4 bytes long variable in defined endianity */ - case 'l': + case 'L': *type = LITTLE_ENDIAN_VAR; - return get_lb_size(fmt + 2, val); + return get_lb_size(fmt + 1, val); break; - case 'b': + case 'B': *type = BIG_ENDIAN_VAR; - return get_lb_size(fmt + 2, val); + return get_lb_size(fmt + 1, val); break; - case 'i': + case 'I': *type = IGNORE; - return get_int(fmt + 2, val); + return get_int(fmt + 1, val); break; case '0': - GP_BUG("Unexpecned end of format string"); return NULL; break; } http://repo.or.cz/w/gfxprim.git/commit/75abfe3dd34074497567b4c373ab968a8c1a… commit 75abfe3dd34074497567b4c373ab968a8c1a70c2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 8 14:02:21 2013 +0200 loaders: Finish ByteUtils. Add code to handle the endianity, needs to be tested. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/loaders/GP_ByteUtils.c b/libs/loaders/GP_ByteUtils.c index e1c6ac0..9c88319 100644 --- a/libs/loaders/GP_ByteUtils.c +++ b/libs/loaders/GP_ByteUtils.c @@ -22,7 +22,14 @@ #include <stdarg.h> +#ifdef __linux__ +#include <endian.h> +#else /* BSD Family */ +#include <machine/endian.h> +#endif + #include "core/GP_Debug.h" +#include "core/GP_Common.h" #include "loaders/GP_ByteUtils.h" @@ -60,10 +67,10 @@ static int ctoh(char c, int *i) *i += c - 'A' + 10; break; case '0': - GP_WARN("Unexpected end of the format string"); + GP_BUG("Unexpected end of the format string"); return 1; default: - GP_WARN("Expected [0-9]|[a-f][A-F] in hex constant, got '%c'", c); + GP_BUG("Expected [0-9]|[a-f][A-F] in hex constant, got '%c'", c); return 1; } @@ -133,7 +140,7 @@ static const char *get_lb_size(const char *fmt, int *val) return fmt + 1; } - GP_WARN("Invalid little/big endian variable size '%i'", *val); + GP_BUG("Invalid little/big endian variable size '%i'", *val); return NULL; } @@ -143,7 +150,7 @@ static const char *get_next(const char *fmt, int *type, int *val) return NULL; if (fmt[0] != '%') { - GP_WARN("Unexpected character in format string '%c'", fmt[0]); + GP_BUG("Unexpected character in format string '%c'", fmt[0]); return NULL; } @@ -166,21 +173,48 @@ static const char *get_next(const char *fmt, int *type, int *val) return get_lb_size(fmt + 2, val); break; case 'i': - + *type = IGNORE; + return get_int(fmt + 2, val); break; case '0': - GP_WARN("Unexpecned end of format string"); + GP_BUG("Unexpecned end of format string"); return NULL; break; } - GP_WARN("Unexpected character in format string '%c'", fmt[0]); + GP_BUG("Unexpected character in format string '%c'", fmt[0]); return NULL; } +static void swap_bytes(void *ptr, int len, int type) +{ + if (__BYTE_ORDER == __LITTLE_ENDIAN && type == LITTLE_ENDIAN_VAR) + return; + + if (__BYTE_ORDER == __BIG_ENDIAN && type == BIG_ENDIAN_VAR) + return; + + char *buf = ptr; + + switch (len) { + case 1: + break; + case 2: + GP_SWAP(buf[0], buf[1]); + break; + case 4: + GP_SWAP(buf[0], buf[3]); + GP_SWAP(buf[1], buf[2]); + break; + default: + GP_BUG("Invalid size %i", len); + } +} + int GP_FRead(FILE *f, const char *fmt, ...) { int type, val, ret = 0; + void *ptr; va_list va; va_start(va, fmt); @@ -203,13 +237,20 @@ int GP_FRead(FILE *f, const char *fmt, ...) break; case LITTLE_ENDIAN_VAR: case BIG_ENDIAN_VAR: - if (fread(va_arg(va, void*), val, 1, f) != 1) + ptr = va_arg(va, void*); + + if (fread(ptr, val, 1, f) != 1) goto end; - //TODO: Fix byteorder + + swap_bytes(ptr, val, type); break; case IGNORE: - + while (val--) + fgetc(f); break; + default: + GP_BUG("Wrong format type for reading (%i)", type); + goto end; } ret++; @@ -224,6 +265,9 @@ int GP_FWrite(FILE *f, const char *fmt, ...) { int type, val, ret = 0; va_list va; + uint8_t u8; + uint16_t u16; + uint32_t u32; va_start(va, fmt); @@ -246,25 +290,31 @@ int GP_FWrite(FILE *f, const char *fmt, ...) case LITTLE_ENDIAN_VAR: case BIG_ENDIAN_VAR: switch (val) { - case 1: { - uint8_t c = va_arg(va, int); - if (fwrite(&c, 1, 1, f) != 1) + case 1: + u8 = va_arg(va, int); + if (fwrite(&u8, 1, 1, f) != 1) goto end; - } break; - case 2: { - uint16_t c = va_arg(va, int); - if (fwrite(&c, 2, 1, f) != 1) + break; + case 2: + u16 = va_arg(va, int); + + swap_bytes(&u16, 2, type); + + if (fwrite(&u16, 2, 1, f) != 1) goto end; - } break; - case 4: { - uint32_t c = va_arg(va, int); - if (fwrite(&c, 4, 1, f) != 1) + break; + case 4: + u32 = va_arg(va, int); + + swap_bytes(&u32, 4, type); + + if (fwrite(&u32, 4, 1, f) != 1) goto end; - } break; + break; } break; default: - GP_WARN("Wrong format type for writing"); + GP_BUG("Wrong format type for writing (%i)", type); goto end; } ----------------------------------------------------------------------- Summary of changes: demos/c_simple/byte_utils.c | 6 +- include/loaders/GP_ByteUtils.h | 16 +++-- libs/core/GP_Context.c | 6 ++ libs/loaders/GP_BMP.c | 25 ++++--- libs/loaders/GP_ByteUtils.c | 155 ++++++++++++++++++++++++++-------------- tests/core/Context.c | 44 +++++++++++- 6 files changed, 177 insertions(+), 75 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: 9616b4dac5b3d857003e4be82328b689b4d5194d
by metan 07 Apr '13

07 Apr '13

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 9616b4dac5b3d857003e4be82328b689b4d5194d (commit) from c4b2c1ed8cf06687ca6a06ab796b7a46ca77208d (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/9616b4dac5b3d857003e4be82328b689b4d5… commit 9616b4dac5b3d857003e4be82328b689b4d5194d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 23:33:50 2013 +0200 build: Update list of loaders symbols. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/build/syms/Loaders_symbols.txt b/build/syms/Loaders_symbols.txt index 5d56104..683c410 100644 --- a/build/syms/Loaders_symbols.txt +++ b/build/syms/Loaders_symbols.txt @@ -1,3 +1,6 @@ +GP_FWrite +GP_FRead + GP_MatchJPG GP_OpenJPG GP_ReadJPG @@ -18,6 +21,7 @@ GP_MatchBMP GP_OpenBMP GP_LoadBMP GP_ReadBMP +GP_SaveBMP GP_MatchPSP GP_OpenPSP ----------------------------------------------------------------------- Summary of changes: build/syms/Loaders_symbols.txt | 4 ++++ 1 files changed, 4 insertions(+), 0 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: c4b2c1ed8cf06687ca6a06ab796b7a46ca77208d
by metan 07 Apr '13

07 Apr '13

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 c4b2c1ed8cf06687ca6a06ab796b7a46ca77208d (commit) via 029a50e8bb82d282b92f16a123eb1529455bbf89 (commit) from 3ae34478305da75d4c561719c3f458a6814a8b78 (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/c4b2c1ed8cf06687ca6a06ab796b7a46ca77… commit c4b2c1ed8cf06687ca6a06ab796b7a46ca77208d Merge: 3ae3447 029a50e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 22:50:17 2013 +0200 Merge ssh://192.168.1.100/home/metan/Devel/gfxprim http://repo.or.cz/w/gfxprim.git/commit/029a50e8bb82d282b92f16a123eb1529455b… commit 029a50e8bb82d282b92f16a123eb1529455bbf89 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 22:37:42 2013 +0200 doc: general: Update supported image formats. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/general.txt b/doc/general.txt index 34bc888..260e186 100644 --- a/doc/general.txt +++ b/doc/general.txt @@ -89,6 +89,12 @@ images into various standard formats (PNG, JPEG, GIF, BMP, PNM, etc...). | BMP | | [green]*Yes* | [green]#RLE and RGB Bitfields not implemented# | + [green]#RGB888 only# + +| TIFF | + Tagged Image File Format | + [green]*Yes* | + [gray]#Not finished# | [black]*No* | PSP | ----------------------------------------------------------------------- Summary of changes: doc/general.txt | 6 ++++++ 1 files changed, 6 insertions(+), 0 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: 3ae34478305da75d4c561719c3f458a6814a8b78
by metan 07 Apr '13

07 Apr '13

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 3ae34478305da75d4c561719c3f458a6814a8b78 (commit) from c23cf7d15a7d1535d837b81022cc9d41ac095f2f (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/3ae34478305da75d4c561719c3f458a6814a… commit 3ae34478305da75d4c561719c3f458a6814a8b78 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 19:47:32 2013 +0200 libs: loaders: GP_Load() Fix. Return NULL when extension loader failed and signature loader matches the extension loader. This fixes the wrong extension warning once for all. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/loaders/GP_Loader.c b/libs/loaders/GP_Loader.c index f084576..07ef69c 100644 --- a/libs/loaders/GP_Loader.c +++ b/libs/loaders/GP_Loader.c @@ -277,15 +277,15 @@ GP_Context *GP_LoadImage(const char *src_path, GP_ProgressCallback *callback) return img; } + sig_load = loader_by_signature(src_path); + /* - * Avoid further work if signature was correct but the loader issued - * ENOSYS or ECANCELED. + * Avoid further work if extension matches the signature but image + * couldn't be loaded. Probably unimplemented format or damaged file. */ - if (ext_load != NULL && (errno == ENOSYS || errno == ECANCELED)) + if (ext_load == sig_load) return NULL; - sig_load = loader_by_signature(src_path); - if (ext_load && sig_load) { GP_WARN("File '%s': Extension says %s but signature %s", src_path, ext_load->fmt_name, sig_load->fmt_name); ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_Loader.c | 10 +++++----- 1 files changed, 5 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: c23cf7d15a7d1535d837b81022cc9d41ac095f2f
by metan 07 Apr '13

07 Apr '13

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 c23cf7d15a7d1535d837b81022cc9d41ac095f2f (commit) via 6fa181b2108180d30144c84a08416c918cbacf69 (commit) from 439dd5a9d066e953868fb93356a8b48e362ef7c2 (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/c23cf7d15a7d1535d837b81022cc9d41ac09… commit c23cf7d15a7d1535d837b81022cc9d41ac095f2f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 19:12:41 2013 +0200 loaders: BMP: Experimental BMP writer for RGB888. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/include/loaders/GP_BMP.h b/include/loaders/GP_BMP.h index 63473ea..e5ad3a7 100644 --- a/include/loaders/GP_BMP.h +++ b/include/loaders/GP_BMP.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -63,6 +63,13 @@ GP_Context *GP_ReadBMP(FILE *f, GP_ProgressCallback *callback); GP_Context *GP_LoadBMP(const char *src_path, GP_ProgressCallback *callback); /* + * Saves BMP to a file. Zero is returned on succes. Upon failure non-zero is + * returned and errno is filled accordingly. + */ +int GP_SaveBMP(const GP_Context *src, const char *dst_path, + GP_ProgressCallback *callback); + +/* * Match BMP signature. */ int GP_MatchBMP(const void *buf); diff --git a/libs/loaders/GP_BMP.c b/libs/loaders/GP_BMP.c index 42cfa23..8254bac 100644 --- a/libs/loaders/GP_BMP.c +++ b/libs/loaders/GP_BMP.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -39,7 +39,9 @@ #include "core/GP_Debug.h" #include "core/GP_Pixel.h" #include "core/GP_GetPutPixel.h" -#include "GP_BMP.h" + +#include "loaders/GP_ByteUtils.h" +#include "loaders/GP_BMP.h" #define BMP_HEADER_OFFSET 0x0a /* info header offset - 4 bytes */ @@ -619,21 +621,144 @@ GP_Context *GP_LoadBMP(const char *src_path, GP_ProgressCallback *callback) return GP_ReadBMP(f, callback); } +/* + * Rows in bmp are four byte aligned. + */ +static uint32_t bmp_align_row_size(uint32_t width_bits) +{ + uint32_t bytes = (width_bits/8) + !!(width_bits%8); + if (bytes%4) + bytes += 4 - bytes%4; -int GP_SaveBMP(const GP_Context *src, const char *dst_path, GP_ProgressCallback *callback) + return bytes; +} + +/* + * For uncompressd images + */ +static uint32_t bmp_count_bitmap_size(struct bitmap_info_header *header) { - FILE *f; + return header->h * bmp_align_row_size(header->bpp * header->w); +} + +static int bmp_write_header(struct bitmap_info_header *header, FILE *f) +{ + uint32_t bitmap_size = bmp_count_bitmap_size(header); + uint32_t file_size = bitmap_size + header->header_size + 14; + + /* Bitmap Header */ + if (GP_FWrite(f, "%a2%l4%x00%x00%x00%x00%l4", "BM", + file_size, header->pixel_offset) != 7) + return EIO; + + /* Bitmap Info Header */ + if (GP_FWrite(f, "%l4%l4%l4%l2%l2%l4%l4%l4%l4%l4%l4", + header->header_size, header->w, header->h, 1, + header->bpp, header->compress_type, bitmap_size, 0, 0, + header->palette_colors, 0) != 11) + return EIO; + + return 0; +} +static int bmp_fill_header(const GP_Context *src, struct bitmap_info_header *header) +{ switch (src->pixel_type) { case GP_PIXEL_RGB888: - + header->bpp = 24; break; default: - errno = ENOSYS; - return 1; + GP_DEBUG(1, "Unsupported pixel type (%s)", + GP_PixelTypeName(src->pixel_type)); + return ENOSYS; } - GP_DEBUG(1, "Saving PNG Image '%s'", dst_path); + header->w = src->w; + header->h = src->h; + + /* Most common 40 bytes Info Header */ + header->header_size = BITMAPINFOHEADER; + + /* No compression or palette */ + header->palette_colors = 0; + header->compress_type = COMPRESS_RGB; + + /* image data follows the header */ + header->pixel_offset = header->header_size + 14; + + return 0; +} + +static int bmp_write_data(FILE *f, const GP_Context *src, GP_ProgressCallback *callback) +{ + int y; + uint32_t padd_len = 0; + char padd[3] = {0}; + + if (src->bytes_per_row%4) + padd_len = 4 - src->bytes_per_row%4; + + for (y = src->h - 1; y >= 0; y--) { + void *row = GP_PIXEL_ADDR(src, 0, y); + + if (fwrite(row, src->bytes_per_row, 1, f) != 1) + return EIO; + /* write padding */ + if (padd_len) + if (fwrite(padd, padd_len, 1, f) != 1) + return EIO; + + if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) { + GP_DEBUG(1, "Operation aborted"); + return ECANCELED; + } + } + + return 0; +} + +int GP_SaveBMP(const GP_Context *src, const char *dst_path, + GP_ProgressCallback *callback) +{ + struct bitmap_info_header header; + FILE *f; + int err; + + GP_DEBUG(1, "Saving BMP Image '%s'", dst_path); + + if ((err = bmp_fill_header(src, &header))) + goto err0; + + f = fopen(dst_path, "wb"); + + if (f == NULL) { + err = errno; + GP_DEBUG(1, "Failed to open '%s' for writing: %s", + dst_path, strerror(errno)); + goto err0; + } + + if ((err = bmp_write_header(&header, f))) + goto err1; + + if ((err = bmp_write_data(f, src, callback))) + goto err1; + + if (fclose(f)) { + err = errno; + GP_DEBUG(1, "Failed to close file '%s': %s", + dst_path, strerror(errno)); + goto err1; + } + + GP_ProgressCallbackDone(callback); + + return 0; +err1: + fclose(f); +err0: + errno = err; + return 1; } diff --git a/libs/loaders/GP_Loader.c b/libs/loaders/GP_Loader.c index 9f4f4ad..f084576 100644 --- a/libs/loaders/GP_Loader.c +++ b/libs/loaders/GP_Loader.c @@ -77,7 +77,7 @@ static GP_Loader ppm_loader = { static GP_Loader bmp_loader = { .Load = GP_LoadBMP, - .Save = NULL, + .Save = GP_SaveBMP, .Match = GP_MatchBMP, .fmt_name = "BMP", .next = &ppm_loader, http://repo.or.cz/w/gfxprim.git/commit/6fa181b2108180d30144c84a08416c918cba… commit 6fa181b2108180d30144c84a08416c918cbacf69 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 17:41:45 2013 +0200 loaders: Add ByteUtils. ByteUtils provide GP_FWrite() and GP_FRead() functions to ease reading and writing image file headers. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index 547fdfd..b4a24d2 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -19,7 +19,7 @@ APPS=backend_example loaders_example loaders filters_symmetry gfx_koch v4l2_show v4l2_grab convolution weighted_median shapetest koch input_example fileview linetest randomshapetest fonttest loaders_register blittest textaligntest abort sin_AA x11_windows- debug_handler gaussian_noise + debug_handler gaussian_noise byte_utils ifeq ($(HAVE_LIBSDL),yes) APPS+=SDL_glue diff --git a/demos/c_simple/byte_utils.c b/demos/c_simple/byte_utils.c new file mode 100644 index 0000000..0b122f0 --- /dev/null +++ b/demos/c_simple/byte_utils.c @@ -0,0 +1,93 @@ +/***************************************************************************** + * 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-2013 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +/* + * Byte utils are utils to ease reading and parsing various image headers. + * + * This is internal API for loaders. + */ + +#include <stdint.h> +#include <stdio.h> + +#include <loaders/GP_ByteUtils.h> + +#define FILENAME "file.tmp" + +static void write_file(void) +{ + FILE *f; + int ret; + + f = fopen(FILENAME, "wb"); + + if (f == NULL) { + fprintf(stderr, "Failed to open file '" FILENAME "'"); + return; + } + + uint16_t w = 800; + uint16_t h = 600; + uint8_t bpp = 4; + char *sig = "MG"; + + ret = GP_FWrite(f, "%a2%x00%x00%b2%b2%b1", sig, w, h, bpp); + + if (ret != 6) + printf("Failed to write header, ret = %in", ret); + + fclose(f); +} + +static void read_file(void) +{ + FILE *f; + int ret; + + f = fopen(FILENAME, "rb"); + + if (f == NULL) { + fprintf(stderr, "Failed to open file '" FILENAME "'"); + return; + } + + uint16_t w; + uint16_t h; + uint8_t bpp; + char sig[3] = {0}; + + ret = GP_FRead(f, "%a2%x00%x00%b2%b2%b1", sig, &w, &h, &bpp); + + if (ret != 6) + printf("Failed to read header, ret = %in", ret); + + printf("SIG=%s, w=%u, h=%u, bpp=%un", sig, w, h, bpp); + + fclose(f); +} + +int main(void) +{ + write_file(); + read_file(); + return 0; +} diff --git a/include/loaders/GP_ByteUtils.h b/include/loaders/GP_ByteUtils.h new file mode 100644 index 0000000..0ec4732 --- /dev/null +++ b/include/loaders/GP_ByteUtils.h @@ -0,0 +1,70 @@ +/***************************************************************************** + * 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-2013 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + + /* + + Utils to read/write bytes in specified endianity. + + */ + +#ifndef LOADERS_GP_BYTE_UTILS_H +#define LOADERS_GP_BYTE_UTILS_H + +#include <stdio.h> + +/* + * The format string examples: + * + * %l1 or %b1 assigns one byte + * %l2 assign two bytes in little endian + * %b4 assign four bytes in big endian + * %a6 read six bytes into array + * + * To read and write header with two byte signature, two reserved zero bytes + * and size in 16 bit unsigned little endian variables. + * + * uint16_t w; + * uint16_t h; + * char sig[2]; + * + * if (GP_FWrite(f, "%a2%x00%x00%l2%l2", "SG", w, h) != 5) + * //ERROR + * + * if (GP_FRead(f, "%a2%x00%x00%l2%l2", sig, &w, &h) != 5) + * //ERROR + */ + +/* + * Printf-like function to read bytes from a file. + * + * Returns number of characters read. + */ +int GP_FRead(FILE *f, const char *fmt, ...); + +/* + * Printf-like function to write bytes to a file. + * + * Returns number of characters read. + */ +int GP_FWrite(FILE *f, const char *fmt, ...); + +#endif /* LOADERS_GP_BYTE_UTILS_H */ diff --git a/libs/loaders/GP_ByteUtils.c b/libs/loaders/GP_ByteUtils.c new file mode 100644 index 0000000..e1c6ac0 --- /dev/null +++ b/libs/loaders/GP_ByteUtils.c @@ -0,0 +1,276 @@ +/***************************************************************************** + * 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-2013 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <stdarg.h> + +#include "core/GP_Debug.h" + +#include "loaders/GP_ByteUtils.h" + +enum fmt_type { + BYTE_ARRAY, + BIG_ENDIAN_VAR, + LITTLE_ENDIAN_VAR, + IGNORE, + CONST_BYTE, +}; + +static int ctoi(char c, int *i) +{ + switch (c) { + case '0' ... '9': + *i += c - '0'; + break; + default: + return 1; + } + + return 0; +} + +static int ctoh(char c, int *i) +{ + switch (c) { + case '0' ... '9': + *i += c - '0'; + break; + case 'a' ... 'f': + *i += c - 'a' + 10; + break; + case 'A' ... 'F': + *i += c - 'A' + 10; + break; + case '0': + GP_WARN("Unexpected end of the format string"); + return 1; + default: + GP_WARN("Expected [0-9]|[a-f][A-F] in hex constant, got '%c'", c); + return 1; + } + + return 0; +} + +static const char *get_hex(const char *fmt, int *type, int *val) +{ + *type = CONST_BYTE; + + *val = 0; + + if (ctoh(fmt[0], val)) + return NULL; + + (*val)<<=4; + + if (ctoh(fmt[1], val)) + return NULL; + + return fmt + 2; +} + +static const char *get_int(const char *fmt, int *val) +{ + int i = 0; + + *val = 0; + + if (ctoi(fmt[i++], val)) + return fmt; + + while (!ctoi(fmt[i], val)) { + *val *= 10; + i++; + } + + return fmt + i; +} + +static const char *get_array(const char *fmt, int *type, int *val) +{ + *type = BYTE_ARRAY; + + fmt = get_int(fmt, val); + + /* array for one element "%a" */ + if (*val == 0) + *val = 1; + + return fmt; +} + +static const char *get_lb_size(const char *fmt, int *val) +{ + *val = 0; + + if (ctoi(fmt[0], val)) { + GP_WARN("Expected number after %%l or %%b, got '%c'", fmt[0]); + return NULL; + } + + switch (*val) { + case 1: + case 2: + case 4: + return fmt + 1; + } + + GP_WARN("Invalid little/big endian variable size '%i'", *val); + return NULL; +} + +static const char *get_next(const char *fmt, int *type, int *val) +{ + if (fmt[0] == '0') + return NULL; + + if (fmt[0] != '%') { + GP_WARN("Unexpected character in format string '%c'", fmt[0]); + return NULL; + } + + switch (fmt[1]) { + /* byte array */ + case 'a': + return get_array(fmt + 2, type, val); + break; + /* hexadecimal constant */ + case 'x': + return get_hex(fmt + 2, type, val); + break; + /* 1, 2, 4 bytes long variable in defined endianity */ + case 'l': + *type = LITTLE_ENDIAN_VAR; + return get_lb_size(fmt + 2, val); + break; + case 'b': + *type = BIG_ENDIAN_VAR; + return get_lb_size(fmt + 2, val); + break; + case 'i': + + break; + case '0': + GP_WARN("Unexpecned end of format string"); + return NULL; + break; + } + + GP_WARN("Unexpected character in format string '%c'", fmt[0]); + return NULL; +} + +int GP_FRead(FILE *f, const char *fmt, ...) +{ + int type, val, ret = 0; + va_list va; + + va_start(va, fmt); + + for (;;) { + fmt = get_next(fmt, &type, &val); + + /* end of the string or error */ + if (fmt == NULL) + goto end; + + switch (type) { + case BYTE_ARRAY: + if (fread(va_arg(va, void*), val, 1, f) != 1) + goto end; + break; + case CONST_BYTE: + if (fgetc(f) != val) + goto end; + break; + case LITTLE_ENDIAN_VAR: + case BIG_ENDIAN_VAR: + if (fread(va_arg(va, void*), val, 1, f) != 1) + goto end; + //TODO: Fix byteorder + break; + case IGNORE: + + break; + } + + ret++; + + } +end: + va_end(va); + return ret; +} + +int GP_FWrite(FILE *f, const char *fmt, ...) +{ + int type, val, ret = 0; + va_list va; + + va_start(va, fmt); + + for (;;) { + fmt = get_next(fmt, &type, &val); + + /* end of the string or error */ + if (fmt == NULL) + goto end; + + switch (type) { + case BYTE_ARRAY: + if (fwrite(va_arg(va, void*), val, 1, f) != 1) + goto end; + break; + case CONST_BYTE: + if (fwrite(&val, 1, 1, f) != 1) + goto end; + break; + case LITTLE_ENDIAN_VAR: + case BIG_ENDIAN_VAR: + switch (val) { + case 1: { + uint8_t c = va_arg(va, int); + if (fwrite(&c, 1, 1, f) != 1) + goto end; + } break; + case 2: { + uint16_t c = va_arg(va, int); + if (fwrite(&c, 2, 1, f) != 1) + goto end; + } break; + case 4: { + uint32_t c = va_arg(va, int); + if (fwrite(&c, 4, 1, f) != 1) + goto end; + } break; + } + break; + default: + GP_WARN("Wrong format type for writing"); + goto end; + } + + ret++; + } +end: + va_end(va); + return ret; +} ----------------------------------------------------------------------- Summary of changes: demos/c_simple/Makefile | 2 +- demos/c_simple/{showimage.c => byte_utils.c} | 91 ++++--- include/loaders/GP_BMP.h | 9 +- .../{gfx/GP_HLineAA.h => loaders/GP_ByteUtils.h} | 57 +++-- libs/loaders/GP_BMP.c | 141 ++++++++++- libs/loaders/GP_ByteUtils.c | 276 ++++++++++++++++++++ libs/loaders/GP_Loader.c | 2 +- 7 files changed, 508 insertions(+), 70 deletions(-) copy demos/c_simple/{showimage.c => byte_utils.c} (62%) copy include/{gfx/GP_HLineAA.h => loaders/GP_ByteUtils.h} (63%) create mode 100644 libs/loaders/GP_ByteUtils.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: 439dd5a9d066e953868fb93356a8b48e362ef7c2
by metan 07 Apr '13

07 Apr '13

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 439dd5a9d066e953868fb93356a8b48e362ef7c2 (commit) via d99b07df27d20a4e1ac3b076d85bc93944da2ace (commit) via a419617bbc0c241562487bd5c9657d4afaefe212 (commit) from 4a5f6e9c0502172948711721b8b455f0a0d0baec (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/439dd5a9d066e953868fb93356a8b48e362e… commit 439dd5a9d066e953868fb93356a8b48e362ef7c2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 11:55:08 2013 +0200 loaders: PNG: Fix errno propagation. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/loaders/GP_BMP.c b/libs/loaders/GP_BMP.c index 3ed5161..42cfa23 100644 --- a/libs/loaders/GP_BMP.c +++ b/libs/loaders/GP_BMP.c @@ -618,3 +618,22 @@ GP_Context *GP_LoadBMP(const char *src_path, GP_ProgressCallback *callback) return GP_ReadBMP(f, callback); } + + + +int GP_SaveBMP(const GP_Context *src, const char *dst_path, GP_ProgressCallback *callback) +{ + FILE *f; + + switch (src->pixel_type) { + case GP_PIXEL_RGB888: + + break; + default: + errno = ENOSYS; + return 1; + } + + GP_DEBUG(1, "Saving PNG Image '%s'", dst_path); + +} diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index 1c11d54..b1b725d 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -504,7 +504,8 @@ int GP_SavePNG(const GP_Context *src, const char *dst_path, if (prepare_png_header(src, NULL, NULL, NULL)) { GP_DEBUG(1, "Can't save png with %s pixel type", GP_PixelTypeName(src->pixel_type)); - return ENOSYS; + err = ENOSYS; + goto err0; } f = fopen(dst_path, "wb"); http://repo.or.cz/w/gfxprim.git/commit/d99b07df27d20a4e1ac3b076d85bc93944da… commit d99b07df27d20a4e1ac3b076d85bc93944da2ace Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 11:51:10 2013 +0200 tests: loaders: Add basic tests for SavePNG(). Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/tests/loaders/PNG.c b/tests/loaders/PNG.c index ad9381e..fce0193 100644 --- a/tests/loaders/PNG.c +++ b/tests/loaders/PNG.c @@ -33,6 +33,8 @@ static int test_load_PNG(const char *path) { GP_Context *img; + errno = 0; + img = GP_LoadPNG(path, NULL); if (img == NULL) { @@ -55,46 +57,114 @@ static int test_load_PNG(const char *path) return TST_SUCCESS; } +static int test_save_PNG(GP_PixelType pixel_type) +{ + GP_Context *ctx; + int ret; + + ctx = GP_ContextAlloc(100, 100, pixel_type); + + if (ctx == NULL) { + tst_msg("Failed to allocate context"); + return TST_UNTESTED; + } + + errno = 0; + + ret = GP_SavePNG(ctx, "/dev/null", NULL); + + if (ret == 0) { + tst_msg("Saved successfully"); + GP_ContextFree(ctx); + return TST_SUCCESS; + } + + switch (errno) { + case ENOSYS: + tst_msg("Not Implemented"); + GP_ContextFree(ctx); + return TST_SUCCESS; + default: + tst_msg("Failed and errno is not ENOSYS (%i)", errno); + GP_ContextFree(ctx); + return TST_FAILED; + } +} + const struct tst_suite tst_suite = { .suite_name = "PNG", .tests = { /* PNG loader tests */ - {.name = "PNG 100x100 RGB", + {.name = "PNG Load 100x100 RGB", .tst_fn = test_load_PNG, .res_path = "data/png/valid/100x100-red.png", .data = "100x100-red.png", .flags = TST_TMPDIR | TST_CHECK_MALLOC}, - {.name = "PNG 100x100 RGB 50% alpha", + {.name = "PNG Load 100x100 RGB 50% alpha", .tst_fn = test_load_PNG, .res_path = "data/png/valid/100x100-red-alpha.png", .data = "100x100-red-alpha.png", .flags = TST_TMPDIR | TST_CHECK_MALLOC}, - {.name = "PNG 100x100 8 bit Grayscale", + {.name = "PNG Load 100x100 8 bit Grayscale", .tst_fn = test_load_PNG, .res_path = "data/png/valid/100x100-black-grayscale.png", .data = "100x100-black-grayscale.png", .flags = TST_TMPDIR | TST_CHECK_MALLOC}, - {.name = "PNG 100x100 8 bit Grayscale + alpha", + {.name = "PNG Load 100x100 8 bit Grayscale + alpha", .tst_fn = test_load_PNG, .res_path = "data/png/valid/100x100-black-grayscale-alpha.png", .data = "100x100-black-grayscale-alpha.png", .flags = TST_TMPDIR | TST_CHECK_MALLOC}, - {.name = "PNG 100x100 Palette + alpha", + {.name = "PNG Load 100x100 Palette + alpha", .tst_fn = test_load_PNG, .res_path = "data/png/valid/100x100-palette-alpha.png", .data = "100x100-palette-alpha.png", .flags = TST_TMPDIR | TST_CHECK_MALLOC}, - {.name = "PNG 100x100 Palette", + {.name = "PNG Load 100x100 Palette", .tst_fn = test_load_PNG, .res_path = "data/png/valid/100x100-red-palette.png", .data = "100x100-red-palette.png", .flags = TST_TMPDIR | TST_CHECK_MALLOC}, + + {.name = "PNG Save 100x100 G1", + .tst_fn = test_save_PNG, + .data = (void*)GP_PIXEL_G1, + .flags = TST_CHECK_MALLOC}, + + {.name = "PNG Save 100x100 G2", + .tst_fn = test_save_PNG, + .data = (void*)GP_PIXEL_G2, + .flags = TST_CHECK_MALLOC}, + + {.name = "PNG Save 100x100 G4", + .tst_fn = test_save_PNG, + .data = (void*)GP_PIXEL_G4, + .flags = TST_CHECK_MALLOC}, + + {.name = "PNG Save 100x100 G8", + .tst_fn = test_save_PNG, + .data = (void*)GP_PIXEL_G8, + .flags = TST_CHECK_MALLOC}, + + {.name = "PNG Save 100x100 RGB888", + .tst_fn = test_save_PNG, + .data = (void*)GP_PIXEL_RGB888, + .flags = TST_CHECK_MALLOC}, + + {.name = "PNG Save 100x100 BGR888", + .tst_fn = test_save_PNG, + .data = (void*)GP_PIXEL_BGR888, + .flags = TST_CHECK_MALLOC}, + {.name = "PNG Save 100x100 G16", + .tst_fn = test_save_PNG, + .data = (void*)GP_PIXEL_G16, + .flags = TST_CHECK_MALLOC}, {.name = NULL}, } }; http://repo.or.cz/w/gfxprim.git/commit/a419617bbc0c241562487bd5c9657d4afaef… commit a419617bbc0c241562487bd5c9657d4afaefe212 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 11:20:32 2013 +0200 doc: More work on the python backends docs. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/backends_python.txt b/doc/backends_python.txt index e2b9096..32d5d9f 100644 --- a/doc/backends_python.txt +++ b/doc/backends_python.txt @@ -13,6 +13,10 @@ structure provides unified API for controlling the drawing. There is however generic backend initialization function that takes a string as a parameter that may contain backend-specific settings. + +BackendX11Init +^^^^^^^^^^^^^^ + [source,python] ------------------------------------------------------------------------------- import gfxprim.backends as backends @@ -33,6 +37,16 @@ The 'x', 'y', 'w' and 'h' parameters describe the window geometry. The 'x' and The last parameter are bitflags. TODO: Export bitflags and add a list here. +This backends supports multiple windows. Each time you call the initialization +routine new backend structure is returned. All backend instances share the Xlib +connection so you need to wait or poll only on one of them. Each backend, on +the other hand, has its own input queue. + +TIP: See multiple windows link:example_py_x11_windows.html[example]. + + +BackendInit +^^^^^^^^^^^ [source,python] ------------------------------------------------------------------------------- @@ -53,3 +67,65 @@ import gfxprim.backends as backends Initialize the backend params by the 'backend_string'. The last parameter is a file to print help or errors to. +TIP: See backend init link:example_py_backends.html[example]. + +Backend +^^^^^^^ + +Initialized backend has several members that allows you to draw on the screen +and control the backend behavior. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.core as core +import gfxprim.gfx as gfx +import gfxprim.backends as backends + + # Initialize backend + bk = backends.BackendInit("X11:100x100", "Window title", stderr) + + # Assert that inicialization was successful + assert(bk) + + # Now you can draw into the backend via bk.context + bk.context.gfx.Fill(bk.context.RGBToPixel(0, 0, 0)); + + # If backend is buffered, changes are not propagated unless the screen is + # updated via Flip() or UpdateRect() + bk.Flip() + +------------------------------------------------------------------------------- + +There are several functions to get input events such as keystrokes or pointer +movements. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.core as core +import gfxprim.input as input +import gfxprim.backends as backends + + + # Initialize backend + bk = backends.BackendInit("X11:100x100", "Window title", stderr) + + # Assert that inicialization was successful + assert(bk) + + # Now we can either poll for events via PollEvent() or wait via WaitEvent() + while True: + ev = WaitEvent(); + + if (ev.type == input.EV_KEY and ev.val.val == input.KEY_ESC): + sys.exit(0) + elif (ev.type == input.EV_SYS): + if (ev.code == input.EV_SYS_QUIT): + sys.exit(0) + if (ev.code == input.EV_SYS_RESIZE): + bk.ResizeAck() + redraw(bk) + +------------------------------------------------------------------------------- + + +TIP: See the complete link:example_py_backends.html[example]. diff --git a/doc/example_py_backends.txt b/doc/example_py_backends.txt new file mode 100644 index 0000000..625084c --- /dev/null +++ b/doc/example_py_backends.txt @@ -0,0 +1,8 @@ +Backend Init +------------ +.A simple program to demonstrate backend init function. + +[source,python] +------------------------------------------------------------------ +include::../demos/py_simple/backends.py[] +------------------------------------------------------------------ diff --git a/doc/example_py_x11_windows.txt b/doc/example_py_x11_windows.txt new file mode 100644 index 0000000..7d454a9 --- /dev/null +++ b/doc/example_py_x11_windows.txt @@ -0,0 +1,8 @@ +X11 Windows +----------- +.A simple program to demonstrate multiple windows with X11 + +[source,python] +------------------------------------------------------------------ +include::../demos/py_simple/x11_windows.py[] +------------------------------------------------------------------ ----------------------------------------------------------------------- Summary of changes: doc/backends_python.txt | 76 ++++++++++++++++++ ...{example_py_gfx.txt => example_py_backends.txt} | 8 +- ...ample_py_gfx.txt => example_py_x11_windows.txt} | 8 +- libs/loaders/GP_BMP.c | 19 +++++ libs/loaders/GP_PNG.c | 3 +- tests/loaders/PNG.c | 82 ++++++++++++++++++-- 6 files changed, 181 insertions(+), 15 deletions(-) copy doc/{example_py_gfx.txt => example_py_backends.txt} (54%) copy doc/{example_py_gfx.txt => example_py_x11_windows.txt} (54%) 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: 4a5f6e9c0502172948711721b8b455f0a0d0baec
by metan 07 Apr '13

07 Apr '13

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 4a5f6e9c0502172948711721b8b455f0a0d0baec (commit) via 8399da4d8c0369435e60b0b1bd9cef99e34e558e (commit) from 223fd9830a04557d0efe63b9d3df692867532af0 (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/4a5f6e9c0502172948711721b8b455f0a0d0… commit 4a5f6e9c0502172948711721b8b455f0a0d0baec Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 10:34:29 2013 +0200 backends: FB: Remove invalid close() The file descriptor is not open if open() has failed. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/backends/GP_LinuxFB.c b/libs/backends/GP_LinuxFB.c index 38d9ae4..54516d9 100644 --- a/libs/backends/GP_LinuxFB.c +++ b/libs/backends/GP_LinuxFB.c @@ -92,7 +92,6 @@ static int allocate_console(struct fb_priv *fb, int flag) if (fd < 0) { GP_DEBUG(1, "Opening console %s failed: %s", buf, strerror(errno)); - close(fd); return -1; } http://repo.or.cz/w/gfxprim.git/commit/8399da4d8c0369435e60b0b1bd9cef99e34e… commit 8399da4d8c0369435e60b0b1bd9cef99e34e558e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 10:33:16 2013 +0200 backends: BackendInit: Don't set errno on all failures. This makes possible to propagate the errno from backends. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/backends/GP_BackendInit.c b/libs/backends/GP_BackendInit.c index 5ae1615..1234a1c 100644 --- a/libs/backends/GP_BackendInit.c +++ b/libs/backends/GP_BackendInit.c @@ -64,6 +64,7 @@ static int sdl_params_to_flags(const char *param, GP_Size *w, GP_Size *h, } backend_sdl_help(help, "SDL: Invalid parameters"); + errno = EINVAL; return 1; } @@ -181,6 +182,7 @@ static int x11_params_to_flags(const char *param, GP_Size *w, GP_Size *h, } backend_x11_help(help, "X11: Invalid parameters"); + errno = EINVAL; return 1; } @@ -284,9 +286,6 @@ static GP_Backend *init_backend(const char *name, char *params, ret = backend_inits[i](params, caption, help); - if (ret == NULL) - errno = EINVAL; - return ret; } ----------------------------------------------------------------------- Summary of changes: libs/backends/GP_BackendInit.c | 5 ++--- libs/backends/GP_LinuxFB.c | 1 - 2 files changed, 2 insertions(+), 4 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: 223fd9830a04557d0efe63b9d3df692867532af0
by metan 07 Apr '13

07 Apr '13

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 223fd9830a04557d0efe63b9d3df692867532af0 (commit) from f8f30d3d8fef42b8abac47b127f1daa9ca4ac80f (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/223fd9830a04557d0efe63b9d3df69286753… commit 223fd9830a04557d0efe63b9d3df692867532af0 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 00:35:16 2013 +0200 pywrap: backends: Fix the typemap BackendInit() hack. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pylib/gfxprim/backends/backends.i b/pylib/gfxprim/backends/backends.i index f8ef6d4..6e5dc44 100644 --- a/pylib/gfxprim/backends/backends.i +++ b/pylib/gfxprim/backends/backends.i @@ -67,15 +67,15 @@ ERROR_ON_NULL(GP_BackendLinuxX11Init); return NULL; } - $1 = fdopen(fd, "w"); + $1 = fdopen(dup(fd), "w"); } } %exception GP_BackendInit { $action - //HACK: free the FILE* - free(arg3); + //HACK: fclose the FILE* + fclose(arg3); if (result == NULL) return PyErr_SetFromErrno(PyExc_OSError); ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/backends/backends.i | 6 +++--- 1 files changed, 3 insertions(+), 3 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: f8f30d3d8fef42b8abac47b127f1daa9ca4ac80f
by metan 07 Apr '13

07 Apr '13

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 f8f30d3d8fef42b8abac47b127f1daa9ca4ac80f (commit) via ee89ee1e6c2dd3cde4a5d6f986e09a543c6501fc (commit) via 5291a3ce26513aee909dd578fee1d715b9b992dd (commit) via 1f937a5b1a55b567c6e1b219b0afd3fa75be9678 (commit) via b99641b5107bd7ac383ccc8e809ed1d20689976d (commit) via 4bb000f1444cb139bc5c01a880660a1f4c86cde3 (commit) via 6308d59aa6b73e828afdecbd142051adf3071814 (commit) from 11237152b73f0794cd98e0de4c20ce180ac19535 (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/f8f30d3d8fef42b8abac47b127f1daa9ca4a… commit f8f30d3d8fef42b8abac47b127f1daa9ca4ac80f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 00:27:09 2013 +0200 doc: Update python backend docs. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/backends_python.txt b/doc/backends_python.txt index 512c1d1..e2b9096 100644 --- a/doc/backends_python.txt +++ b/doc/backends_python.txt @@ -36,15 +36,20 @@ The last parameter are bitflags. TODO: Export bitflags and add a list here. [source,python] ------------------------------------------------------------------------------- +from sys import stderr import gfxprim.backends as backends # This is a default init string backend_string = "X11:100x100" # Initialize backend by init string - bk = backends.BackendInit(backend_string, "Window title", None) + bk = backends.BackendInit(backend_string, "Window title", stderr) # Assert that inicialization was successful assert(bk) ------------------------------------------------------------------------------- + +Initialize the backend params by the 'backend_string'. The last parameter is a +file to print help or errors to. + http://repo.or.cz/w/gfxprim.git/commit/ee89ee1e6c2dd3cde4a5d6f986e09a543c65… commit ee89ee1e6c2dd3cde4a5d6f986e09a543c6501fc Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 00:25:24 2013 +0200 demos: py_simple: Pass the stderr as the last parameter. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/py_simple/backends.py b/demos/py_simple/backends.py index 83e4f74..6c53116 100755 --- a/demos/py_simple/backends.py +++ b/demos/py_simple/backends.py @@ -32,7 +32,7 @@ def main(): sys.exit(1) # Create backend window - bk = backends.BackendInit(backend_string, "Backend Example", None) + bk = backends.BackendInit(backend_string, "Backend Example", sys.stderr) assert(bk) redraw(bk) http://repo.or.cz/w/gfxprim.git/commit/5291a3ce26513aee909dd578fee1d715b9b9… commit 5291a3ce26513aee909dd578fee1d715b9b992dd Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 7 00:23:29 2013 +0200 pywrap: backends: Hack typemap for the BackendInit(..., FILE*) The Python 3 no longer uses FILE * for file object so we hack around that by creating temporal FILE* from the underlying file descriptor. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pylib/gfxprim/backends/backends.i b/pylib/gfxprim/backends/backends.i index d4b6b2c..f8ef6d4 100644 --- a/pylib/gfxprim/backends/backends.i +++ b/pylib/gfxprim/backends/backends.i @@ -32,14 +32,9 @@ ERROR_ON_NONZERO(GP_BackendResize); %include "GP_Backend.h" -ERROR_ON_NULL(GP_BackendInit); -%newobject GP_BackendInit; -%include "GP_BackendInit.h" - /* * Particular backends. */ - ERROR_ON_NULL(GP_BackendVirtualInit); %newobject GP_BackendVirtualInit; %include "GP_BackendVirtual.h" @@ -55,3 +50,37 @@ ERROR_ON_NULL(GP_BackendLinuxSDLInit); ERROR_ON_NULL(GP_BackendLinuxX11Init); %newobject GP_BackendX11Init; %include "GP_X11.h" + +/* + * Backend Init with a typemap for FILE* for the last parameter + * + * This is a ugly hack because Python 3 uses its own I/O buffers for file + * objects. + * + */ +%typemap(in) FILE* { + if ($input != Py_None) { + int fd = PyObject_AsFileDescriptor($input); + + if (fd < 0) { + PyErr_SetString(PyExc_TypeError, "$1_name must be a file type."); + return NULL; + } + + $1 = fdopen(fd, "w"); + } +} + +%exception GP_BackendInit { +$action + + //HACK: free the FILE* + free(arg3); + + if (result == NULL) + return PyErr_SetFromErrno(PyExc_OSError); +} + +%newobject GP_BackendInit; +%include "GP_BackendInit.h" + http://repo.or.cz/w/gfxprim.git/commit/1f937a5b1a55b567c6e1b219b0afd3fa75be… commit 1f937a5b1a55b567c6e1b219b0afd3fa75be9678 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 6 23:25:35 2013 +0200 doc: Start python backends docs. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/Makefile b/doc/Makefile index 3e17452..cf80c1c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -5,7 +5,7 @@ SOURCES=general.txt context.txt loaders.txt filters.txt basic_types.txt get_put_pixel.txt blits.txt progress_callback.txt text_api.txt event_queue.txt compilation.txt -SOURCES+=core_python.txt gfx_python.txt loaders_python.txt +SOURCES+=core_python.txt gfx_python.txt loaders_python.txt backends_python.txt EXAMPLE_SOURCES=$(wildcard example_*.txt) diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index 9c351e6..4829c02 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -60,6 +60,7 @@ endif::disable-javascript[] <li><a href="core_python.html">Core</a></li> <li><a href="gfx_python.html">Gfx</a></li> <li><a href="loaders_python.html">Loaders</a></li> + <li><a href="backends_python.html">Backends</a></li> </ul> </div> diff --git a/doc/backends_python.txt b/doc/backends_python.txt new file mode 100644 index 0000000..512c1d1 --- /dev/null +++ b/doc/backends_python.txt @@ -0,0 +1,50 @@ +Python Backends module +---------------------- + +The python binding maps mostly to the C API with the 'GP_' prefix stripped. + +Backend Initialization +~~~~~~~~~~~~~~~~~~~~~~ + +Instead of having one unified initialization interface each backend has it's +specific function and semantics but once backend is initialized the backend +structure provides unified API for controlling the drawing. + +There is however generic backend initialization function that takes a string +as a parameter that may contain backend-specific settings. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.backends as backends + + # Create 100x100 X11 window + bk = backends.BackendX11Init(None, x, y, w, h, "Window title", 0) + + # Assert that inicialization was successful + assert(bk) + +------------------------------------------------------------------------------- + +Creates a X11 window. First parameter is display string, pass 'None' for +default display. + +The 'x', 'y', 'w' and 'h' parameters describe the window geometry. The 'x' and +'y' are ignored by most of the window managers though. + +The last parameter are bitflags. TODO: Export bitflags and add a list here. + + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.backends as backends + + # This is a default init string + backend_string = "X11:100x100" + + # Initialize backend by init string + bk = backends.BackendInit(backend_string, "Window title", None) + + # Assert that inicialization was successful + assert(bk) + +------------------------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/b99641b5107bd7ac383ccc8e809ed1d20689… commit b99641b5107bd7ac383ccc8e809ed1d20689976d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 6 23:25:10 2013 +0200 demos: py_simple: Add BackendInit() example. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/py_simple/backends.py b/demos/py_simple/backends.py new file mode 100755 index 0000000..83e4f74 --- /dev/null +++ b/demos/py_simple/backends.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python + +import sys + +import gfxprim.core as core +import gfxprim.backends as backends +import gfxprim.gfx as gfx +import gfxprim.text as text +import gfxprim.input as input + +def redraw(bk): + c = bk.context + + black = c.RGBToPixel(0, 0, 0) + white = c.RGBToPixel(0xff, 0xff, 0xff) + + c.gfx.Fill(black) + + align = text.C.ALIGN_CENTER | text.C.VALIGN_CENTER + c.text.Text(None, c.w//2, c.h//2, align, white, black, "Hello World!") + + bk.Flip() + +def main(): + backend_string = "X11:100x100" + + if len(sys.argv) == 2: + backend_string = sys.argv[1] + + if len(sys.argv) > 2: + print("Usage: {} [backend init string]".format(sys.argv[0])) + sys.exit(1) + + # Create backend window + bk = backends.BackendInit(backend_string, "Backend Example", None) + assert(bk) + + redraw(bk) + + # Event loop + while True: + ev = bk.WaitEvent() + + input.EventDump(ev) + + if (ev.type == input.EV_KEY): + sys.exit(0) + elif (ev.type == input.EV_SYS): + if (ev.code == input.EV_SYS_QUIT): + sys.exit(0) + if (ev.code == input.EV_SYS_RESIZE): + bk.ResizeAck() + redraw(bk) + +if __name__ == '__main__': + main() diff --git a/demos/py_simple/x11_windows.py b/demos/py_simple/x11_windows.py index 04cfee2..bb656d3 100755 --- a/demos/py_simple/x11_windows.py +++ b/demos/py_simple/x11_windows.py @@ -17,7 +17,6 @@ def redraw(bk, id): c.gfx.Fill(black) align = text.C.ALIGN_CENTER | text.C.VALIGN_CENTER - c.text.Text(None, c.w//2, c.h//2, align, white, black, "{} - {}x{}".format(id, c.w, c.h)) bk.Flip() http://repo.or.cz/w/gfxprim.git/commit/4bb000f1444cb139bc5c01a880660a1f4c86… commit 4bb000f1444cb139bc5c01a880660a1f4c86cde3 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 6 22:49:59 2013 +0200 backends: SDL: Fix resize. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/backends/GP_SDL.c b/libs/backends/GP_SDL.c index 2312564..a4599ac 100644 --- a/libs/backends/GP_SDL.c +++ b/libs/backends/GP_SDL.c @@ -45,7 +45,11 @@ static GP_Context context; static uint32_t sdl_flags = SDL_SWSURFACE; +/* To hold size from resize event */ +static unsigned int new_w, new_h; + /* Backend API funcitons */ +static struct GP_Backend backend; static void sdl_flip(struct GP_Backend *self __attribute__((unused))) { @@ -73,15 +77,25 @@ static void sdl_update_rect(struct GP_Backend *self __attribute__((unused)), SDL_mutexV(mutex); } +static void sdl_put_event(SDL_Event *ev) +{ + if (ev->type == SDL_VIDEORESIZE) { + new_w = ev->resize.w; + new_h = ev->resize.h; + } + + GP_InputDriverSDLEventPut(&backend.event_queue, ev); +} + static void sdl_poll(struct GP_Backend *self __attribute__((unused))) { SDL_Event ev; SDL_mutexP(mutex); - + while (SDL_PollEvent(&ev)) - GP_InputDriverSDLEventPut(&self->event_queue, &ev); - + sdl_put_event(&ev); + SDL_mutexV(mutex); } @@ -92,10 +106,10 @@ static void sdl_wait(struct GP_Backend *self __attribute__((unused))) SDL_mutexP(mutex); SDL_WaitEvent(&ev); - GP_InputDriverSDLEventPut(&self->event_queue, &ev); + sdl_put_event(&ev); while (SDL_PollEvent(&ev)) - GP_InputDriverSDLEventPut(&self->event_queue, &ev); + sdl_put_event(&ev); SDL_mutexV(mutex); } @@ -147,24 +161,29 @@ static int sdl_set_attributes(struct GP_Backend *self, if (caption != NULL) SDL_WM_SetCaption(caption, caption); - if (w != 0 && h != 0) { - sdl_surface = SDL_SetVideoMode(w, h, 0, sdl_flags); - context_from_surface(&context, sdl_surface); - - /* Send event that resize was finished */ + /* Send only resize event, the actual resize is done in resize_ack */ + if (w != 0 && h != 0) GP_EventQueuePushResize(&self->event_queue, w, h, NULL); - } SDL_mutexV(mutex); return 0; } -static int sdl_resize_ack(struct GP_Backend *self) +static int sdl_resize_ack(struct GP_Backend *self __attribute__((unused))) { - GP_EventQueueSetScreenSize(&self->event_queue, - self->context->w, self->context->h); + GP_DEBUG(2, "Resizing the buffer to %ux%u", new_w, new_h); + + SDL_mutexP(mutex); + sdl_surface = SDL_SetVideoMode(new_w, new_h, 0, sdl_flags); + context_from_surface(backend.context, sdl_surface); + + GP_EventQueueSetScreenSize(&backend.event_queue, + backend.context->w, backend.context->h); + + SDL_mutexV(mutex); + return 0; } http://repo.or.cz/w/gfxprim.git/commit/6308d59aa6b73e828afdecbd142051adf307… commit 6308d59aa6b73e828afdecbd142051adf3071814 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 6 22:28:47 2013 +0200 libs: backends: Set errno to EINVAL if backend params are wrong. This makes the python trace understandable. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/backends/GP_BackendInit.c b/libs/backends/GP_BackendInit.c index e9a809c..5ae1615 100644 --- a/libs/backends/GP_BackendInit.c +++ b/libs/backends/GP_BackendInit.c @@ -21,6 +21,7 @@ *****************************************************************************/ #include <string.h> +#include <errno.h> #include "core/GP_Debug.h" @@ -272,14 +273,21 @@ static GP_Backend *init_backend(const char *name, char *params, const char *caption, FILE *help) { int i = get_backend(name); + GP_Backend *ret; if (i < 0) { GP_DEBUG(1, "Invalid backend name '%s'", name); print_help(help, "Invalid backend name"); + errno = EINVAL; return NULL; } - return backend_inits[i](params, caption, help); + ret = backend_inits[i](params, caption, help); + + if (ret == NULL) + errno = EINVAL; + + return ret; } GP_Backend *GP_BackendInit(const char *params, const char *caption, FILE *help) ----------------------------------------------------------------------- Summary of changes: demos/py_simple/backends.py | 56 +++++++++++++++++++++++++++++++++++++ demos/py_simple/x11_windows.py | 1 - doc/Makefile | 2 +- doc/asciidoc.conf | 1 + doc/backends_python.txt | 55 ++++++++++++++++++++++++++++++++++++ libs/backends/GP_BackendInit.c | 10 ++++++- libs/backends/GP_SDL.c | 47 +++++++++++++++++++++--------- pylib/gfxprim/backends/backends.i | 39 ++++++++++++++++++++++--- 8 files changed, 189 insertions(+), 22 deletions(-) create mode 100755 demos/py_simple/backends.py create mode 100644 doc/backends_python.txt 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