- Gfxprim - ucw.cz

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

08 May '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 c80b947b60c5cb4af6b5498b070a33b5baa15e69 (commit) via 8b59476b2b8ff0fb22c7a8cfc2c2deba295560c2 (commit) from d64232857f0895b73f637f3985442a2cda23da72 (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/c80b947b60c5cb4af6b5498b070a33b5baa1… commit c80b947b60c5cb4af6b5498b070a33b5baa15e69 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue May 8 16:35:19 2012 +0200 spiv: A few fixes. diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index 1a1369f..7ecf094 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -77,7 +77,8 @@ static int image_loader_callback(GP_ProgressCallback *self) size = GP_TextWidth(NULL, buf); - GP_BackendFlip(backend); + GP_BackendUpdateRect(backend, c->w/2 - size/2 - 1, c->h - 4, + c->w/2 + size/2 + 1, c->h - 4 - GP_TextHeight(NULL)); return 0; } @@ -173,7 +174,8 @@ static void *image_loader(void *ptr) if (rat < 1) { cpu_timer_start(&timer, "Blur"); callback.priv = "Blurring Image"; - if (GP_FilterGaussianBlur(img, img, 0.3/rat, 0.3/rat, &callback) == NULL) + if (GP_FilterGaussianBlur(img, img, 0.4/rat, 0.4/rat, + &callback) == NULL) return NULL; cpu_timer_stop(&timer); } @@ -294,7 +296,7 @@ static void sighandler(int signo) static void init_backend(const char *backend_opts) { - backend = GP_BackendInit(backend_opts, "FBshow", stderr); + backend = GP_BackendInit(backend_opts, "Spiv", stderr); if (backend == NULL) { fprintf(stderr, "Failed to initalize backend '%s'n", backend_opts); http://repo.or.cz/w/gfxprim.git/commit/8b59476b2b8ff0fb22c7a8cfc2c2deba2955… commit 8b59476b2b8ff0fb22c7a8cfc2c2deba295560c2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue May 8 16:04:20 2012 +0200 backends: X11 add support for pointer events. diff --git a/include/input/GP_Event.h b/include/input/GP_Event.h index 8f57588..e12d9ae 100644 --- a/include/input/GP_Event.h +++ b/include/input/GP_Event.h @@ -310,6 +310,11 @@ int GP_EventGet(struct GP_Event *ev); void GP_EventPushRel(int32_t rx, int32_t ry, struct timeval *time); /* + * Produces relative event that moves to the point x, y + */ +void GP_EventPushRelTo(uint32_t x, uint32_t y, struct timeval *time); + +/* * Inject absolute event. */ void GP_EventPushAbs(uint32_t x, uint32_t y, uint32_t pressure, diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index f12ade8..a19ea7b 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -111,8 +111,7 @@ static void x11_poll(GP_Backend *self) case MapNotify: GP_DEBUG(1, "Shown"); break; - case KeyPress: - case KeyRelease: + default: GP_InputDriverX11EventPut(&ev); break; } @@ -174,7 +173,9 @@ GP_Backend *GP_BackendX11Init(const char *display, int x, int y, /* Select events */ XSelectInput(x11->dpy, x11->win, StructureNotifyMask | ExposureMask | - KeyPressMask | KeyReleaseMask); + KeyPressMask | KeyReleaseMask | + ButtonPressMask | ButtonReleaseMask | + PointerMotionMask); /* Set window caption */ XmbSetWMProperties(x11->dpy, x11->win, caption, caption, diff --git a/libs/input/GP_Event.c b/libs/input/GP_Event.c index fb8c7d8..161c0de 100644 --- a/libs/input/GP_Event.c +++ b/libs/input/GP_Event.c @@ -129,14 +129,14 @@ const char *GP_EventKeyName(enum GP_EventKeyValue key) static void dump_rel(struct GP_Event *ev) { - printf("REL "); + printf("Rel "); switch (ev->code) { case GP_EV_REL_POS: - printf("POSSITION %u %un", ev->cursor_x, ev->cursor_y); + printf("Position %u %un", ev->cursor_x, ev->cursor_y); break; case GP_EV_REL_WHEEL: - printf("WHEEL %in", ev->val.val); + printf("Wheel %in", ev->val.val); break; } } @@ -148,7 +148,7 @@ static void dump_key(struct GP_Event *ev) if (ev->val.key.key < key_names_size) name = key_names[ev->val.key.key]; - printf("KEY %i (Key%s) %sn", + printf("Key %i (Key%s) %sn", ev->val.key.key, name, ev->code ? "down" : "up"); } @@ -157,7 +157,7 @@ static void dump_abs(struct GP_Event *ev) { switch (ev->code) { case GP_EV_ABS_POS: - printf("POSSITION %u %u %un", + printf("Position %u %u %un", ev->cursor_x, ev->cursor_y, ev->val.abs.pressure); break; } @@ -165,7 +165,7 @@ static void dump_abs(struct GP_Event *ev) void GP_EventDump(struct GP_Event *ev) { - printf("EVENT (%u) ", (unsigned int)ev->time.tv_sec % 10000); + printf("Event (%u) ", (unsigned int)ev->time.tv_sec % 10000); switch (ev->type) { case GP_EV_KEY: @@ -218,6 +218,14 @@ static uint32_t clip_rel(uint32_t val, uint32_t max, int32_t rel) return val + rel; } +void GP_EventPushRelTo(uint32_t x, uint32_t y, struct timeval *time) +{ + int32_t rx = x - cur_state.cursor_x; + int32_t ry = y - cur_state.cursor_y; + + GP_EventPushRel(rx, ry, time); +} + void GP_EventPushRel(int32_t rx, int32_t ry, struct timeval *time) { /* event header */ diff --git a/libs/input/GP_InputDriverX11.c b/libs/input/GP_InputDriverX11.c index d3b21c1..719ef3b 100644 --- a/libs/input/GP_InputDriverX11.c +++ b/libs/input/GP_InputDriverX11.c @@ -67,13 +67,10 @@ void GP_InputDriverX11EventPut(XEvent *ev) int key = 0, keycode, press = 0; switch (ev->type) { - /* - case SDL_MOUSEMOTION: - GP_EventPushRel(ev->motion.xrel, ev->motion.yrel, NULL); - break; - case SDL_MOUSEBUTTONDOWN: - case SDL_MOUSEBUTTONUP: - switch (ev->button.button) { + case ButtonPress: + press = 1; + case ButtonRelease: + switch (ev->xbutton.button) { case 1: key = GP_BTN_LEFT; break; @@ -83,13 +80,19 @@ void GP_InputDriverX11EventPut(XEvent *ev) case 3: key = GP_BTN_RIGHT; break; - default: + } + + if (key == 0) { + GP_DEBUG(0, "Unmapped X11 button %02x", + ev->xbutton.button); return; } - GP_EventPush(GP_EV_KEY, key, ev->button.state, NULL); + GP_EventPush(GP_EV_KEY, key, press, NULL); + break; + case MotionNotify: + GP_EventPushRelTo(ev->xmotion.x, ev->xmotion.y, NULL); break; - */ case KeyPress: press = 1; case KeyRelease: @@ -103,7 +106,6 @@ void GP_InputDriverX11EventPut(XEvent *ev) return; } - GP_DEBUG(0, "Mapped X11 keycode %02x", keycode); GP_EventPushKey(key, press, NULL); break; } ----------------------------------------------------------------------- Summary of changes: demos/spiv/spiv.c | 8 +++++--- include/input/GP_Event.h | 5 +++++ libs/backends/GP_X11.c | 7 ++++--- libs/input/GP_Event.c | 20 ++++++++++++++------ libs/input/GP_InputDriverX11.c | 24 +++++++++++++----------- 5 files changed, 41 insertions(+), 23 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: d64232857f0895b73f637f3985442a2cda23da72
by bluebear 07 May '12

