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, generate has been updated via 8880f10fb3be9e8518ae73b26e4c3723a148aba9 (commit) via d6a28af5ee112a717db36b0e4fa1b1fab3268a05 (commit) from a76e111f516303a55c27a14782055770637c764a (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/8880f10fb3be9e8518ae73b26e4c3723a148a...
commit 8880f10fb3be9e8518ae73b26e4c3723a148aba9 Merge: a76e111 d6a28af Author: Cyril Hrubis metan@ucw.cz Date: Tue Aug 16 17:44:16 2011 +0200
Merge /home/metan/gfxprim into generate
http://repo.or.cz/w/gfxprim.git/commit/d6a28af5ee112a717db36b0e4fa1b1fab3268...
commit d6a28af5ee112a717db36b0e4fa1b1fab3268a05 Author: Cyril Hrubis metan@ucw.cz Date: Tue Apr 2 16:59:51 2013 +0200
Fix compatibility with older python and jinja by Tomas.
diff --git a/include/core/GP_Convert.gen.h.t b/include/core/GP_Convert.gen.h.t index 2b4681a..05a5606 100644 --- a/include/core/GP_Convert.gen.h.t +++ b/include/core/GP_Convert.gen.h.t @@ -49,9 +49,9 @@ #include "GP_Context.h" #include "GP_Pixel.h"
-## -## Loop around "central" pixel types -## +{# + # Loop around "central" pixel types +-#} %% for pt in [pixeltypes_dict['RGB888'], pixeltypes_dict['RGBA8888']] %% for i in pixeltypes %% if not i.is_unknown() diff --git a/libs/core/GP_Convert.gen.c.t b/libs/core/GP_Convert.gen.c.t index 8b65a75..2969066 100644 --- a/libs/core/GP_Convert.gen.c.t +++ b/libs/core/GP_Convert.gen.c.t @@ -6,9 +6,9 @@
#include "GP_Convert.h"
-## -## Loop around "central" pixel types -## +{# + # Loop around pixel types central for the conversion. +-#} %% for pt in [pixeltypes_dict['RGB888'], pixeltypes_dict['RGBA8888']]
GP_Pixel GP_{{ pt.name }}ToPixel(GP_Pixel pixel, GP_PixelType type) @@ -62,9 +62,6 @@ GP_Pixel GP_PixelTo{{ pt.name }}(GP_Pixel pixel, GP_PixelType type) return p; }
-## -## Loop arpund "central" pixel types -## %% endfor
%% endblock body diff --git a/pylib/gfxprim/render_utils.py b/pylib/gfxprim/render_utils.py index 12e2472..2c71b50 100644 --- a/pylib/gfxprim/render_utils.py +++ b/pylib/gfxprim/render_utils.py @@ -14,7 +14,6 @@ def template_error(s, *args): def create_environment(config, template_dir): env = jinja2.Environment( line_statement_prefix = "%%", - line_comment_prefix = "##", undefined = jinja2.StrictUndefined, loader = jinja2.FileSystemLoader(template_dir)) env.globals['undefined'] = jinja2.StrictUndefined()
-----------------------------------------------------------------------
Summary of changes: include/core/GP_Convert.gen.h.t | 6 +++--- libs/core/GP_Convert.gen.c.t | 9 +++------ pylib/gfxprim/render_utils.py | 1 - 3 files changed, 6 insertions(+), 10 deletions(-)
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.