avoid a possible sign-extension for offsets/sizes in SGI

[imager.git] / quant.c

diff --git a/quant.c b/quant.c
index a37a12362c1d060f1482c7f93476c4a73844c8a1..01ec8fcd38e91e1932e4520cfffb5a8ee9472d19 100644 (file)
--- a/quant.c
+++ b/quant.c
@@ -9,6 +9,7 @@ static void makemap_webmap(i_quantize *);
 static void makemap_addi(i_quantize *, i_img **imgs, int count);
 static void makemap_mediancut(i_quantize *, i_img **imgs, int count);
 static void makemap_mono(i_quantize *);
 static void makemap_addi(i_quantize *, i_img **imgs, int count);
 static void makemap_mediancut(i_quantize *, i_img **imgs, int count);
 static void makemap_mono(i_quantize *);

+static void makemap_gray(i_quantize *, int step);

 
 static int makemap_palette(i_quantize *, i_img **imgs, int count);
 
 
 static int makemap_palette(i_quantize *, i_img **imgs, int count);
 


@@ -72,6 +73,18 @@ i_quant_makemap(i_quantize *quant, i_img **imgs, int count) {
     makemap_mono(quant);
     break;
 
     makemap_mono(quant);
     break;
 

+  case mc_gray:
+    makemap_gray(quant, 1);
+    break;
+
+  case mc_gray4:
+    makemap_gray(quant, 85);
+    break;
+
+  case mc_gray16:
+    makemap_gray(quant, 17);
+    break;
+

   case mc_addi:
   default:
     makemap_addi(quant, imgs, count);
   case mc_addi:
   default:
     makemap_addi(quant, imgs, count);


@@ -80,7 +93,7 @@ i_quant_makemap(i_quantize *quant, i_img **imgs, int count) {
 }
 
 static void translate_closest(i_quantize *, i_img *, i_palidx *);
 }
 
 static void translate_closest(i_quantize *, i_img *, i_palidx *);

-static void translate_errdiff(i_quantize *, i_img *, i_palidx *);
+static int translate_errdiff(i_quantize *, i_img *, i_palidx *);

 static void translate_addi(i_quantize *, i_img *, i_palidx *);
 
 /*
 static void translate_addi(i_quantize *, i_img *, i_palidx *);
 
 /*


@@ -130,7 +143,10 @@ i_quant_translate(i_quantize *quant, i_img *img) {
     break;
     
   case pt_errdiff:
     break;
     
   case pt_errdiff:

-    translate_errdiff(quant, img, result);
+    if (!translate_errdiff(quant, img, result)) {
+      myfree(result);
+      return NULL;
+    }

     break;
     
   case pt_perturb:
     break;
     
   case pt_perturb:


@@ -451,7 +467,7 @@ makemap_addi(i_quantize *quant, i_img **imgs, int count) {
 
 typedef struct {
   i_sample_t rgb[3];
 
 typedef struct {
   i_sample_t rgb[3];

-  int count;
+  i_img_dim count;

 } quant_color_entry;
 
 #define MEDIAN_CUT_COLORS 32768
 } quant_color_entry;
 
 #define MEDIAN_CUT_COLORS 32768


@@ -634,8 +650,8 @@ makemap_mediancut(i_quantize *quant, i_img **imgs, int count) {
       int max_index = 0, max_ch = 0; /* index/channel with biggest spread */
       int max_size;
       medcut_partition *workpart;
       int max_index = 0, max_ch = 0; /* index/channel with biggest spread */
       int max_size;
       medcut_partition *workpart;

-      int cum_total;
-      int half;
+      i_img_dim cum_total;
+      i_img_dim half;

       
       /* find the partition with the most biggest span with more than 
          one color */
       
       /* find the partition with the most biggest span with more than 
          one color */


