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 132863aa4d50fefb0bd28f05de4e816e56c87e77 (commit) via 8a1ac4fff755c365067ea30dc801ecaf0b525113 (commit) via 994b268f4aba098c33b97c2f0eaf5b24fc42df1e (commit) from 982f9d91035c3562536ea524b9d16aac1719ce13 (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/132863aa4d50fefb0bd28f05de4e816e56c87...
commit 132863aa4d50fefb0bd28f05de4e816e56c87e77 Author: Cyril Hrubis metan@ucw.cz Date: Wed Dec 18 11:45:36 2013 +0100
demos: c_simple: Remove abort.c
Signed-off-by: Cyril Hrubis metan@ucw.cz
diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index c32d873..2d91834 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -17,7 +17,7 @@ APPS=backend_example loaders_example loaders filters_symmetry gfx_koch virtual_backend_example meta_data meta_data_dump tmp_file showimage v4l2_show v4l2_grab convolution weighted_median shapetest koch input_example fileview linetest randomshapetest fonttest- loaders_register blittest textaligntest abort sin_AA x11_windows+ loaders_register blittest textaligntest sin_AA x11_windows debug_handler gaussian_noise byte_utils version pretty_print timers zip_container backend_timers_example
diff --git a/demos/c_simple/abort.c b/demos/c_simple/abort.c deleted file mode 100644 index d9c3e18..0000000 --- a/demos/c_simple/abort.c +++ /dev/null @@ -1,33 +0,0 @@ -/***************************************************************************** - * 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@ucw.cz * - * * - *****************************************************************************/ - -#include <GP.h> - -int main(void) -{ - GP_Context *ctx; - - /* this call causes library to abort because of invalid parameters */ - ctx = GP_ContextAlloc(0, 0, -1); - - return 0; -}
http://repo.or.cz/w/gfxprim.git/commit/8a1ac4fff755c365067ea30dc801ecaf0b525...
commit 8a1ac4fff755c365067ea30dc801ecaf0b525113 Author: Cyril Hrubis metan@ucw.cz Date: Wed Dec 18 11:44:00 2013 +0100
doc: text: Fix API docs.
* The GP_Text() function prototype wasn't updated when background color was added to the parameters.
Signed-off-by: Cyril Hrubis metan@ucw.cz
diff --git a/doc/text.txt b/doc/text.txt index 2ade0f5..3acdd81 100644 --- a/doc/text.txt +++ b/doc/text.txt @@ -25,16 +25,17 @@ typedef enum GP_TextAlign { } GP_TextAlign;
void GP_Text(GP_Context *context, const GP_TextStyle *style, - int x, int y, int align, const char *str, GP_Pixel pixel); + GP_Coord x, GP_Coord y, int align, + GP_Pixel fg, GP_Pixel bg, const char *str);
GP_Size GP_Print(GP_Context *context, const GP_TextStyle *style, GP_Coord x, GP_Coord y, int align, - GP_Pixel fg_color, GP_Pixel bg_color, const char *fmt, ...); + GP_Pixel fg, GP_Pixel bg, const char *fmt, ...);
GP_Size GP_VPrint(GP_Context *context, const GP_TextStyle *style, GP_Coord x, GP_Coord y, int align, - GP_Pixel fg_color, GP_Pixel bg_color, + GP_Pixel fg, GP_Pixel bg, const char *fmt, va_list va); --------------------------------------------------------------------------------
http://repo.or.cz/w/gfxprim.git/commit/994b268f4aba098c33b97c2f0eaf5b24fc42d...
commit 994b268f4aba098c33b97c2f0eaf5b24fc42df1e Author: Cyril Hrubis metan@ucw.cz Date: Tue Dec 17 23:25:37 2013 +0100
doc: Add two more examples.
Signed-off-by: Cyril Hrubis metan@ucw.cz
diff --git a/doc/example_convolution.txt b/doc/example_convolution.txt new file mode 100644 index 0000000..42321af --- /dev/null +++ b/doc/example_convolution.txt @@ -0,0 +1,7 @@ +2D Linear Convolution +--------------------- + +[source,c] +------------------------------------------------------------------ +include::../demos/c_simple/convolution.c[] +------------------------------------------------------------------ diff --git a/doc/example_showimage.txt b/doc/example_showimage.txt new file mode 100644 index 0000000..b363353 --- /dev/null +++ b/doc/example_showimage.txt @@ -0,0 +1,8 @@ +Showimage +--------- +A simple example that loads an image and shows it in X11 window. + +[source,c] +------------------------------------------------------------------ +include::../demos/c_simple/showimage.c[] +------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes: demos/c_simple/Makefile | 2 +- demos/c_simple/abort.c | 33 -------------------- doc/{example_input.txt => example_convolution.txt} | 5 +-- ...mple_py_showimage.txt => example_showimage.txt} | 6 ++-- doc/text.txt | 7 ++-- 5 files changed, 10 insertions(+), 43 deletions(-) delete mode 100644 demos/c_simple/abort.c copy doc/{example_input.txt => example_convolution.txt} (54%) copy doc/{example_py_showimage.txt => example_showimage.txt} (54%)
repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply.