89ea68569377014dcce51081880a7e0ebfcc1d7f markd Sat Jun 27 12:47:34 2020 -0700 fixed error in merge diff --git src/jkOwnLib/genoFind.c src/jkOwnLib/genoFind.c index 24a8ff5..ae05696 100644 --- src/jkOwnLib/genoFind.c +++ src/jkOwnLib/genoFind.c @@ -1964,31 +1964,31 @@ for (qFrame = 0; qFrame<3; ++qFrame) { gfTransFindClumps(gfs, seqs[qFrame], clumps[qFrame], lm, &oneHit); hitCount += oneHit; } *retHitCount = hitCount; } void gfMakeOoc(char *outName, char *files[], int fileCount, int tileSize, bits32 maxPat, enum gfType tType, boolean noSimpRepMask) /* Count occurences of tiles in seqList and make a .ooc file. */ { boolean dbIsPep = (tType == gftProt || tType == gftDnaX || tType == gftRnaX); struct genoFind *gf = gfNewEmpty(gfMinMatch, gfMaxGap, tileSize, tileSize, maxPat, NULL, dbIsPep, FALSE, noSimpRepMask); -gfOffset *sizes = gf->listSizes; +bits32 *sizes = gf->listSizes; int tileSpaceSize = gf->tileSpaceSize; bioSeq *seq, *seqList; bits32 sig = oocSig, psz = tileSize; bits32 i; int oocCount = 0; char *inName; FILE *f = mustOpen(outName, "w"); if (gf->segSize > 0) errAbort("Don't yet know how to make ooc files for large tile sizes."); for (i=0; i<fileCount; ++i) { inName = files[i]; printf("Loading %s\n", inName); if (nibIsFile(inName))