deca5eaeff633b054ba0091c391298fc7dc34377 braney Sat Nov 21 12:29:43 2020 -0800 finalizing freeType font work diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 9ecc41d..39261c4 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -622,30 +622,33 @@ cytoband track where the starts and ends of two bands overlaps by one. */ if (winEnd > cb->chromStart && winEnd <= cb->chromEnd) { safef(endBand, buffSize, "%s", cb->name); } } } static void maybeNewFonts(struct hvGfx *hvg) /* Check to see if we want to use the alternate font engine (FreeType2). */ { if (sameString(cfgOptionDefault("freeType", "off"), "on")) { + if (sameString(tl.textFont, "Bitmap")) + return; + char *fontDir = cfgOptionDefault("freeTypeDir", "/usr/share/fonts/default/Type1"); char buffer[4096]; extern char *freeTypeFontNames[]; extern char *freeTypeFontFiles[]; int ii; for(ii=0; ii < 33; ii++) if (sameString(freeTypeFontNames[ii], tl.textFont)) break; char *fontFile = freeTypeFontFiles[ii]; char *fontName = freeTypeFontNames[ii]; safef(buffer, sizeof buffer, "%s/%s", fontDir, fontFile); hvGfxSetFontMethod(hvg, FONT_METHOD_FREETYPE, fontName, buffer ); } }