Changeset 2821 for libcaca/trunk/tools/makefont.cTweet

Timestamp:

Sep 27, 2008, 3:12:46 PM (11 years ago)

Author:

Sam Hocevar

Message:

Starting refactoring to get rid of libcucul. The initial reason for the
split is rendered moot by the plugin system: when enabled, binaries do
not link directly with libX11 or libGL. I hope this is a step towards
more consisteny and clarity.

File:

• libcaca/trunk/tools/makefont.c (modified) (5 diffs)

libcaca/trunk/tools/makefont.c

@@ -31 +31 @@
 #include <pango/pangoft2.h>
 
-#include "cucul.h"
+#include "caca.h"
 
 /* Split our big strings into chunks of 480 characters, because it is
@@ -167 +167 @@
         glyphs += blocklist[b + 1] - blocklist[b];
         for(i = blocklist[b]; i < blocklist[b + 1]; i++)
-            if(cucul_utf32_is_fullwidth(i))
+            if(caca_utf32_is_fullwidth(i))
                 fullglyphs++;
     }
@@ -178 +178 @@
 
     /* Let's go! */
-    printf("/* libcucul font file\n");
+    printf("/* libcaca font file\n");
     printf(" * \"%s\": %i dpi, %i bpp, %ix%i/%ix%i glyphs\n",
            font, dpi, bpp, stdwidth, height, fullwidth, height);
@@ -232 +232 @@
             unsigned int k, current_size = stdsize;
 
-            if(cucul_utf32_is_fullwidth(i))
+            if(caca_utf32_is_fullwidth(i))
             {
                 current_width = fullwidth;
@@ -238 +238 @@
             }
             gtab[n].unicode = i;
-            bytes = cucul_utf32_to_utf8(gtab[n].buf, gtab[n].unicode);
+            bytes = caca_utf32_to_utf8(gtab[n].buf, gtab[n].unicode);
             gtab[n].buf[bytes] = '\0';