src/lib/gifLabel.c 1.10

Index: src/lib/gifLabel.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/lib/gifLabel.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -B -U 1000000 -r1.9 -r1.10
--- src/lib/gifLabel.c	18 Sep 2008 00:38:20 -0000	1.9
+++ src/lib/gifLabel.c	19 Aug 2009 23:12:44 -0000	1.10
@@ -1,108 +1,108 @@
 /* gifLabel - create labels as GIF files. */
 
 #include "common.h"
 #include "memgfx.h"
 #include "portable.h"
 #include "gifLabel.h"
 
 static char const rcsid[] = "$Id$";
 
 int gifLabelMaxWidth(char **labels, int labelCount)
 /* Return maximum pixel width of labels.  It's ok to have
  * NULLs in labels array. */
 {
 int width = 0, w, i;
 MgFont *font = mgMediumFont();
 for (i=0; i<labelCount; ++i)
     {
     char *label = labels[i];
     if (label != NULL)
 	{
 	w = mgFontStringWidth(font, labels[i]);
 	if (w > width)
 	    width = w;
 	}
     }
 width += 2;
 return width;
 }
 
 static struct memGfx *altColorLabels(char **labels, int labelCount, int width)
 /* Return a memory image with alternating colors. */
 {
 struct memGfx *mg = NULL;
 Color c1,c2;
 MgFont *font = mgMediumFont();
 int lineHeight = mgFontLineHeight(font)-1;
 int height = lineHeight * labelCount, i;
 int y = 0;
 
 /* Allocate picture and set up colors. */
 mg = mgNew(width, height);
 c1 = mgFindColor(mg, 0xE0, 0xE0, 0xFF);
 c2 = mgFindColor(mg, 0xFF, 0xC8, 0xC8);
 
 /* Draw text. */
 for (i=labelCount-1; i >= 0; --i)
     {
     Color c = ((i&1) ? c2 : c1);
     mgDrawBox(mg, 0, y, width, lineHeight, c);
     mgTextRight(mg, 0+1, y+1, width-1, lineHeight, MG_BLACK, font, labels[i]);
     y += lineHeight;
     }
 
 return mg;
 }
 
 
 boolean sameGifContents(struct memGfx *n1, struct memGfx *n2)
 /* compare two files and return true if their contents are identical using binary compare */
 {
 if (n1 == NULL) {  return FALSE; }
 if (n2 == NULL) { return FALSE; }
 if (n1->width != n2->width) { return FALSE; }
 if (n1->height != n2->height) { return FALSE; }
 if (n1->colorsUsed != n2->colorsUsed) { return FALSE; }
 if (memcmp(n1->colorMap, n2->colorMap, 256 * 3)!=0) { return FALSE; } /* gif colormaps differ */
 long bytes = (long)n1->width * n1->height;
 if (memcmp(n1->pixels, n2->pixels, bytes)!=0) { return FALSE; } /* gif contents differ */
 return TRUE;
 }
 
 void gifLabelVerticalText(char *fileName, char **labels, int labelCount, 
 	int height)
 /* Make a gif file with given labels.  This will check to see if fileName
  * exists already and has not changed, and if so do nothing. */
 {
 struct memGfx *straight = altColorLabels(labels, labelCount, height);
 struct memGfx *rotated = mgRotate90(straight);
 struct memGfx *existing = NULL;
 if (fileExists(fileName))
     existing = mgLoadGif(fileName);
 /* the savings here is in the user's own browser cache - not updated if no change */
 if (!sameGifContents(rotated, existing))  
     {
     struct tempName tn;
     makeTempName(&tn, "gifLabelVertTemp", ".gif");
-    mgSaveGif(rotated, tn.forCgi); 
+    mgSaveGif(rotated, tn.forCgi, FALSE); 
     rename(tn.forCgi, fileName);
     }
 mgFree(&straight);
 mgFree(&rotated);
 if (existing)
     mgFree(&existing);
 }
 
 
 #ifdef DEBUG
 void gifTest()
 {
 static char *labels[] = {"cerebellum", "thymus", "breast", "heart",
 			 "stomach", "cartilage", "kidney", "liver",
 			 "lung", "testis", "black hole" };
 int size = gifLabelMaxWidth(labels, ArraySize(labels));
 int gifLabelMaxWidth(char **labels, int labelCount)
 gifLabelVerticalText("../trash/foo.gif", labels, ArraySize(labels), size);
 uglyf("<IMG SRC=\"../trash/foo.gif\">");
 }
 #endif /* DEBUG */