[Qemacs-commit] qemacs fbfrender.c fbfrender.h fbftoqe.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        13/12/17 23:42:53

Modified files:
        .              : fbfrender.c fbfrender.h fbftoqe.c 

Log message:
        removed ugly casts

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/fbfrender.c?cvsroot=qemacs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/qemacs/fbfrender.h?cvsroot=qemacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qemacs/fbftoqe.c?cvsroot=qemacs&r1=1.8&r2=1.9

Patches:
Index: fbfrender.c
===================================================================
RCS file: /sources/qemacs/qemacs/fbfrender.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- fbfrender.c 17 Dec 2013 14:46:19 -0000      1.11
+++ fbfrender.c 17 Dec 2013 23:42:52 -0000      1.12
@@ -471,12 +471,12 @@
 
 int fbf_render_init(__unused__ const char *font_path)
 {
-    const void **pp;
+    const struct fbf_font *pp;
 
     glyph_cache_init();
     first_font = NULL;
-    for (pp = fbf_fonts; *pp != NULL; pp += 2) {
-        fbf_load_font_memory(pp[0], (int)pp[1]);
+    for (pp = fbf_fonts; pp->data != NULL; pp++) {
+        fbf_load_font_memory(pp->data, pp->size);
     }
     if (!fallback_font)
         fallback_font = first_font;

Index: fbfrender.h
===================================================================
RCS file: /sources/qemacs/qemacs/fbfrender.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fbfrender.h 8 Jan 2008 16:37:54 -0000       1.5
+++ fbfrender.h 17 Dec 2013 23:42:52 -0000      1.6
@@ -48,6 +48,10 @@
 int fbf_render_init(const char *font_path);
 void fbf_render_cleanup(void);
 
-extern const void *fbf_fonts[];
+struct fbf_font {
+    const unsigned char *data;
+    unsigned int size;
+};
+extern const struct fbf_font fbf_fonts[];
 
 #endif

Index: fbftoqe.c
===================================================================
RCS file: /sources/qemacs/qemacs/fbftoqe.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- fbftoqe.c   8 Jan 2008 16:37:54 -0000       1.8
+++ fbftoqe.c   17 Dec 2013 23:42:53 -0000      1.9
@@ -94,13 +94,13 @@
     }
 
     /* dump font list */
-    printf("const void *fbf_fonts[] = {\n");
+    printf("const struct fbf_font fbf_fonts[] = {\n");
     for (i = 1; i < argc; i++) {
         filename = argv[i];
         getname(name, sizeof(name), filename);
-        printf("    font_%s, (void *)%d,\n", name, font_size[i]);
+        printf("    { font_%s, %d },\n", name, font_size[i]);
     }
-    printf("    NULL,\n");
+    printf("    { NULL, 0 },\n");
     printf("};\n");
     return 0;
 }