bugfix (transparens)

Rev: src/modules/image/quant.c:1.23
Rev: src/modules/image/togif.c:1.25

src/modules/image/quant.c

-/* $Id: quant.c,v 1.22 1997/01/14 15:23:52 law Exp $ */
+/* $Id: quant.c,v 1.23 1997/01/14 16:20:18 law Exp $ */
 
 /*
 
@@ -31,6 +31,8 @@ David K
 #define QUANT_DEBUG_RGB
 */
 
+#define QUANT_MAXIMUM_NUMBER_OF_COLORS 65535
+
 /**********************************************************************/
 
 #if 0
@@ -106,6 +108,41 @@ static INLINE int hash_enter(rgb_entry *rgbe,rgb_entry *end,
    return 0;
 }
 
+static INLINE int hash_enter_strip(rgb_entry *rgbe,rgb_entry *end,
+				   int len,rgb_group rgb,int strip)
+{
+   register rgb_entry *re;
+
+   unsigned char strip_r[24]=
+{ 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 
+  0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80 };
+   unsigned char strip_g[24]=
+{ 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 
+  0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80 };
+   unsigned char strip_b[24]=
+{ 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 
+  0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80 };
+
+   rgb.r&=strip_r[strip];
+   rgb.g&=strip_g[strip];
+   rgb.b&=strip_b[strip];
+
+   re=rgbe+hash(rgb,len);
+
+   while (re->count && !same_col(re->rgb,rgb))
+      if (++re==end) re=rgbe;
+
+   if (!re->count)  /* allocate it */
+   {
+      re->rgb=rgb; 
+      re->count=1; 
+      return 1; 
+   }
+
+   re->count++;
+   return 0;
+}
+
 static rgb_hashtbl *img_rehash(rgb_hashtbl *old, unsigned long newsize)
 {
    unsigned long i;
@@ -510,6 +547,7 @@ struct colortable *colortable_quant(struct image *img,int numcol)
    CHRONO("quant");
 
    if (numcol<2) numcol=2;
+
    if (numcol>MAX_NUMCOL) numcol=MAX_NUMCOL; 
 
    ct = colortable_allocate(numcol);
@@ -517,12 +555,18 @@ struct colortable *colortable_quant(struct image *img,int numcol)
 #ifdef QUANT_DEBUG
    fprintf(stderr,"Moving colors into hashtable\n");
 #endif
+
+   for (;;)
+   {
+      int strip=0;
+rerun:
+      entries=0;
+
+
       CHRONO("hash init");
       
       tbl = img_rehash(NULL, 8192);
       
-   if (1)
-   {
       p=img->img;
       i=sz;
       do
@@ -539,6 +583,8 @@ struct colortable *colortable_quant(struct image *img,int numcol)
 	 trig=(len*2)/10; /* 20% full => rehash bigger */
 	 end=(rgbe=tbl->tbl)+tbl->len;
 
+	 if (!strip)
+	 {
 	    while (i--)
 	       if ( (entries+=hash_enter(rgbe,end,len,*(p++))) > trig )
 	       {
@@ -546,11 +592,38 @@ struct colortable *colortable_quant(struct image *img,int numcol)
 		  fprintf(stderr,"rehash: 20%% = %d / %d...\n",entries,len);
 #endif
 		  CHRONO("rehash...");
+		  if ((len<<2) > QUANT_MAXIMUM_NUMBER_OF_COLORS)
+		  {
+		     strip++;
+		     fprintf(stderr,"strip: %d\n",strip);
+		     free(tbl);
+		     goto rerun;
+		  }
+		  tbl=img_rehash(tbl,len<<2); /* multiple size by 4 */
+		  break;
+	       }
+	 }
+	 else
+	    while (i--)
+	       if ( (entries+=hash_enter_strip(rgbe,end,len,*(p++),strip)) > trig )
+	       {
+#ifdef QUANT_DEBUG
+		  fprintf(stderr,"rehash: 20%% = %d / %d...\n",entries,len);
+#endif
+		  CHRONO("rehash...");
+		  if ((len<<2) > QUANT_MAXIMUM_NUMBER_OF_COLORS)
+		  {
+		     strip++;
+		     fprintf(stderr,"strip: %d\n",strip);
+		     free(tbl);
+		     goto rerun;
+		  }
 		  tbl=img_rehash(tbl,len<<2); /* multiple size by 4 */
 		  break;
 	       }
       }
       while (i>=0);
+      break;
    }
      
    /* Compact the hash table */

src/modules/image/togif.c

@@ -4,7 +4,7 @@ togif
 
 Pontus Hagland, law@infovav.se
 
-$Id: togif.c,v 1.24 1997/01/08 01:13:36 law Exp $ 
+$Id: togif.c,v 1.25 1997/01/14 16:20:19 law Exp $ 
 
 */
 
@@ -221,10 +221,7 @@ CHRONO("image_encode_gif begin");
    if (transparent)
    {
       i=colortable_rgb(ct,*transparent);
-      if (ct->clut[i].r==transparent->r 
-	  && ct->clut[i].g==transparent->g 
-	  && ct->clut[i].b==transparent->b)
-      {
+
       low_my_putchar( '!', &buf );  /* extras */
       low_my_putchar( 0xf9, &buf ); /* transparency */
       low_my_putchar( 4, &buf );
@@ -234,7 +231,6 @@ CHRONO("image_encode_gif begin");
       low_my_putchar( i, &buf );
       low_my_putchar( 0, &buf );
    }
-   }
 
 
    low_my_putchar( ',', &buf ); /* image separator */