update Changes

[imager.git] / dynfilt / flines.c

diff --git a/dynfilt/flines.c b/dynfilt/flines.c
index 79ac9a9da4ea9b71753b87b93ee2a3112e194a04..f42a37b1eac6546106417820e5b60612380dcd9a 100644 (file)
--- a/dynfilt/flines.c
+++ b/dynfilt/flines.c
@@ -23,33 +23,33 @@ void
 flines(void *INP) {
   i_img *im;
   i_color vl;
-  int x,y;
+  i_img_dim x,y;
   
   if ( !getOBJ("image","Imager::ImgRaw",&im) ) {
                fprintf(stderr,"Error: image is missing\n"); 
                return;
        }
   
-  fprintf(stderr, "flines: parameters: (im 0x%x)\n",im);
-  fprintf(stderr, "flines: image info:\n size (%d,%d)\n channels (%d)\n channel mask (%d)\n bytes (%d)\n",im->xsize,im->ysize,im->channels,im->ch_mask,im->bytes); 
+  fprintf(stderr, "flines: parameters: (im %p)\n",im);
+  fprintf(stderr, "flines: image info:\n size (" i_DFp ")\n channels (%d)\n",
+         i_DFcp(im->xsize,im->ysize), im->channels);
 
   for(y = 0; y < im->ysize; y ++) {
+    float yf, mf;
+    if (!(y%2)) {
+      yf = y/(double)im->ysize;
+    }
+    else {
+      yf = (im->ysize-y)/(double)im->ysize;
+    }
+    mf = 1.2-0.8*yf;
+
     for(x = 0; x < im->xsize; x ++ ) {
       i_gpix(im,x,y,&vl); 
-                       if (!(y%2)) {
-                               float yf = y/(float)im->ysize;
-                               float mf = 1.2-0.8*yf;
-                               vl.rgb.r = saturate(vl.rgb.r*mf);
-                               vl.rgb.g = saturate(vl.rgb.g*mf);
-                               vl.rgb.b = saturate(vl.rgb.b*mf);
-                       } else {
-                               float yf = (im->ysize-y)/(float)im->ysize;
-                               float mf = 1.2-0.8*yf;
-                               vl.rgb.r = saturate(vl.rgb.r*mf);
-                               vl.rgb.g = saturate(vl.rgb.g*mf);
-                               vl.rgb.b = saturate(vl.rgb.b*mf);
-                       } 
-     i_ppix(im,x,y,&vl); 
+      vl.rgb.r = saturate(vl.rgb.r*mf);
+      vl.rgb.g = saturate(vl.rgb.g*mf);
+      vl.rgb.b = saturate(vl.rgb.b*mf);
+      i_ppix(im,x,y,&vl); 
     }
   }
 }