e685265dd1b666acaab2bc076c141c368fb4be66 hiram Thu Oct 15 11:36:17 2015 -0700 fixup gcc warnings for -Wunused-but-set-variable refs #16121 diff --git src/hg/hgTracks/mafTrack.c src/hg/hgTracks/mafTrack.c index cd6fb0b..53e57a2 100644 --- src/hg/hgTracks/mafTrack.c +++ src/hg/hgTracks/mafTrack.c @@ -571,31 +571,30 @@ void drawMafRegionDetails(struct mafAli *mafList, int height, int seqStart, int seqEnd, struct hvGfx *hvg, int xOff, int yOff, int width, MgFont *font, Color color, Color altColor, enum trackVisibility vis, boolean isAxt, boolean chainBreaks, boolean doSnpMode) /* Draw wiggle/density plot based on scoring things on the fly * from list of MAF */ { struct mafAli *full, *sub = NULL, *maf = NULL; struct mafComp *mcMaster, *mc; char dbChrom[64]; int height1 = height-2; int ixMafAli = 0; /* alignment index, to allow alternating color */ int x1, x2; int lastAlignX2 = -1; -int lastChainX2 = -1; double scale = scaleForPixels(width); if (doSnpMode) mafScoreUseSimple(); else mafScoreUseTraditional(); safef(dbChrom, sizeof(dbChrom), "%s.%s", database, chromName); for (full = mafList; full != NULL; full = full->next) { double *pixelScores = NULL; int i; int w; sub = NULL; if (mafNeedSubset(full, dbChrom, seqStart, seqEnd)) sub = maf = mafSubset(full, dbChrom, seqStart, seqEnd); @@ -618,31 +617,30 @@ x2 = ceil((double)((int)mcMaster->start-seqStart + mcMaster->size)*scale) + xOff; w = x2-x1+1; if (mc->size == 0) { /* suppress chain/alignment overlap */ if (x1 <= lastAlignX2) { int offset = lastAlignX2 - x1 + 1; x1 += offset; w -= offset; if (w <= 0) continue; } if (!chainBreaks) continue; - lastChainX2 = x2+1; /* no alignment here -- just a gap/break annotation */ if ((mc->leftStatus == MAF_MISSING_STATUS ) && (mc->rightStatus == MAF_MISSING_STATUS)) { Color yellow = hvGfxFindRgb(hvg, &undefinedYellowColor); hvGfxBox(hvg, x1, yOff, w, height - 1, yellow); } else if ((mc->leftStatus == MAF_INSERT_STATUS || mc->leftStatus == MAF_NEW_NESTED_STATUS) || (mc->rightStatus == MAF_INSERT_STATUS || mc->rightStatus == MAF_NEW_NESTED_STATUS)) { /* double gap -> display double line ala chain tracks */ drawMafChain(hvg, x1, yOff, w, height, TRUE); } else if (isContigOrTandem( mc->leftStatus) || isContigOrTandem( mc->rightStatus)) { /* single gap -> display single line ala chain tracks */