568e0584cc21a34de3e3e7eb5660ecfde79b0cec hiram Tue Jan 14 14:48:39 2014 -0800 fixup enum type casts refs #12209 diff --git src/hg/hgTracks/variation.c src/hg/hgTracks/variation.c index bd28704..1aed8d7 100644 --- src/hg/hgTracks/variation.c +++ src/hg/hgTracks/variation.c @@ -786,86 +786,86 @@ valIx = 0; color = snp125ClassCart[valIx]; break; case snp125ColorSourceValid: for (i=0; i < snp125ValidArraySize; i++) if (containsStringNoCase(snp->valid, snp125ValidDataName[i])) color = snp125ValidCart[i]; break; case snp125ColorSourceFunc: { safecpy(buf, sizeof(buf), snp->func); wordCount = chopCommas(buf, words); for (i = 0; i < wordCount; i++) { enum snp125Color wordColor = hashIntVal(snp125FuncCartColorHash, words[i]); - if (snp125ColorCmpRaw(snp125ColorToMg(wordColor), "wordColor", - snp125ColorToMg(color), "color") > 0) + if (snp125ColorCmpRaw(snp125ColorToMg((enum snpColorEnum)wordColor), "wordColor", + snp125ColorToMg((enum snpColorEnum)color), "color") > 0) color = wordColor; } } break; case snp125ColorSourceLocType: valIx = stringArrayIx(snp->locType,snp125LocTypeDataName,snp125LocTypeArraySize); if (valIx < 0) valIx = 0; color = snp125LocTypeCart[valIx]; break; case snp125ColorSourceExceptions: { if (isEmpty(snp->exceptions)) color = snp132ExceptionsCart[0]; else { safecpy(buf, sizeof(buf), snp->exceptions); wordCount = chopCommas(buf, words); for (i = 0; i < wordCount; i++) { valIx = stringArrayIx(words[i], snp132ExceptionVarName, snp132ExceptionArraySize); enum snp125Color wordColor = snp132ExceptionsCart[valIx]; - if (snp125ColorCmpRaw(snp125ColorToMg(wordColor), "wordColor", - snp125ColorToMg(color), "color") > 0) + if (snp125ColorCmpRaw(snp125ColorToMg((enum snpColorEnum)wordColor), "wordColor", + snp125ColorToMg((enum snpColorEnum)color), "color") > 0) color = wordColor; } } } break; case snp125ColorSourceBitfields: { if (isEmpty(snp->bitfields)) color = snp132BitfieldsCart[0]; else { safecpy(buf, sizeof(buf), snp->bitfields); wordCount = chopCommas(buf, words); for (i = 0; i < wordCount; i++) { valIx = stringArrayIx(words[i], snp132BitfieldDataName, snp132BitfieldArraySize); enum snp125Color wordColor = snp132BitfieldsCart[valIx]; - if (snp125ColorCmpRaw(snp125ColorToMg(wordColor), "wordColor", - snp125ColorToMg(color), "color") > 0) + if (snp125ColorCmpRaw(snp125ColorToMg((enum snpColorEnum)wordColor), "wordColor", + snp125ColorToMg((enum snpColorEnum)color), "color") > 0) color = wordColor; } } } break; case snp125ColorSourceAlleleFreq: default: color = snp125ColorBlack; break; } - snp->weight = snp125ColorToMg(color); + snp->weight = snp125ColorToMg((enum snpColorEnum)color); } } static void loadSnp125Basic(struct track *tg, int version, void *(loadFunction)(char **)) /* load snp125 or snp132Ext items from table */ { struct sqlConnection *conn = hAllocConn(database); struct snp132Ext *itemList = NULL; int rowOffset = 0; char **row = NULL; struct sqlResult *sr = hRangeQuery(conn, tg->table, chromName, winStart, winEnd, NULL, &rowOffset); while ((row = sqlNextRow(sr)) != NULL) { struct slList *snp = loadFunction(row + rowOffset); slAddHead(&itemList, snp);