bump $Imager::Font::FT2::VERSION

[imager.git] / map.c

diff --git a/map.c b/map.c
index 7acd64af6ae2c394e617fa4bbaffde1d96cb340f..9ddc62f855ebce456f7dc1588320b340cd1681f1 100644 (file)
--- a/map.c
+++ b/map.c
@@ -17,7 +17,7 @@ converting from RGBA to greyscale and back.
 =cut
 */
 
 =cut
 */
 

-#include "image.h"
+#include "imager.h"

 
 
 /*
 
 
 /*


@@ -37,29 +37,34 @@ maps im inplace into another image.
 void
 i_map(i_img *im, unsigned char (*maps)[256], unsigned int mask) {
   i_color *vals;
 void
 i_map(i_img *im, unsigned char (*maps)[256], unsigned int mask) {
   i_color *vals;

-  int x, y;
-  int mapno, i, ch;
-  int minset = -1, maxset;
+  i_img_dim x, y;
+  int i, ch;
+  int minset = -1, maxset = 0;

 
   mm_log((1,"i_map(im %p, maps %p, chmask %u)\n", im, maps, mask));
 
   if (!mask) return; /* nothing to do here */
 
 
   mm_log((1,"i_map(im %p, maps %p, chmask %u)\n", im, maps, mask));
 
   if (!mask) return; /* nothing to do here */
 

-  for(i=0; i<im->channels; i++)
+  for(i=0; i<im->channels; i++) {

     if (mask & (1<<i)) {
       if (minset == -1) minset = i;
       maxset = i;
     }
     if (mask & (1<<i)) {
       if (minset == -1) minset = i;
       maxset = i;
     }

+  }

 
   mm_log((1, "minset=%d maxset=%d\n", minset, maxset));
 
 
   mm_log((1, "minset=%d maxset=%d\n", minset, maxset));
 

+  if (minset == -1)
+    return;
+

   vals = mymalloc(sizeof(i_color) * im->xsize);
 
   for (y = 0; y < im->ysize; ++y) {
     i_glin(im, 0, im->xsize, y, vals);
     for (x = 0; x < im->xsize; ++x) {
       for(ch = minset; ch<=maxset; ch++) {
   vals = mymalloc(sizeof(i_color) * im->xsize);
 
   for (y = 0; y < im->ysize; ++y) {
     i_glin(im, 0, im->xsize, y, vals);
     for (x = 0; x < im->xsize; ++x) {
       for(ch = minset; ch<=maxset; ch++) {

-       if (!maps[ch]) continue;
+       if (!(mask & (1 << ch)))
+         continue;

        vals[x].channel[ch] = maps[ch][vals[x].channel[ch]];
       }
     }
        vals[x].channel[ch] = maps[ch][vals[x].channel[ch]];
       }
     }