@@ -689,7 +705,7 @@ makemap_mediancut(i_quantize *quant, i_img **imgs, int count) {
     /* fill in the color table - since we could still have partitions
        that have more than one color, we need to average the colors */
     for (part_num = 0; part_num < color_count; ++part_num) {
     /* fill in the color table - since we could still have partitions
        that have more than one color, we need to average the colors */
     for (part_num = 0; part_num < color_count; ++part_num) {

-      long sums[3];
+      double sums[3];

       medcut_partition *workpart;
       
       workpart = parts+part_num;
       medcut_partition *workpart;
       
       workpart = parts+part_num;


@@ -698,7 +714,7 @@ makemap_mediancut(i_quantize *quant, i_img **imgs, int count) {
       
       for (i = workpart->start; i < workpart->start + workpart->size; ++i) {
         for (ch = 0; ch < 3; ++ch) {
       
       for (i = workpart->start; i < workpart->start + workpart->size; ++i) {
         for (ch = 0; ch < 3; ++ch) {

-          sums[ch] += colors[i].rgb[ch] * colors[i].count;
+          sums[ch] += (int)(colors[i].rgb[ch]) * colors[i].count;

         }
       }
       for (ch = 0; ch < 3; ++ch) {
         }
       }
       for (ch = 0; ch < 3; ++ch) {


@@ -726,6 +742,19 @@ makemap_mono(i_quantize *quant) {
   quant->mc_count = 2;
 }
 
   quant->mc_count = 2;
 }
 

+static void
+makemap_gray(i_quantize *quant, int step) {
+  int gray = 0;
+  int i = 0;
+
+  while (gray < 256) {
+    setcol(quant->mc_colors+i, gray, gray, gray, 255);
+    ++i;
+    gray += step;
+  }
+  quant->mc_count = i;
+}
+

 static void
 makemap_webmap(i_quantize *quant) {
   int r, g, b;
 static void
 makemap_webmap(i_quantize *quant) {
   int r, g, b;


@@ -1328,8 +1357,7 @@ typedef struct errdiff_tag {
 } errdiff_t;
 
 /* perform an error diffusion dither */
 } errdiff_t;
 
 /* perform an error diffusion dither */

-static
-void
+static int

 translate_errdiff(i_quantize *quant, i_img *img, i_palidx *out) {
   int *map;
   int mapw, maph, mapo;
 translate_errdiff(i_quantize *quant, i_img *img, i_palidx *out) {
   int *map;
   int mapw, maph, mapo;


@@ -1357,14 +1385,25 @@ translate_errdiff(i_quantize *quant, i_img *img, i_palidx *out) {
     mapo = maps[index].orig;
   }
   
     mapo = maps[index].orig;
   }
   

+  difftotal = 0;
+  for (i = 0; i < maph * mapw; ++i) {
+    if (map[i] < 0) {
+      i_push_errorf(0, "errdiff_map values must be non-negative, errdiff[%d] is negative", i);
+      return 0;
+    }
+    difftotal += map[i];
+  }
+
+  if (!difftotal) {
+    i_push_error(0, "error diffusion map must contain some non-zero values");
+    return 0;
+  }
+

   errw = img->xsize+mapw;
   err = mymalloc(sizeof(*err) * maph * errw);
   /*errp = err+mapo;*/
   memset(err, 0, sizeof(*err) * maph * errw);
   
   errw = img->xsize+mapw;
   err = mymalloc(sizeof(*err) * maph * errw);
   /*errp = err+mapo;*/
   memset(err, 0, sizeof(*err) * maph * errw);
   

-  difftotal = 0;
-  for (i = 0; i < maph * mapw; ++i)
-    difftotal += map[i];

   /*printf("map:\n");
  for (dy = 0; dy < maph; ++dy) {
    for (dx = 0; dx < mapw; ++dx) {
   /*printf("map:\n");
  for (dy = 0; dy < maph; ++dy) {
    for (dx = 0; dx < mapw; ++dx) {


@@ -1418,6 +1457,8 @@ translate_errdiff(i_quantize *quant, i_img *img, i_palidx *out) {
   }
   CF_CLEANUP;
   myfree(err);
   }
   CF_CLEANUP;
   myfree(err);

+
+  return 1;

 }
 /* Prescan finds the boxes in the image that have the highest number of colors 
    and that result is used as the initial value for the vectores */
 }
 /* Prescan finds the boxes in the image that have the highest number of colors 
    and that result is used as the initial value for the vectores */


@@ -1488,7 +1529,7 @@ static void reorder(pbox prescan[512]) {
   c.cand++;
   c.pdc=c.pixcnt/(c.cand*c.cand); 
   /*  c.pdc=c.pixcnt/c.cand; */
   c.cand++;
   c.pdc=c.pixcnt/(c.cand*c.cand); 
   /*  c.pdc=c.pixcnt/c.cand; */

-  while(c.pdc < prescan[nidx+1].pdc && nidx < 511) {
+  while(nidx < 511 && c.pdc < prescan[nidx+1].pdc) {

     prescan[nidx]=prescan[nidx+1];
     nidx++;
   }
     prescan[nidx]=prescan[nidx+1];
     nidx++;
   }


@@ -1548,7 +1589,7 @@ static
 void
 cr_hashindex(cvec clr[256],int cnum,hashbox hb[512]) {
   
 void
 cr_hashindex(cvec clr[256],int cnum,hashbox hb[512]) {
   

-  int bx,mind,cd,cumcnt,bst_idx,i;
+  int bx,mind,cd,cumcnt,i;

 /*  printf("indexing... \n");*/
   
   cumcnt=0;
 /*  printf("indexing... \n");*/
   
   cumcnt=0;


@@ -1556,7 +1597,7 @@ cr_hashindex(cvec clr[256],int cnum,hashbox hb[512]) {
     mind=196608;
     for(i=0; i<cnum; i++) { 
       cd = maxdist(bx,&clr[i]);
     mind=196608;
     for(i=0; i<cnum; i++) { 
       cd = maxdist(bx,&clr[i]);

-      if (cd < mind) { mind=cd; bst_idx=i; } 
+      if (cd < mind) { mind=cd; } 

     }
     
     hb[bx].cnt=0;
     }
     
     hb[bx].cnt=0;