Changeset 4133Tweet

Timestamp:

Dec 16, 2009, 1:37:20 AM (13 years ago)

Author:

Sam Hocevar

Message:

Revert previous fix for deprecated libcaca versions. It's possible we have
a TOIlet release before a libcaca one.

Location:

toilet/trunk

Files:

• src/render.c (modified) (3 diffs)
• tools/caca2tlf.c (modified) (1 diff)

toilet/trunk/src/render.c

@@ -64 +64 @@
 
         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++)
         {
@@ -107 +107 @@
 
         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++)
         {
@@ -157 +157 @@
 
     /* Output line */
-    buffer = caca_export_canvas_to_memory(cx->torender, cx->export, &len);
+    buffer = caca_export_memory(cx->torender, cx->export, &len);
     if(!buffer)
         return -1;

toilet/trunk/tools/caca2tlf.c

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