07 May '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 d64232857f0895b73f637f3985442a2cda23da72 (commit) from 7e9e270e7fb4be007cd4027fa7130ac079bc8fd2 (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/d64232857f0895b73f637f3985442a2cda23… commit d64232857f0895b73f637f3985442a2cda23da72 Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Mon May 7 18:21:52 2012 +0200 Added the "doc" target to the main Makefile. diff --git a/post.mk b/post.mk index bafd7fb..84ef703 100644 --- a/post.mk +++ b/post.mk @@ -5,7 +5,7 @@ ifndef SUBDIRS SUBDIRS= endif -.PHONY: $(SUBDIRS) all clean rebuild help +.PHONY: $(SUBDIRS) all clean rebuild help doc all: $(SUBDIRS) clean: $(SUBDIRS) @@ -16,6 +16,8 @@ help: @echo "" @echo "help: prints this help" @echo "" + @echo "doc: builds (only) the documentation" + @echo "" @echo "clean: cleans current directory and all subdirectories" @echo "" @echo "all: make current directory and all subdirectories" @@ -26,6 +28,9 @@ help: @echo "'VERBOSE' shell variable as 'VERBOSE=1 make'" @echo "" +doc: + cd doc && make + # # Determine mode (eg do not generate anything if not in compile mode # ----------------------------------------------------------------------- Summary of changes: post.mk | 7 ++++++- 1 files changed, 6 insertions(+), 1 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: 7e9e270e7fb4be007cd4027fa7130ac079bc8fd2
by bluebear 07 May '12

07 May '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 7e9e270e7fb4be007cd4027fa7130ac079bc8fd2 (commit) from 4224d32b5a4eddd8751d8fd7fbc02dab74df125f (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/7e9e270e7fb4be007cd4027fa7130ac079bc… commit 7e9e270e7fb4be007cd4027fa7130ac079bc8fd2 Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Mon May 7 17:54:10 2012 +0200 Added new color values to the docs. diff --git a/doc/basic_types.txt b/doc/basic_types.txt index cab5435..f02688a 100644 --- a/doc/basic_types.txt +++ b/doc/basic_types.txt @@ -32,17 +32,24 @@ The 'GP_Color' enum is defined as follows: -------------------------------------------------------------------------------- typedef enum GP_Color { GP_COL_INVALID = -1, + + /* full-intensity RGB and CMYK */ GP_COL_BLACK, GP_COL_RED, GP_COL_GREEN, GP_COL_BLUE, GP_COL_YELLOW, + GP_COL_CYAN, + GP_COL_MAGENTA, + + /* various common mixes */ GP_COL_BROWN, GP_COL_ORANGE, - GP_COL_GRAY_DARK, + GP_COL_GRAY_DARK, /* exactly half RGB values of white */ GP_COL_GRAY_LIGHT, GP_COL_PURPLE, - GP_COL_WHITE, + + GP_COL_WHITE, /* full-intensity white */ GP_COL_MAX, } GP_Color; -------------------------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: doc/basic_types.txt | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 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: 4224d32b5a4eddd8751d8fd7fbc02dab74df125f
by bluebear 07 May '12

07 May '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 4224d32b5a4eddd8751d8fd7fbc02dab74df125f (commit) from d5b0a7ec7f7f9a3552742911a9d7528d5adf86c5 (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/4224d32b5a4eddd8751d8fd7fbc02dab74df… commit 4224d32b5a4eddd8751d8fd7fbc02dab74df125f Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Mon May 7 17:29:45 2012 +0200 Added cyan and magenta predefined colors (in order to have a complete CMYK) diff --git a/include/core/GP_Color.h b/include/core/GP_Color.h index 514fe82..4c3233b 100644 --- a/include/core/GP_Color.h +++ b/include/core/GP_Color.h @@ -46,6 +46,8 @@ typedef enum GP_Color { GP_COL_GREEN, GP_COL_BLUE, GP_COL_YELLOW, + GP_COL_CYAN, + GP_COL_MAGENTA, GP_COL_BROWN, GP_COL_ORANGE, GP_COL_GRAY_DARK, diff --git a/libs/core/GP_Color.c b/libs/core/GP_Color.c index bf055b2..e124577 100644 --- a/libs/core/GP_Color.c +++ b/libs/core/GP_Color.c @@ -37,6 +37,8 @@ static char *color_names[] = { "Green", "Blue", "Yellow", + "Cyan", + "Magenta", "Brown", "Orange", "DarkGray", @@ -51,21 +53,25 @@ static uint8_t rgb888_colors[][3] = { {0x00, 0xff, 0x00}, /* Green */ {0x00, 0x00, 0xff}, /* Blue */ {0xff, 0xff, 0x00}, /* Yellow */ + {0x00, 0xff, 0xff}, /* Cyan */ + {0xff, 0x00, 0xff}, /* Magenta */ {0xa5, 0x2a, 0x2a}, /* Brown */ {0xff, 0xa5, 0x00}, /* Orange */ {0x7f, 0x7f, 0x7f}, /* DarkGray */ - {0xbe, 0xbe, 0xbe}, /* LigthGray */ + {0xbe, 0xbe, 0xbe}, /* LightGray */ {0xa0, 0x20, 0xf0}, /* Purple */ {0xff, 0xff, 0xff}, /* White */ }; -/* 8-8-4 RGB palette */ +/* 3-2-3 RGB palette */ static uint8_t p8_colors[] = { 0x00, /* Black */ 0xe0, /* Red */ 0x1c, /* Green */ 0x03, /* Blue */ 0xfc, /* Yellow */ + 0x1f, /* Cyan */ + 0xe7, /* Magenta */ 0x88, /* Brown */ 0xf0, /* Orange */ 0x49, /* DarkGray */ ----------------------------------------------------------------------- Summary of changes: include/core/GP_Color.h | 2 ++ libs/core/GP_Color.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 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: d5b0a7ec7f7f9a3552742911a9d7528d5adf86c5
by bluebear 07 May '12

