Changeset 451 for pwntchaTweet

Timestamp:

Jan 12, 2005, 1:33:03 AM (16 years ago)

Author:

Sam Hocevar

Message:

• when cutting fonts, detect black pixels below 240, not below 128
• allow last column to be non-white
• better error message when all glyphs

File:

• pwntcha/trunk/src/font.c (modified) (3 diffs)

pwntcha/trunk/src/font.c

@@ -72 +72 @@
     font->glyphs = malloc(font->size * sizeof(struct glyph));
 
-    for(x = 0, i = 0, xmin = 0; x < font->img->width && i < font->size; x++)
+    for(x = 0, i = 0, xmin = 0; x <= font->img->width && i < font->size; x++)
     {
         int found = 0;
-        for(y = 0; y < font->img->height; y++)
-        {
-            getpixel(font->img, x, y, &r, &g, &b);
-            if(r < 128)
+        if(x != font->img->width)
+            for(y = 0; y < font->img->height; y++)
             {
-                found = 1;
-                count += (255 - r);
+                getpixel(font->img, x, y, &r, &g, &b);
+                if(r < 240)
+                {
+                    found = 1;
+                    count += (255 - r);
+                }
             }
-        }
+        else
+          found = 0;
+
         if(found && !incell)
         {
@@ -103 +107 @@
                 {
                     getpixel(font->img, newx, y, &r, &g, &b);
-                    if(r < 128)
+                    if(r < 240)
                     {
                         gotit = 1;
@@ -132 +136 @@
     if(i != font->size)
     {
-        printf("%s: could not find %i glyphs in font\n", argv0, font->size);
+        fprintf(stderr, "%s: could only find %i of %i glyphs in font %s\n",
+                argv0, i, font->size, file);
         image_free(font->img);
         free(font->glyphs);