Merge remote-tracking branch 'font-freetype-3' into fox-gui - gsl-shell.git - gsl-shell

index : gsl-shell.git
gsl-shell
summary refs log tree commit diff
path: root/agg-plot/lua-draw.cpp
diff options
context:
space:
mode:
authorFrancesco Abbate <francesco.bbt@gmail.com>2012年07月21日 16:15:04 +0200
committerFrancesco Abbate <francesco.bbt@gmail.com>2012年07月21日 16:15:04 +0200
commit109cec3a3eec162659dbe4b6bbc724bfc4d71c31 (patch)
tree792fc6531eed8461ddaca467cde0af197995444b /agg-plot/lua-draw.cpp
parent269afefd4af2969413e905514285b07729464b84 (diff)
parent60f4afc1da907037867b9501fd9f781948efe649 (diff)
downloadgsl-shell-109cec3a3eec162659dbe4b6bbc724bfc4d71c31.tar.gz
Merge remote-tracking branch 'font-freetype-3' into fox-gui
Most important change to make it works was to perform a pixel conversion to convert the rendering buffer image in rgba32 format as required by FXImage. Internally the rgb24 format was used like in the font-freetype branch.
Diffstat (limited to 'agg-plot/lua-draw.cpp')
-rw-r--r--agg-plot/lua-draw.cpp 26
1 files changed, 13 insertions, 13 deletions
diff --git a/agg-plot/lua-draw.cpp b/agg-plot/lua-draw.cpp
index 3bb53ac8..f7a458ae 100644
--- a/agg-plot/lua-draw.cpp
+++ b/agg-plot/lua-draw.cpp
@@ -157,9 +157,9 @@ path_cmd (draw::path *p, int _cmd, struct cmd_call_stack *s)
break;
case CMD_LINE_TO:
if (ps.total_vertices() == 0)
- ps.move_to (s->f[0], s->f[1]);
+ ps.move_to (s->f[0], s->f[1]);
else
- ps.line_to (s->f[0], s->f[1]);
+ ps.line_to (s->f[0], s->f[1]);
break;
case CMD_CLOSE:
ps.close_polygon ();
@@ -191,16 +191,16 @@ agg_path_cmd (lua_State *L)
for (fc = signature; fc[0]; fc++)
{
switch (fc[0])
- {
- case 'f':
- s->f[f_count++] = gs_check_number (L, argc++, FP_CHECK_NORMAL);
- break;
- case 'b':
- if (lua_isboolean (L, argc))
- s->b[b_count++] = lua_toboolean (L, argc++);
- else
- return luaL_error (L, "expected boolean for argument #%i", argc);
- }
+ {
+ case 'f':
+ s->f[f_count++] = gs_check_number (L, argc++, FP_CHECK_NORMAL);
+ break;
+ case 'b':
+ if (lua_isboolean (L, argc))
+ s->b[b_count++] = lua_toboolean (L, argc++);
+ else
+ return luaL_error (L, "expected boolean for argument #%i", argc);
+ }
}
pthread_mutex_lock (agg_mutex);
@@ -222,7 +222,7 @@ agg_path_index (lua_State *L)
for (r = cmd_table; r->cmd; r++)
{
if (strcmp (key, r->cmd) == 0)
- break;
+ break;
}
if (r->cmd)
generated by cgit v1.2.3 (git 2.39.1) at 2025年09月15日 14:12:01 +0000

AltStyle によって変換されたページ (->オリジナル) /