Преглед изворни кода

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

a TOIlet release before a libcaca one.
pull/1/head
Sam Hocevar sam пре 16 година
родитељ
комит
6b08f89ef4
2 измењених фајлова са 4 додато и 4 уклоњено
  1. +3
    -3
      src/render.c
  2. +1
    -1
      tools/caca2tlf.c

+ 3
- 3
src/render.c Прегледај датотеку

@@ -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);


+ 1
- 1
tools/caca2tlf.c Прегледај датотеку

@@ -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);




Loading…
Откажи
Сачувај