07 May '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 d5b0a7ec7f7f9a3552742911a9d7528d5adf86c5 (commit) from 0b9e5475cc8db3e7b8c5555744c7b29ca3dbbed3 (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/d5b0a7ec7f7f9a3552742911a9d7528d5adf… commit d5b0a7ec7f7f9a3552742911a9d7528d5adf86c5 Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Mon May 7 15:21:56 2012 +0200 A few more wording clarifications and typo fixes. diff --git a/doc/context.txt b/doc/context.txt index 1edcc1f..294d026 100644 --- a/doc/context.txt +++ b/doc/context.txt @@ -33,7 +33,9 @@ typedef struct GP_Context { ------------------------------------------------------------------------------- The 'pixels' field points to the image data, stored as a one-dimensional -array of byte-aligned lines. +array of byte-aligned lines. (There can be some unused space at the end of +each line; this is reflected by the 'bytes_per_row' value being greater +than what would be needed for that pixel format). Rotation ^^^^^^^^ @@ -47,7 +49,7 @@ If you don't need this functionality just don't touch the flags the as overhead of these transformations is not measurable. If you really need drawing primitives that do not use the orientation flags, -you could use variants with _Raw suffix (altghoug this is not recommended). +you could use variants with _Raw suffix (although this is not recommended). There are various helper macros for transforming coordinates and sizes in 'core/GP_Transform.h'. And context helper functions to "rotate" the flags @@ -87,7 +89,7 @@ void GP_ContextFlagsRotateCW(GP_Context *context); void GP_ContextFlagsRotateCCW(GP_Context *context); /* - * Returns context W and H taking the rotation flags into the account. + * Returns context width and height taking the rotation flags into the account. */ GP_Size GP_ContextW(const GP_Context *context); GP_Size GP_ContextH(const GP_Context *context); @@ -153,7 +155,7 @@ undefined contents. void GP_ContextFree(GP_Context *context); ------------------------------------------------------------------------------- -Frees the context memory. If free_pixels flag is set, the pixels buffer is +Frees the context memory. If 'free_pixels' flag is set, the pixels buffer is freed too. Subcontext @@ -163,7 +165,7 @@ A subcontext is a context that refers to a rectangular area within another context. Subcontexts can be used as any other context (including creating another subcontexts). -Calling GP_ContextFree() on a subcontext is safe; the bitmap is not freed as +Calling 'GP_ContextFree()' on a subcontext is safe; the bitmap is not freed as it belongs to another context; it will be freed with the hosting context. [source,c] @@ -201,6 +203,6 @@ GP_Context *GP_ContextConvert(const GP_Context *src, GP_Context *dst, Provides basic context conversion functionality. A newly allocated context is returned. -This fuction does no error distribution it only multiplies or rounds the pixel +This fuction does no error distribution, it only multiplies or rounds the pixel values. If you need something better use Floyd Steinberg dithering instead. diff --git a/doc/drawing_api.txt b/doc/drawing_api.txt index f83bad0..d836680 100644 --- a/doc/drawing_api.txt +++ b/doc/drawing_api.txt @@ -94,7 +94,7 @@ void GP_FillCircle(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, Draws a filled circle. The set of pixels affected by 'GP_FillCircle()' is exactly the same as if -drawing the circle boundary using GP_Circle() and then filling all pixels +drawing the circle boundary using 'GP_Circle()' and then filling all pixels within the boundary with the same color. Rings ----------------------------------------------------------------------- Summary of changes: doc/context.txt | 14 ++++++++------ doc/drawing_api.txt | 2 +- 2 files changed, 9 insertions(+), 7 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: 0b9e5475cc8db3e7b8c5555744c7b29ca3dbbed3
by metan 06 May '12

06 May '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 0b9e5475cc8db3e7b8c5555744c7b29ca3dbbed3 (commit) via 4315c42da30f2217b38c6d63862211dcd78db68c (commit) via 8d81d6e61f6efa9d6782397a95890e500cd547e4 (commit) from 09faee6cdc1fd7401ed8343a7539d4f547a5b7ec (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/0b9e5475cc8db3e7b8c5555744c7b29ca3db… commit 0b9e5475cc8db3e7b8c5555744c7b29ca3dbbed3 Merge: 4315c42 09faee6 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 6 18:03:27 2012 +0200 Merge ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/4315c42da30f2217b38c6d63862211dcd78d… commit 4315c42da30f2217b38c6d63862211dcd78db68c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 6 15:03:32 2012 +0200 build: Add core linker flags to --libs. diff --git a/configure b/configure index 5d25409..aa1d268 100755 --- a/configure +++ b/configure @@ -192,7 +192,7 @@ def write_gfxprim_config(cfg, libs): f.write('t--help) echo "$USAGE"; exit 0;;n') f.write('t--list-modules) echo "%s"; exit 0;;n' % ' '.join(modules)) f.write('t--cflags) echo -n "-I/usr/include/GP/ ";;n') - f.write('t--libs) echo -n "-lGP ";;n') + f.write('t--libs) echo -n "-lGP %s ";;n' % libs.get_linker_flags('core')) # ldflags for specific modules @@ -240,7 +240,7 @@ if __name__ == '__main__': [header_exists, "X11/Xlib.h"], "", "-lX11", {"backends"}], ["freetype", "A high-quality and portable font engine", - [header_exists, "ft2build.h"], "", "`freetype-config --libs`", {"text"}]], cfg) + [header_exists, "ft2build.h"], "", "`freetype-config --libs`", {"core"}]], cfg) parser = OptionParser(); http://repo.or.cz/w/gfxprim.git/commit/8d81d6e61f6efa9d6782397a95890e500cd5… commit 8d81d6e61f6efa9d6782397a95890e500cd547e4 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 6 14:54:23 2012 +0200 build: The backends module needs to add -lGP_backends. diff --git a/configure b/configure index a83d654..5d25409 100755 --- a/configure +++ b/configure @@ -191,14 +191,18 @@ def write_gfxprim_config(cfg, libs): # General switches cflags and ldflags f.write('t--help) echo "$USAGE"; exit 0;;n') f.write('t--list-modules) echo "%s"; exit 0;;n' % ' '.join(modules)) - f.write('t--cflags) echo -n "-I/usr/include/GP/";;n') - f.write('t--libs) echo -n "-lGP";;n') + f.write('t--cflags) echo -n "-I/usr/include/GP/ ";;n') + f.write('t--libs) echo -n "-lGP ";;n') # ldflags for specific modules for i in modules: - f.write('t--libs-%s) echo -n "%s";;n' % - (i, libs.get_linker_flags(i))) + ldflags = '' + if i == 'backends': + ldflags += '-lGP_backends ' + ldflags += libs.get_linker_flags(i) + f.write('t--libs-%s) echo -n "%s ";;n' % (i, ldflags)) + f.write('tesacntshiftndonenechon') f.close() ----------------------------------------------------------------------- Summary of changes: configure | 14 +++++++++----- 1 files changed, 9 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: 09faee6cdc1fd7401ed8343a7539d4f547a5b7ec
by bluebear 06 May '12

