9723799cf6f1a8fb714ae1493b224b8e91aebf09
tdreszer
  Mon Jul 30 12:17:38 2012 -0700
Making final pass through tree of checkins as dictated by Jim. None of these changes should affect executables in any way. This pass is due to expanding fingerprint caused by kompare.
diff --git src/hg/hgTracks/imageV2.c src/hg/hgTracks/imageV2.c
index 79cdc7d..336d379 100644
--- src/hg/hgTracks/imageV2.c
+++ src/hg/hgTracks/imageV2.c
@@ -1046,31 +1046,31 @@
     if (topLeftX     < (slice->offsetX + slice->width-1)
     && bottomRightX > (slice->offsetX + 1)
     && topLeftY     < (slice->offsetY + slice->height-1)
     && bottomRightY > (slice->offsetY + 1)) // Overlap of a pixel or 2 is tolerated
         {
         struct mapSet *map = sliceGetMap(slice,FALSE);
         if (map!=NULL)
             {  // NOTE: using find or add gives precedence to first of same coordinate map items
             mapSetItemFindOrAdd(map,link,title,max(topLeftX,slice->offsetX),
                                 max(topLeftY,slice->offsetY),
                                 min(bottomRightX,slice->offsetX + slice->width),
                                 min(bottomRightY,slice->offsetY + slice->height), neededId);
             count++;
             }
         else
-        {  // NOTE: This assumes that if there is no map then the entire slice should get the link!
+            {  // NOTE: This assumes that if there is no map, the entire slice should get the link!
             char * name = (imgTrack->name != NULL ? imgTrack->name
                                                   : imgTrack->tdb != NULL ? imgTrack->tdb->track
                                                                           : imgFile);
             warn("imgTrackAddMapItem(%s,%s) mapItem(lx:%d,rx:%d) is overlapping "
                  "slice:%s(lx:%d,rx:%d)",name,title,topLeftX,bottomRightX,
                  sliceTypeToString(slice->type),slice->offsetX,(slice->offsetX + slice->width - 1));
             sliceAddLink(slice,link,title);
             count++;
             }
         }
     }
 return count;
 }
 
 static char *centerLabelSeenToString(enum centerLabelSeen seen)
@@ -1884,33 +1884,32 @@
     }
 
 if (imgBox->showPortal)
     {
     // Let js code know what's up
     int chromSize = hChromSize(database, chromName);
     jsonObjectAdd(jsonForClient,"chromStart", newJsonNumber(  1));
     jsonObjectAdd(jsonForClient,"chromEnd", newJsonNumber(chromSize));
     jsonObjectAdd(jsonForClient,"imgBoxPortal", newJsonBoolean(TRUE));
     jsonObjectAdd(jsonForClient,"imgBoxWidth", newJsonNumber(imgBox->width-imgBox->sideLabelWidth));
     jsonObjectAdd(jsonForClient,"imgBoxPortalStart", newJsonNumber(imgBox->portalStart));
     jsonObjectAdd(jsonForClient,"imgBoxPortalEnd", newJsonNumber(imgBox->portalEnd));
     jsonObjectAdd(jsonForClient,"imgBoxPortalWidth", newJsonNumber(imgBox->portalWidth));
     jsonObjectAdd(jsonForClient,"imgBoxLeftLabel", newJsonNumber(imgBox->plusStrand ?
                                                                  imgBox->sideLabelWidth : 0));
-    jsonObjectAdd(jsonForClient,"imgBoxPortalOffsetX",
-                                  newJsonNumber((long)(  (imgBox->portalStart - imgBox->chromStart)
-                                                       / imgBox->basesPerPixel)));
+    jsonObjectAdd(jsonForClient,"imgBoxPortalOffsetX", newJsonNumber(
+                  (long)((imgBox->portalStart - imgBox->chromStart) / imgBox->basesPerPixel)));
     jsonObjectAdd(jsonForClient,"imgBoxBasesPerPixel", newJsonDouble(imgBox->basesPerPixel));
     }
 else
     jsonObjectAdd(jsonForClient,"imgBoxPortal", newJsonBoolean(FALSE));
 
 hPrintf("<TABLE id='imgTbl' cellspacing='0' cellpadding='0'");
 hPrintf(" width='%d'",imgBox->showPortal?(imgBox->portalWidth+imgBox->sideLabelWidth):imgBox->width);
 hPrintf(" class='tableWithDragAndDrop'>\n");
 
 struct jsonElement *jsonTdbVars = newJsonObject(newHash(8));
 jsonTdbSettingsInit(jsonTdbVars);
 
 char *newLine = NEWLINE_TO_USE(cgiClientBrowser(NULL,NULL,NULL));
 struct imgTrack *imgTrack = imgBox->imgTracks;
 for (;imgTrack!=NULL;imgTrack=imgTrack->next)