Gfxprim

Download

gfxprim@ucw.cz

February 2016

1 participants
1 discussions

[repo.or.cz] gfxprim.git branch master updated: 1.0.0-rc1-175-g3bd8980
by metan 29 Feb '16

29 Feb '16

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 3bd8980e057fc508b4a9a77d2bd0c225258cb62b (commit) from 9e95a6d7dbef8989e1d78061312a28f906e8d685 (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/gfxprim.git/commit/3bd8980e057fc508b4a9a77d2bd0c225258cb6… commit 3bd8980e057fc508b4a9a77d2bd0c225258cb62b Author: Michal Demin <michaldemin(a)gmail.com> Date: Fri Feb 26 22:17:41 2016 +0100 text/GP_Text.gen.c.t: Fix prototype inconsistency. Fix prototype inconsistency between header and generated GP_Text_Raw function and include GP_Text.h. Signed-off-by: Michal Demin <michaldemin(a)gmail.com> Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/text/GP_Text.gen.c.t b/libs/text/GP_Text.gen.c.t index 6a03486..e8f2dbd 100644 --- a/libs/text/GP_Text.gen.c.t +++ b/libs/text/GP_Text.gen.c.t @@ -11,11 +11,12 @@ #include "core/GP_MixPixels.gen.h" #include "gfx/GP_HLine.h" #include "GP_TextStyle.h" +#include "GP_Text.h" #include "GP_Font.h" #define WIDTH_TO_1BPP_BPP(width) ((width)/8 + ((width)%8 != 0)) -static int get_width(GP_TextStyle *style, int width) +static int get_width(const GP_TextStyle *style, int width) { return width * style->pixel_xmul + (width - 1) * style->pixel_xspace; } @@ -23,7 +24,7 @@ static int get_width(GP_TextStyle *style, int width) @ for pt in pixeltypes: @ if not pt.is_unknown(): -static void text_draw_1BPP_{{ pt.name }}(GP_Context *context, GP_TextStyle *style, +static void text_draw_1BPP_{{ pt.name }}(GP_Context *context, const GP_TextStyle *style, GP_Coord x, GP_Coord y, GP_Pixel fg, const char *str) { @@ -75,7 +76,7 @@ static void text_draw_1BPP_{{ pt.name }}(GP_Context *context, GP_TextStyle *styl @ end -static void text_draw_1BPP(GP_Context *context, GP_TextStyle *style, int x, int y, +static void text_draw_1BPP(GP_Context *context, const GP_TextStyle *style, int x, int y, GP_Pixel fg, const char *str) { switch (context->pixel_type) { @@ -153,14 +154,14 @@ static void text_draw_1BPP(GP_Context *context, GP_TextStyle *style, int x, int @ for pt in pixeltypes: @ if not pt.is_unknown(): -static void text_8BPP_bg_{{ pt.name }}(GP_Context *context, GP_TextStyle *style, +static void text_8BPP_bg_{{ pt.name }}(GP_Context *context, const GP_TextStyle *style, GP_Coord x, GP_Coord y, GP_Pixel fg, GP_Pixel bg, const char *str) { @ text_8BPP(pt, True) } -static void text_8BPP_{{ pt.name }}(GP_Context *context, GP_TextStyle *style, +static void text_8BPP_{{ pt.name }}(GP_Context *context, const GP_TextStyle *style, GP_Coord x, GP_Coord y, GP_Pixel fg, const char *str) { @@ -169,7 +170,7 @@ static void text_8BPP_{{ pt.name }}(GP_Context *context, GP_TextStyle *style, @ end -static void text_8BPP_bg(GP_Context *context, GP_TextStyle *style, +static void text_8BPP_bg(GP_Context *context, const GP_TextStyle *style, GP_Coord x, GP_Coord y, GP_Pixel fg, GP_Pixel bg, const char *str) { @@ -185,7 +186,7 @@ static void text_8BPP_bg(GP_Context *context, GP_TextStyle *style, } } -static void text_8BPP(GP_Context *context, GP_TextStyle *style, +static void text_8BPP(GP_Context *context, const GP_TextStyle *style, GP_Coord x, GP_Coord y, GP_Pixel fg, const char *str) { @@ -201,7 +202,7 @@ static void text_8BPP(GP_Context *context, GP_TextStyle *style, } } -void GP_Text_Raw(GP_Context *context, GP_TextStyle *style, +void GP_Text_Raw(GP_Context *context, const GP_TextStyle *style, GP_Coord x, GP_Coord y, uint8_t flags, GP_Pixel fg, GP_Pixel bg, const char *str) { ----------------------------------------------------------------------- Summary of changes: libs/text/GP_Text.gen.c.t | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 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