06 May '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 09faee6cdc1fd7401ed8343a7539d4f547a5b7ec (commit) from 53c95916722f2cf7bf6bf0c768cf4e9ec79d6fb3 (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/09faee6cdc1fd7401ed8343a7539d4f547a5… commit 09faee6cdc1fd7401ed8343a7539d4f547a5b7ec Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Sun May 6 17:55:57 2012 +0200 Fixed (hopefully) a few small wording issues. diff --git a/doc/basic_types.txt b/doc/basic_types.txt index 32a8294..cab5435 100644 --- a/doc/basic_types.txt +++ b/doc/basic_types.txt @@ -21,12 +21,10 @@ supported pixel value. Color ~~~~~ -The 'GP_Color', in gfxprim is enumeration of symbolic color names. +The 'GP_Color' enumeration holds symbolic constants for basic colors. -Color could be converted for a given 'GP_PixelType' which will result into -'GP_Pixel' value suitable for usage with drawing functions. The color could be -also converted to color name (C string in English language) and C string may -be matched against table of color names. +A 'GP_Color' can be converted into a 'GP_Pixel' for a given 'GP_PixelType'. +Symbolic values can also be converted to/from strings (color name in English). The 'GP_Color' enum is defined as follows: @@ -49,9 +47,6 @@ typedef enum GP_Color { } GP_Color; -------------------------------------------------------------------------------- -Color and Pixel conversion functions, the last one returns 'true' in case of -successful match and conversion and false otherwise. - [source,c] -------------------------------------------------------------------------------- #include <core/GP_Color.h> @@ -70,7 +65,7 @@ bool GP_ColorNameToContextPixel(const char *color_name, GP_Context *context, GP_Pixel *pixel); -------------------------------------------------------------------------------- -Functions to convert color to pixel and color to context pixel. The last two +Functions for conversion between colors, pixels and color names. The last two returns true if color with such name was found. [source,c] diff --git a/doc/context.txt b/doc/context.txt index d7b6b21..1edcc1f 100644 --- a/doc/context.txt +++ b/doc/context.txt @@ -1,7 +1,8 @@ Drawing Context --------------- -The 'GP_Context' is data structure for storing 'in memory' bitmaps. +The 'GP_Context' structure describes a bitmap in memory. It contains all +metadata needed for drawing into a bitmap. Data Structure ~~~~~~~~~~~~~~ @@ -31,8 +32,8 @@ typedef struct GP_Context { } GP_Context; ------------------------------------------------------------------------------- -The 'GP_Context' holds meta-data needed for bitmap drawing. The bitmap is -stored in one dimensional array in byte-aligned lines. +The 'pixels' field points to the image data, stored as a one-dimensional +array of byte-aligned lines. Rotation ^^^^^^^^ @@ -92,8 +93,8 @@ GP_Size GP_ContextW(const GP_Context *context); GP_Size GP_ContextH(const GP_Context *context); ------------------------------------------------------------------------------- -Context base functions -~~~~~~~~~~~~~~~~~~~~~~ +Basic context functions +~~~~~~~~~~~~~~~~~~~~~~~ [source,c] ------------------------------------------------------------------------------- @@ -106,10 +107,12 @@ void GP_ContextInit(GP_Context *context, GP_Size w, GP_Size h, ------------------------------------------------------------------------------- Initalize given context accordingly to parameters, the rest of context -parameters are set to the default values. Eg. rotation flags are all set to -zero as well as the free_pixels flag. The bpp and bytes_per_row are computed -from the given pixel type and size. The pixels pointer may be 'NULL' and could -be changed later manually. +parameters are set to the default values (i.e. rotation flags are all set to +zero, 'free_pixels' flag is not set). Number of bits per pixel and +bytes per row are computed from the given pixel type and size. + +The 'pixels' pointer can be 'NULL' and can be changed later manually (the call +will *not* try to allocate the pixel memory automatically). [source,c] ------------------------------------------------------------------------------- @@ -122,9 +125,9 @@ GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type); The 'GP_ContextAlloc()' allocates and initalizes a context. -The orientation flags are all set to zero, the free_pixels flag is set and the +The orientation flags are all set to zero, the 'free_pixels' flag is set and the rest of the metadata are calculated accordingly to width, height and -pixel_type.The contxt->pixels pointer points to newly allocated bitmap with +pixel_type.The 'pixels' pointer will point to a newly allocated bitmap with appropriate size; the initial contents of the bitmap are undefined. [source,c] @@ -137,8 +140,9 @@ GP_Context *GP_ContextCopy(const GP_Context *src, int flag); ------------------------------------------------------------------------------- The 'GP_ContextCopy()' allocates and initalizes a copy of the context passed -as argument. If 'flag' is not zero, the bitmap (context->pixels) is copied -otherwise it's left uninitalized. +as argument. If 'flag' is set, the bitmap contents ('src->pixels') +are also copied; otherwise the copy will have the same dimensions but +undefined contents. [source,c] ------------------------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: doc/basic_types.txt | 13 ++++--------- doc/context.txt | 30 +++++++++++++++++------------- 2 files changed, 21 insertions(+), 22 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: 53c95916722f2cf7bf6bf0c768cf4e9ec79d6fb3
by metan 06 May '12

