femsci/toilet
femsci/toilet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert previous fix for deprecated libcaca versions. It's possible we have

Browse source 
a TOIlet release before a libcaca one.
This commit is contained in:
Sam Hocevar 2009-12-16 00:37:20 +00:00 committed by sam
parent 0f4b7e6050
commit 6b08f89ef4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/render.c
View file

@ -63,7 +63,7 @@ int render_stdin(context_t *cx)
break; break;
caca_set_canvas_size(cv, 0, 0); caca_set_canvas_size(cv, 0, 0);
caca_import_canvas_from_memory(cv, line, strlen(line), "utf8"); caca_import_memory(cv, line, strlen(line), "utf8");
for(i = 0; i < caca_get_canvas_width(cv); i++) for(i = 0; i < caca_get_canvas_width(cv); i++)
{ {
uint32_t ch = caca_get_char(cv, i, 0); uint32_t ch = caca_get_char(cv, i, 0);
@ -106,7 +106,7 @@ int render_list(context_t *cx, int argc, char *argv[])
len = strlen(parser); len = strlen(parser);
caca_set_canvas_size(cv, 0, 0); caca_set_canvas_size(cv, 0, 0);
caca_import_canvas_from_memory(cv, parser, len, "utf8"); caca_import_memory(cv, parser, len, "utf8");
for(i = 0; i < caca_get_canvas_width(cv); i++) for(i = 0; i < caca_get_canvas_width(cv); i++)
{ {
uint32_t ch = caca_get_char(cv, i, 0); uint32_t ch = caca_get_char(cv, i, 0);
@ -156,7 +156,7 @@ static int render_flush(context_t *cx)
filter_do(cx); filter_do(cx);
/* Output line */ /* Output line */
buffer = caca_export_canvas_to_memory(cx->torender, cx->export, &len); buffer = caca_export_memory(cx->torender, cx->export, &len);
if(!buffer) if(!buffer)
return -1; return -1;
fwrite(buffer, len, 1, stdout); fwrite(buffer, len, 1, stdout);

2
tools/caca2tlf.c
View file

@ -170,7 +170,7 @@ static void list_fonts(void)
static void add_char(unsigned long int ch) static void add_char(unsigned long int ch)
{ {
void *buf; void *buf;
unsigned long int len; size_t len;
unsigned int x, y, myw, mygw; unsigned int x, y, myw, mygw;
int full = caca_utf32_is_fullwidth(ch); int full = caca_utf32_is_fullwidth(ch);