--- fim-0.3-beta-prerelease.orig/src/FbiStuffBit24.cpp
+++ fim-0.3-beta-prerelease/src/FbiStuffBit24.cpp
@@ -1,4 +1,4 @@
-/* $Id: FbiStuffBit24.cpp 224 2009-03-06 00:12:20Z dezperado $ */
+/* $Id: FbiStuffBit24.cpp 271 2009-12-13 00:03:48Z dezperado $ */
 /*
  FbiStuffBit24.cpp : fbi functions for reading ELF files as they were raw 24 bit per pixel pixelmaps
 
@@ -60,7 +60,7 @@
 {
     struct bit24_state *h;
     
-    h = (struct bit24_state *)calloc(sizeof(*h),1);
+    h = (struct bit24_state *)fim_calloc(sizeof(*h),1);
     if(!h)goto oops;
     memset(h,0,sizeof(*h));
     h->fp = fp;
@@ -70,7 +70,7 @@
     i->height = h->h = (h->flen+(h->w*3-1)) / ( h->w*3 ); // should pad
     return h;
  oops:
-    if(h)free(h);
+    if(h)fim_free(h);
     return NULL;
 }
 
@@ -105,20 +105,20 @@
     struct bit24_state *h = (struct bit24_state *) data;
 
     fclose(h->fp);
-    free(h);
+    fim_free(h);
 }
 
 struct ida_loader bit24_loader = {
 /*
  * 0000000: 7f45 4c46 0101 0100 0000 0000 0000 0000  .ELF............
  */
-    magic: "ELF",
-    moff:  1,
-    mlen:  3,
-    name:  "bmp",
-    init:  bit24_init,
-    read:  bit24_read,
-    done:  bit24_done,
+    /*magic:*/ "ELF",
+    /*moff:*/  1,
+    /*mlen:*/  3,
+    /*name:*/  "bmp",
+    /*init:*/  bit24_init,
+    /*read:*/  bit24_read,
+    /*done:*/  bit24_done,
 };
 
 static void __init init_rd(void)