b77d533d2820ffb26c23992b27f9d71e94cc1aaa angie Wed Jan 12 10:16:21 2011 -0800 Added some #ifdef USE_BAM's to fix compile on systems that don't have samtools/USE_BAM. diff --git src/hg/hgTracks/cds.c src/hg/hgTracks/cds.c index ae7bd33..21ca671 100644 --- src/hg/hgTracks/cds.c +++ src/hg/hgTracks/cds.c @@ -1716,31 +1716,35 @@ } } void baseColorInitTrack(struct hvGfx *hvg, struct track *tg) /* Set up base coloring state (e.g. cache genomic sequence) for tg. * This must be called by tg->drawItems if baseColorDrawSetup is used * in tg->drawItemAt. Uses tg->drawItems method to determine whether * tg is linkedFeatures or linkedFeaturesSeries (currently the only * two supported track types -- bed, psl etc. are subclasses of these). */ { if (initedTrack == NULL || differentString(tg->track, initedTrack)) { int overallStart, overallEnd; boolean isSeries = FALSE; if ((tg->drawItems == linkedFeaturesSeriesDraw) +#ifdef USE_BAM || (tg->drawItems == bamLinkedFeaturesSeriesDraw)) +#else + ) +#endif isSeries = TRUE; else if (!baseColorCanDraw(tg)) errAbort("baseColorInitTrack: track %s has a type not recognized by baseColorCanDraw.", tg->track); getLinkedFeaturesSpan((struct linkedFeatures *)tg->items, &overallStart, &overallEnd, isSeries); if (overallStart < cachedGenoStart || overallEnd > cachedGenoEnd) { // leak mem to save time (don't bother freeing old cached dna) cachedGenoStart = overallStart; cachedGenoEnd = overallEnd; cachedGenoDna = hDnaFromSeq(database, chromName, cachedGenoStart, cachedGenoEnd, dnaUpper); } initedTrack = cloneString(tg->track); }