Changeset 1376 for toilet/trunk/src/figlet.cTweet

Timestamp:

Nov 12, 2006, 9:37:58 PM (17 years ago)

Author:

Sam Hocevar

Message:

• Now that libcaca 0.99.beta10 is out, we can switch to the new API.

File:

• toilet/trunk/src/figlet.c (modified) (5 diffs)

toilet/trunk/src/figlet.c

@@ -97 +97 @@
         for(x = 0; x < w; x++)
     {
-        uint32_t tmp = cucul_getchar(cx->image, x, y + c * cx->height);
-        cucul_putchar(cx->cv, cx->x + x, cx->y + y, tmp);
+        uint32_t tmp = cucul_get_char(cx->image, x, y + c * cx->height);
+        cucul_put_char(cx->cv, cx->x + x, cx->y + y, tmp);
     }
 
@@ -133 +133 @@
     char buf[2048];
     char hardblank[10];
-    cucul_buffer_t *b;
     TOIFILE *f;
     unsigned int i, j, size, comment_lines;
@@ -250 +249 @@
 
     /* Import buffer into canvas */
-    b = cucul_load_memory(data, i);
-    cx->image = cucul_import_canvas(b, "utf8");
-    cucul_free_buffer(b);
+    cx->image = cucul_create_canvas(0, 0);
+    cucul_import_memory(cx->image, data, i, "utf8");
     free(data);
-
-    if(!cx->image)
-    {
-        free(cx->lookup);
-        fprintf(stderr, "libcucul could not load data in `%s'\n", path);
-        return -1;
-    }
 
     /* Remove EOL characters. For now we ignore hardblanks, don’t do any
@@ -270 +261 @@
         for(i = cx->max_length; i--;)
         {
-            ch = cucul_getchar(cx->image, i, j);
+            ch = cucul_get_char(cx->image, i, j);
 
             /* TODO: Replace hardblanks with U+00A0 NO-BREAK SPACE */
             if(ch == cx->hardblank)
-                cucul_putchar(cx->image, i, j, ch = ' ');
-                //cucul_putchar(cx->image, i, j, ch = 0xa0);
+                cucul_put_char(cx->image, i, j, ch = ' ');
+                //cucul_put_char(cx->image, i, j, ch = 0xa0);
 
             if(oldch && ch != oldch)
@@ -283 +274 @@
             }
             else if(oldch && ch == oldch)
-                cucul_putchar(cx->image, i, j, ' ');
+                cucul_put_char(cx->image, i, j, ' ');
             else if(ch != ' ')
             {
                 oldch = ch;
-                cucul_putchar(cx->image, i, j, ' ');
-            }
-        }
-    }
-
-    return 0;
-}
-
+                cucul_put_char(cx->image, i, j, ' ');
+            }
+        }
+    }
+
+    return 0;
+}
+