src/utils/bdfToGem/bdfToGem.c 1.14

Index: src/utils/bdfToGem/bdfToGem.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/utils/bdfToGem/bdfToGem.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -B -U 4 -r1.13 -r1.14
--- src/utils/bdfToGem/bdfToGem.c	24 Feb 2005 18:32:33 -0000	1.13
+++ src/utils/bdfToGem/bdfToGem.c	26 Mar 2010 19:26:18 -0000	1.14
@@ -125,9 +125,9 @@
     {
     next = gl->next;
     freeGlyph(&gl);
     }
-freez(glyph);
+*glyph = NULL;
 return;
 }
 
 static int encodeCmp(const void *va, const void *vb)
@@ -522,11 +522,11 @@
 fontHeader.undrline = 0;
 fontHeader.lghtng_m = 0x5555;
 fontHeader.skewng_m = 0xaaaa;
 fontHeader.flags = 0;
-fontHeader.hz_ofst = (char *)NULL;
-fontHeader.ch_ofst = (WORD *)NULL;
-fontHeader.fnt_dta = (UBYTE *)NULL;
+fontHeader.hz_ofst = NULL;
+fontHeader.ch_ofst = NULL;
+fontHeader.fnt_dta = NULL;
 fontHeader.frm_wdt = 0;	/* will be byte width of all glyphs together */
 fontHeader.frm_hgt = 0;	/* will be a single glyph height */
 fontHeader.nxt_fnt = (struct font_hdr *)NULL;
 fontHeader.xOff = 0;
@@ -573,9 +573,9 @@
 	if (len & 0x1) /* odd length ?  can that be, no, shouldn't happen */
 	    {
 	    uc <<= 4;
 	    curGlyph->bitmap[glyphRow][j] = uc;
-	    errAbort("odd length of %d at line %d\n", lineCount);
+	    errAbort("odd length of %d at line %d\n", len, lineCount);
 	    }
 	++glyphRow;
 	continue;
 	}
@@ -730,8 +730,10 @@
 fontHeader.ADE_hi = asciiHi;
 
 outputGem(outputFile, &fontHeader, glyphList, bdfFile);
 freeGlyphList(&glyphList);
+#ifdef SOON
+#endif
 }
 
 int main( int argc, char *argv[] )
 {