706b20f0ff54a3bf502e9697c35f46a267c1aec9 angie Mon Aug 4 10:49:05 2014 -0700 Restoring the default values for lfColors after the changes in a4adfa326b and 936b5b531.Otherwise we have use of uninitialized variable when linkedFeaturesNameColor calls lfColors for a track that just sets a color (not shades, itemRgb or itemColor method), e.g. ensGene. refs #13746, #13704 diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 48ae3da..391980c 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -2414,32 +2414,32 @@ hvGfxFindColorIx(hvg, itemRgb.r, itemRgb.g, itemRgb.b); } else *retColor = *retBarbColor = lf->filterColor; } else if (tg->itemColor) { *retColor = tg->itemColor(tg, lf, hvg); *retBarbColor = tg->ixAltColor; } else { boolean isXeno = (tg->subType == lfSubXeno) || (tg->subType == lfSubChain) || startsWith("mrnaBla", tg->table); - *retColor = colorBySpectrumOrDefault(hvg,tg,lf->grayIx+isXeno,*retColor); - *retBarbColor = colorBySpectrumOrDefault(hvg,tg,lf->grayIx, *retBarbColor); + *retColor = colorBySpectrumOrDefault(hvg,tg,lf->grayIx+isXeno, tg->ixColor); + *retBarbColor = colorBySpectrumOrDefault(hvg,tg,lf->grayIx, tg->ixAltColor); } } Color linkedFeaturesNameColor(struct track *tg, void *item, struct hvGfx *hvg) /* Determine the color of the name for the linked feature. */ { Color col, barbCol; lfColors(tg, item, hvg, &col, &barbCol); return col; } struct simpleFeature *simpleFeatureCloneList(struct simpleFeature *list) /* Just copies the simpleFeature list. This is good for making a copy */ /* when the codon list is made. */ {