06 May '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 53c95916722f2cf7bf6bf0c768cf4e9ec79d6fb3 (commit) from 2bf4d0ec1f74e70434a7d93cf643bcbe7b855c78 (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/53c95916722f2cf7bf6bf0c768cf4e9ec79d… commit 53c95916722f2cf7bf6bf0c768cf4e9ec79d6fb3 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 6 14:01:38 2012 +0200 build: Make configure genereate gfxprim-config script. diff --git a/configure b/configure index 6011867..a83d654 100755 --- a/configure +++ b/configure @@ -131,6 +131,17 @@ class libraries: else: f.write("HAVE_%s=non" % i[0].upper()) + # + # Return list of linker flags needed to build particular module + # (module may be core, loaders, backends, etc... + # + def get_linker_flags(self, module): + res = "" + for i in self.libraries: + if module in i[5] and self.results[i[0]]: + res += " " + i[4] + return res + def basic_checks(cfg): sys.stderr.write("Basic checksn") sys.stderr.write("------------n") @@ -160,6 +171,39 @@ def write_config_mk(cfg, libs): f.close() sys.stderr.write("Config 'config.gen.mk' writtenn") +# +# Generate app compilation helper +# +def write_gfxprim_config(cfg, libs): + modules = ['loaders', 'backends'] + + f = open('gfxprim-config', 'w') + f.write('#!/bin/shn' + '#n# Generated by configure, do not edit directlyn#nn' + 'USAGE="Usage: $0 --list-modules --cflags --libs --libs-module_foo"n' + 'nif test $# -eq 0; thenn' + 'techo "$USAGE"n' + 'texit 1n' + 'finn' + 'while test -n "$1"; don' + 'tcase "$1" inn') + + # General switches cflags and ldflags + f.write('t--help) echo "$USAGE"; exit 0;;n') + f.write('t--list-modules) echo "%s"; exit 0;;n' % ' '.join(modules)) + f.write('t--cflags) echo -n "-I/usr/include/GP/";;n') + f.write('t--libs) echo -n "-lGP";;n') + + + # ldflags for specific modules + for i in modules: + f.write('t--libs-%s) echo -n "%s";;n' % + (i, libs.get_linker_flags(i))) + + f.write('tesacntshiftndonenechon') + f.close() + os.system('chmod +x gfxprim-config') + if __name__ == '__main__': # # Dictionary for default configuration parameters @@ -173,26 +217,26 @@ if __name__ == '__main__': # # Library detection/enable disable # - # name, description, [detection], cflags, ldflags + # name, description, [detection], cflags, ldflags, dict of modules library is needed for # l = libraries([["libpng", "Portable Network Graphics Library", - [header_exists, "png.h"], "", "-lpng"], + [header_exists, "png.h"], "", "-lpng", {"loaders"}], ["libsdl", "Simple Direct Media Layer", - [header_exists, "SDL/SDL.h"], "", ""], + [header_exists, "SDL/SDL.h"], "", "`sdl-config --libs`", {"backends"}], ["jpeg", "Library to load, handle and manipulate images in the JPEG format", - [header_exists, "jpeglib.h"], "", "-ljpeg"], + [header_exists, "jpeglib.h"], "", "-ljpeg", {"loaders"}], ["giflib", "Library to handle, display and manipulate GIF images", - [header_exists, "gif_lib.h"], "", "-lgif"], + [header_exists, "gif_lib.h"], "", "-lgif", {"loaders"}], ["libX11", "X11 library", - [header_exists, "X11/Xlib.h"], "", "-lX11"], + [header_exists, "X11/Xlib.h"], "", "-lX11", {"backends"}], ["freetype", "A high-quality and portable font engine", - [header_exists, "ft2build.h"], "", "`freetype-config --libs`"]], cfg) + [header_exists, "ft2build.h"], "", "`freetype-config --libs`", {"text"}]], cfg) parser = OptionParser(); @@ -228,5 +272,6 @@ if __name__ == '__main__': l.check() l.print_summary() - write_config_h(cfg, l); - write_config_mk(cfg, l); + write_config_h(cfg, l) + write_config_mk(cfg, l) + write_gfxprim_config(cfg, l) diff --git a/install.sh b/install.sh index ee5403f..c0273e0 100755 --- a/install.sh +++ b/install.sh @@ -2,8 +2,13 @@ INSTALL_PREFIX="$1" -HEADER_LOC="$INSTALL_PREFIX/usr/include/" -LIB_LOC="$INSTALL_PREFIX/usr/lib/" +if test -z "$INSTALL_PREFIX"; then + INSTALL_PREFIX="/usr/" +fi + +HEADER_LOC="$INSTALL_PREFIX/include/" +LIB_LOC="$INSTALL_PREFIX/lib/" +BIN_LOC="$INSTALL_PREFIX/bin/" # Headers echo "INSTALL headers" @@ -22,3 +27,7 @@ done echo "INSTALL libraries" install -m 775 -d "$LIB_LOC" install -m 664 build/*.so build/*.so.0 build/*.a "$LIB_LOC" + +# Binaries +echo "INSTALL binaries" +install -m 755 gfxprim-config "$BIN_LOC" ----------------------------------------------------------------------- Summary of changes: configure | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- install.sh | 13 ++++++++++- 2 files changed, 65 insertions(+), 11 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: 2bf4d0ec1f74e70434a7d93cf643bcbe7b855c78
by metan 05 May '12

05 May '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 2bf4d0ec1f74e70434a7d93cf643bcbe7b855c78 (commit) via c306b8911beab3de6c3c4d6fc8ccec23802ebdc4 (commit) from 7d47aaf60dd83f10d1478eb99ec10f29b6407795 (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/2bf4d0ec1f74e70434a7d93cf643bcbe7b85… commit 2bf4d0ec1f74e70434a7d93cf643bcbe7b855c78 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 5 20:33:53 2012 +0200 doc: Add gfxprim pages into git. diff --git a/doc/asteroids-corner.png b/doc/asteroids-corner.png new file mode 100644 index 0000000..2e4cf0b Binary files /dev/null and b/doc/asteroids-corner.png differ diff --git a/doc/favicon.png b/doc/favicon.png new file mode 100644 index 0000000..3ceab57 Binary files /dev/null and b/doc/favicon.png differ diff --git a/doc/gfxprim_logo.png b/doc/gfxprim_logo.png new file mode 100644 index 0000000..bee1c8b Binary files /dev/null and b/doc/gfxprim_logo.png differ diff --git a/doc/gfxprim_logo_prim.png b/doc/gfxprim_logo_prim.png new file mode 100644 index 0000000..677ee0c Binary files /dev/null and b/doc/gfxprim_logo_prim.png differ diff --git a/doc/index.html b/doc/index.html new file mode 100644 index 0000000..6132e6c --- /dev/null +++ b/doc/index.html @@ -0,0 +1,94 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> + <head> + <meta http-equiv="content-type" content="text/html; charset=iso-8859-2"> + <link rel="icon" type="image/png" href="favicon.png"> + <title>GFXprim</title> + <style type="text/css" title="currentStyle" media="screen"> + @import "style.css"; + </style> + </head> + <body> + <div id="body"> + <div id="logo"> + <h1> + <div id="logo_picture"> + <img src="gfxprim_logo.png" alt="GFXprim"> + </div> + <div id="logo_picture_prim"> + <img src="gfxprim_logo_prim.png" alt=""> + </div> + <div id="clever_line"> + <div style="display: block; text-align: right;"> + <img src="asteroids-corner.png" alt="asteroids" style="position: relative; right: 1em;"> + </div> + What would you like to draw today...  + </div> + </h1> + </div> + <div id="menu"> + <ul class="menu-tree"> + <li class="menu-tree-item"><a href="index.html">Home</a></li> + <li class="menu-tree-item"><a href="api.html">API</a></li> + <li class="menu-tree-item"><a href="examples.html">Code Examples</a></li> + <li class="menu-tree-item"><a href="http://repo.or.cz/w/gfxprim.git">GIT</a></li> + </ul> + </div> + <div id="content"> + <h2>GFXprim</h2> + <p> + <i>GFXprim</i> is Open-source modular 2D bitmap graphics library + with emphasis on speed and correctness. + </p> + <h3>License</h3> + <p> + The code is licenced under LGPL 2.1 or (at your opinion) any later. + </p> + <h3>About</h3> + <p> + Once upon the time <i>GFXprim</i> had started as an simple attempt to + replace SDL_gfx which was unusable at the time we started. Soon it outgrew + the initial purpose and yielded into library that could be used as + replacement for SDL library. In constrast with SDL <i>GFXprim</i> is + not aiming for abstracting the operating system interface. Instead of + that <i>GFXprim</i> provides means for keeping the system dependend + parts in well defined and isolated parts. + </p> + <p> + One of the key points of the library is code generation. Most of the + graphics operations are written using <a href="http://jinja.pocoo.org/">jinja</a> + templating engine which is used to generate specialized C code. So, + for an example, once you add pixel definition into configuration file, + creating specialized filters, loaders and conversions to other pixel + formats is just a matter of typing "make && make clean". + </p> + <p> + The code is stored in <a href="http://repo.or.cz/w/gfxprim.git">git</a> + and although we haven't done release yet; first alpha release may be done + later this year once rest of the API stabilizes (the core code has been + stable for quite some time). + </p> + <h3>Contact</h3> + <p> + We do have a <a href="http://www.ucw.cz/mailman/listinfo/gfxprim">mailing list</a> + and although there not much of discussion there now, we are there and listeing. + </p> + <h3>Documentation</h3> + <p> + For more information about internal structure and features look at the + <a href="api.html">API Description</a>. + </p> + <p> + There are also some nice C and Python + <a href="examples.html">Code Examples</a>. + </p> + </div> + <div id="cleaner"> </div> + <div id="footer"> + <a href="http://repo.or.cz/w/gfxprim.git">git</a> | + <a href="http://atrey.karlin.mff.cuni.cz/~gavento/GfxPrimWiki/">wiki</a> | + <a href="http://www.ucw.cz/mailman/listinfo/gfxprim">mailing list</a> + </div> + </div> + </body> +</html> diff --git a/doc/style.css b/doc/style.css new file mode 100644 index 0000000..27fa6f6 --- /dev/null +++ b/doc/style.css @@ -0,0 +1,151 @@ +body { + background-color: #aaa; + margin: 10pt; + padding-left: 8%; + padding-right: 8%; +} + +h1 { + background-color: transparent; + border-top: 1px solid #bc8517; + border-bottom: 1px solid #bc8517; +} + +h2 { + color: #bc6217; + padding-bottom: .2em; + border-bottom: 1px solid #db7521; + font-weight: bolder; +} + +h3 { + color: Black; + padding-top: 1em; +} + +a, a:visited { + color: #333; + font-style: oblique; + font-weight: bolder; + text-decoration: none; +} + +a:hover { + color: #aaa; + font-style: oblique; + font-weight: bolder; + text-decoration: none; +} + +li { + list-style-type: disc; + margin-bottom: 4px; +} + +pre { + padding: .5em .5em .5em .5em; + border: 1px solid Black; + border-style: dashed; + background-color: #bbc; + display: inline-block; +} + +/* main div */ +#body { + color: Black; + background-color: #ffffc7; +} + +#logo_picture { + position: relative; + top: 0.1em; + left: 0.5em; + display: inline; +} + +#logo_picture_prim { + position: relative; + display: inline; + left: 0.2em; + top: 30px; +} + +#logo { + background-color: #f7e177; +} + +#clever_line { + font-size: 40%; + color: #bc6217; + float: right; + position: relative; + top: 10px; +} + +#content { + padding: 0 2em 1em 12em; +} + +#menu { + float: left; + color: #eee; + width: 10em; + margin: 0em 0em 1em 1em; + padding: 0; + border: 1px solid #bc6217; + background-color: #f7e177; +} + +#cleaner { + clear: both; +} + +#footer { + background-color: #f7e177; + text-align: center; + padding-top: .3em; + padding-bottom: .3em; + color: #bc6217; + border-top: 1px solid #bc6217; + border-bottom: 1px solid #bc6217; +} + +/* text markers */ +#term { + font-variant: small-caps; +} + +#path { + font-style: italic; +} + +#command { + font-style: oblique; +} + +/* right menu basic style */ +.menu-tree { + line-height: 2em; + margin: 0 0 0 1em; + padding: 0; +} + +.menu-tree-item { + font-size: 89%; + display: block; + margin: 0; + padding: 0; +} + +.menu-tree-item a { + font-variant: small-caps; + text-decoration: none; + font-style: normal; + padding-top: 0.2em; + padding-bottom: 0.25em; + color: #db7521; +} + +.menu-tree-item a:hover { + color: #eee; +} http://repo.or.cz/w/gfxprim.git/commit/c306b8911beab3de6c3c4d6fc8ccec23802e… commit c306b8911beab3de6c3c4d6fc8ccec23802ebdc4 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 5 20:33:26 2012 +0200 doc: Fix make clean. diff --git a/doc/Makefile b/doc/Makefile index c81b39d..4bb74ee 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -13,5 +13,5 @@ api.pdf: api.txt fop api.fo -pdf api.pdf clean: - rm -f api.html + rm -f api.html examples.html rm -f api.xml api.fo api.pdf ----------------------------------------------------------------------- Summary of changes: doc/Makefile | 2 +- doc/asteroids-corner.png | Bin 0 -> 5241 bytes doc/favicon.png | Bin 0 -> 768 bytes doc/gfxprim_logo.png | Bin 0 -> 11242 bytes doc/gfxprim_logo_prim.png | Bin 0 -> 4751 bytes doc/index.html | 94 ++++++++++++++++++++++++++++ doc/style.css | 151 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 246 insertions(+), 1 deletions(-) create mode 100644 doc/asteroids-corner.png create mode 100644 doc/favicon.png create mode 100644 doc/gfxprim_logo.png create mode 100644 doc/gfxprim_logo_prim.png create mode 100644 doc/index.html create mode 100644 doc/style.css 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: 7d47aaf60dd83f10d1478eb99ec10f29b6407795
by metan 05 May '12

05 May '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 7d47aaf60dd83f10d1478eb99ec10f29b6407795 (commit) via 22f1747c69692d0769e2c4bc6e288c95c517d205 (commit) via 5cb7ab4228726c1193cfa5378a2751608ee7b2ac (commit) via 933fdbbd2f09c3ab6869dbbc6c30c698576eb3fd (commit) via 4124b65e9f3c2ba8984e0727d13f955fc04ae7e0 (commit) via db71e716da4792f972540c31b2d3d24aeede6825 (commit) from 6f8f6b43ebf8f58d705e3c6e9499d279f20e7b0b (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/7d47aaf60dd83f10d1478eb99ec10f29b640… commit 7d47aaf60dd83f10d1478eb99ec10f29b6407795 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 5 20:30:13 2012 +0200 doc: Add more info to general docs. diff --git a/doc/general.txt b/doc/general.txt index c8b6262..96310bb 100644 --- a/doc/general.txt +++ b/doc/general.txt @@ -23,7 +23,7 @@ Graphics Rendering ** Lines ** Circles ** Elipses -** Polygon +** Polygons * Text Drawing ** Supports both proportional and non proportional fonts @@ -37,6 +37,17 @@ Graphics Rendering ** Subcontext, rectangular region in one context could be used as a context ** Fast specialized blits (with 90, 180 and 270 degree rotation) +* Image loading/saving +** Read and Write support for PNG +** Read and Write support for JPEG +** Read support for BMP +** Read support for GIF + +* Graphic backed input event handling +** Linux Framebuffer +** SDL support +** Experimental X11 support + Bitmap Filters ^^^^^^^^^^^^^^ * Point filters http://repo.or.cz/w/gfxprim.git/commit/22f1747c69692d0769e2c4bc6e288c95c517… commit 22f1747c69692d0769e2c4bc6e288c95c517d205 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 5 19:37:26 2012 +0200 doc: More small doc fixes. diff --git a/doc/backends.txt b/doc/backends.txt index f476b10..ced9548 100644 --- a/doc/backends.txt +++ b/doc/backends.txt @@ -77,14 +77,14 @@ GP_Backend *GP_BackendInit(const char *params, const char *caption, FILE *help); This function takes a params string as an parameter which is used for determining backend-dependend parametrs. The format is -'backend_name:backend_parameters' where backend parameters may be size (either -'WxH' or 'FS' in case of SDL backend). The caption is window caption (which is -ignored in most of the cases) and the FILE is file, where an error is printed -in case of failure, you should mostly use 'stderr' for that purpose. If params -is set to NULL the the call only prints help into the passed help FILE. If -intitalizaton was succesfull pointer to allocated and initalized backend is -returned otherwise NULL is returned and some helpful infomation should be -printed into the passed help FILE. +'backend_name:backend_parameters' where backend parameters may be window size +(either 'WxH' or 'FS' in case of SDL backend). The caption is window caption +(which is ignored in some of the cases) and the 'FILE' is file, where an error +is printed in case of failure, you should mostly use 'stderr' for that +purpose. If params is set to 'NULL' the the call only prints help into the +passed help 'FILE'. If intitalizaton was succesfull pointer to allocated and +initalized backend is returned otherwise 'NULL' is returned and some helpful +infomation should be printed into the passed help 'FILE'. Drawing Backend API diff --git a/doc/basic_types.txt b/doc/basic_types.txt index 2a14c95..32a8294 100644 --- a/doc/basic_types.txt +++ b/doc/basic_types.txt @@ -28,7 +28,7 @@ Color could be converted for a given 'GP_PixelType' which will result into also converted to color name (C string in English language) and C string may be matched against table of color names. -The 'GP_Color' enmum is defined as follows: +The 'GP_Color' enum is defined as follows: [source,c] -------------------------------------------------------------------------------- @@ -92,7 +92,7 @@ Progress Callback The 'GP_ProgressCallback' is a structure that stores user-defined callback function and user-defined pointer and percentage. -It is passed as last parameter to functions that could take some time to +It is passed as last parameter to functions that would take some time to complete and adds capability to track the operation progress as well as to abort the operation. @@ -111,7 +111,7 @@ If non 'NULL' progress callback structure is passed to a function, the callback function is periodically called and the percentage is updated. The return value from callback could abort the function execution. If non zero -value is returned the filter is aborted, all memory freed etc. and in case of +value is returned operation is aborted, all memory freed etc. and in case of bitmap loaders 'errno' is set to 'ECANCELED'. The callback, if supported, is the last parameter of a function. diff --git a/doc/context.txt b/doc/context.txt index 6395eee..d7b6b21 100644 --- a/doc/context.txt +++ b/doc/context.txt @@ -26,7 +26,7 @@ typedef struct GP_Context { uint8_t axes_swap:1; /* swap axes */ uint8_t x_swap:1; /* mirror x */ uint8_t y_swap:1; /* mirror y */ - uint8_t bit_endian:1; /* GP_BIT_ENDIAN */ + uint8_t bit_endian:1; /* GP_BIT_ENDIAN */ uint8_t free_pixels:1; /* if set GP_ContextFree() calls free on context->pixels */ } GP_Context; ------------------------------------------------------------------------------- @@ -49,7 +49,7 @@ If you really need drawing primitives that do not use the orientation flags, you could use variants with _Raw suffix (altghoug this is not recommended). There are various helper macros for transforming coordinates and sizes in -'core/GP_Transform.h'. And helper functions to "rotate" the context flags +'core/GP_Transform.h'. And context helper functions to "rotate" the flags clock wise and counter clock wise as well as functions to get the context size when taking into the accout the widht and height. @@ -108,7 +108,7 @@ void GP_ContextInit(GP_Context *context, GP_Size w, GP_Size h, Initalize given context accordingly to parameters, the rest of context parameters are set to the default values. Eg. rotation flags are all set to zero as well as the free_pixels flag. The bpp and bytes_per_row are computed -from the given pixel type and size. The pixels pointer may be NULL and could +from the given pixel type and size. The pixels pointer may be 'NULL' and could be changed later manually. [source,c] @@ -120,7 +120,7 @@ be changed later manually. GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type); ------------------------------------------------------------------------------- -The 'GP_ContextAlloc()' allocates context and initalizes a context. +The 'GP_ContextAlloc()' allocates and initalizes a context. The orientation flags are all set to zero, the free_pixels flag is set and the rest of the metadata are calculated accordingly to width, height and @@ -149,7 +149,7 @@ otherwise it's left uninitalized. void GP_ContextFree(GP_Context *context); ------------------------------------------------------------------------------- -Frees the context memory. If free_pixels flag is set, the pixels datada are +Frees the context memory. If free_pixels flag is set, the pixels buffer is freed too. Subcontext @@ -197,6 +197,6 @@ GP_Context *GP_ContextConvert(const GP_Context *src, GP_Context *dst, Provides basic context conversion functionality. A newly allocated context is returned. -This fuction does no error distribution but only multiply or rounds the pixel +This fuction does no error distribution it only multiplies or rounds the pixel values. If you need something better use Floyd Steinberg dithering instead. diff --git a/doc/drawing_api.txt b/doc/drawing_api.txt index e73a07c..f83bad0 100644 --- a/doc/drawing_api.txt +++ b/doc/drawing_api.txt @@ -52,6 +52,7 @@ y0, y1 can be specified in any order. 'GP_VLine()' is an alias for 'GP_VLineXYY()'. +[source,c] -------------------------------------------------------------------------------- void GP_VLineXYH(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size h, GP_Pixel pixel); diff --git a/doc/loaders.txt b/doc/loaders.txt index 7d5d0c5..472a735 100644 --- a/doc/loaders.txt +++ b/doc/loaders.txt @@ -267,5 +267,5 @@ PBM, PGM, PPM ~~~~~~~~~~~~~ There is a code do load and write 'PBM', 'PGM' and 'PPM' images too. However -it's not finished and it's API is outdated. Use at your own risk. +it's not finished and its API is outdated. Use at your own risk. http://repo.or.cz/w/gfxprim.git/commit/5cb7ab4228726c1193cfa5378a2751608ee7… commit 5cb7ab4228726c1193cfa5378a2751608ee7b2ac Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 5 19:36:08 2012 +0200 docs: Add more examples. diff --git a/doc/Makefile b/doc/Makefile index 5286512..c81b39d 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -4,7 +4,7 @@ api.html: general.txt api.txt context.txt loaders.txt filters.txt basic_types.txt drawing_api.txt asciidoc -a toc api.txt -examples.html: examples.txt ../demos/simple/*.c +examples.html: examples.txt ../demos/simple/*.c ../demos/py_simple/*.py asciidoc -a toc examples.txt api.pdf: api.txt diff --git a/doc/examples.txt b/doc/examples.txt index 520d5d9..c4566f2 100644 --- a/doc/examples.txt +++ b/doc/examples.txt @@ -19,3 +19,17 @@ Loads an image and saves it into 'out.png' png image. include::../demos/simple/loaders_example.c[] ------------------------------------------------------------------ +And the same in python + +[source,python] +------------------------------------------------------------------ +include::../demos/py_simple/loaders_example.py[] +------------------------------------------------------------------ + +GFXprim + PyGTK +--------------- + +[source,python] +------------------------------------------------------------------ +include::../demos/py_simple/pygtk_example.py[] +------------------------------------------------------------------ http://repo.or.cz/w/gfxprim.git/commit/933fdbbd2f09c3ab6869dbbc6c30c698576e… commit 933fdbbd2f09c3ab6869dbbc6c30c698576eb3fd Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 5 19:35:45 2012 +0200 examples: Add very simple loaders python example. diff --git a/demos/py_simple/loaders_example.py b/demos/py_simple/loaders_example.py new file mode 100755 index 0000000..1bf9c2c --- /dev/null +++ b/demos/py_simple/loaders_example.py @@ -0,0 +1,19 @@ +#!/usr/bin/env python +import sys + +import gfxprim.core as core +import gfxprim.loaders as loaders +import gfxprim.filters as filters + +def main(): + if len(sys.argv) != 2: + print("Takes an image as an argument") + sys.exit(1) + + # Load Image + img = loaders.LoadImage(sys.argv[2], None) + # Save result + loaders.SavePNG("out.png", img, None) + +if __name__ == '__main__': + main() http://repo.or.cz/w/gfxprim.git/commit/4124b65e9f3c2ba8984e0727d13f955fc04a… commit 4124b65e9f3c2ba8984e0727d13f955fc04ae7e0 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 5 19:31:18 2012 +0200 doc: Add examples docs. diff --git a/doc/Makefile b/doc/Makefile index fd95a7b..5286512 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,9 +1,12 @@ -all: api.html +all: api.html examples.html api.html: general.txt api.txt context.txt loaders.txt filters.txt basic_types.txt drawing_api.txt asciidoc -a toc api.txt +examples.html: examples.txt ../demos/simple/*.c + asciidoc -a toc examples.txt + api.pdf: api.txt asciidoc -b docbook api.txt xsltproc /usr/share/sgml/docbook/xsl-stylesheets/fo/docbook.xsl api.xml > api.fo diff --git a/doc/examples.txt b/doc/examples.txt new file mode 100644 index 0000000..520d5d9 --- /dev/null +++ b/doc/examples.txt @@ -0,0 +1,21 @@ +Simple backend example +---------------------- + +Basic backend code example. Initalizes backends, draws a cross and dumps +events. + +[source,c] +------------------------------------------------------------------ +include::../demos/simple/backend_example.c[] +------------------------------------------------------------------ + +Simple loaders example +---------------------- + +Loads an image and saves it into 'out.png' png image. + +[source,c] +------------------------------------------------------------------ +include::../demos/simple/loaders_example.c[] +------------------------------------------------------------------ + http://repo.or.cz/w/gfxprim.git/commit/db71e716da4792f972540c31b2d3d24aeede… commit db71e716da4792f972540c31b2d3d24aeede6825 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 5 19:30:31 2012 +0200 examples: Add a very simple examples. diff --git a/demos/Makefile b/demos/Makefile index 1d61deb..6cbebf6 100644 --- a/demos/Makefile +++ b/demos/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. -SUBDIRS=grinder spiv particle ttf2img +SUBDIRS=grinder spiv particle ttf2img simple include $(TOPDIR)/post.mk diff --git a/demos/simple/Makefile b/demos/simple/Makefile new file mode 100644 index 0000000..7fd7505 --- /dev/null +++ b/demos/simple/Makefile @@ -0,0 +1,12 @@ +TOPDIR=../.. + +CSOURCES=$(shell echo *.c) + +INCLUDE= +LDLIBS+=-lGP -lGP_backends -lSDL -L$(TOPDIR)/build/ + +APPS=backend_example loaders_example + +include $(TOPDIR)/pre.mk +include $(TOPDIR)/app.mk +include $(TOPDIR)/post.mk diff --git a/demos/simple/backend_example.c b/demos/simple/backend_example.c new file mode 100644 index 0000000..838726b --- /dev/null +++ b/demos/simple/backend_example.c @@ -0,0 +1,102 @@ +/***************************************************************************** + * 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> * + * * + *****************************************************************************/ + + /* + + Simple backend example. + + */ + +#include <GP.h> +#include <backends/GP_Backends.h> + +int main(int argc, char *argv[]) +{ + GP_Backend *backend; + GP_Context *context; + GP_Pixel white_pixel, black_pixel; + const char *backend_opts = "X11:100x100"; + int opt; + + while ((opt = getopt(argc, argv, "b:h")) != -1) { + switch (opt) { + case 'b': + backend_opts = optarg; + break; + case 'h': + GP_BackendInit(NULL, NULL, stderr); + return 0; + break; + default: + fprintf(stderr, "Invalid paramter '%c'n", opt); + } + } + + /* Turn on debug messages */ + GP_SetDebugLevel(10); + + backend = GP_BackendInit(backend_opts, "Backend Example", stderr); + + context = backend->context; + + GP_EventSetScreenSize(context->w, context->h); + + black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, context); + white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, context); + + GP_Fill(context, black_pixel); + GP_Line(context, 0, 0, context->w - 1, context->h - 1, white_pixel); + GP_Line(context, 0, context->h - 1, context->w - 1, 0, white_pixel); + + /* Update the backend screen */ + GP_BackendFlip(backend); + + for (;;) { + if (backend->Poll) + GP_BackendPoll(backend); + + usleep(1000); + + /* Read and parse events */ + GP_Event ev; + + while (GP_EventGet(&ev)) { + + GP_EventDump(&ev); + + switch (ev.type) { + case GP_EV_KEY: + switch (ev.val.key.key) { + case GP_KEY_ESC: + case GP_KEY_Q: + GP_BackendExit(backend); + return 0; + break; + } + } + } + } + + GP_BackendExit(backend); + + return 0; +} diff --git a/demos/simple/loaders_example.c b/demos/simple/loaders_example.c new file mode 100644 index 0000000..b05c0b5 --- /dev/null +++ b/demos/simple/loaders_example.c @@ -0,0 +1,61 @@ +/***************************************************************************** + * 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> * + * * + *****************************************************************************/ + + /* + + Simple loaders example. + + */ + +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#include <GP.h> + +int main(int argc, char *argv[]) +{ + GP_Context *img; + + /* Turn on debug messages */ + GP_SetDebugLevel(10); + + if (argc != 2) { + fprintf(stderr, "Takes an image as an parametern"); + return 0; + } + + img = GP_LoadImage(argv[1], NULL); + + if (img == NULL) { + fprintf(stderr, "Failed to load image '%s':%sn", argv[1], + strerror(errno)); + return 1; + } + + if (GP_SavePNG("out.png", img, NULL)) { + fprintf(stderr, "Failed to save image %s", strerror(errno)); + return 1; + } + + return 0; +} ----------------------------------------------------------------------- Summary of changes: demos/Makefile | 2 +- demos/py_simple/{blur.py => loaders_example.py} | 10 +-- demos/{particle => simple}/Makefile | 4 +- .../particle_demo.c => simple/backend_example.c} | 83 +++++--------------- .../simple/loaders_example.c | 41 +++++----- doc/Makefile | 5 +- doc/backends.txt | 16 ++-- doc/basic_types.txt | 6 +- doc/context.txt | 12 ++-- doc/drawing_api.txt | 1 + doc/examples.txt | 35 ++++++++ doc/general.txt | 13 +++- doc/loaders.txt | 2 +- 13 files changed, 114 insertions(+), 116 deletions(-) copy demos/py_simple/{blur.py => loaders_example.py} (54%) copy demos/{particle => simple}/Makefile (83%) copy demos/{particle/particle_demo.c => simple/backend_example.c} (65%) copy tests/drivers/linux_input.c => demos/simple/loaders_example.c (76%) create mode 100644 doc/examples.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