i_img_info() (C API) no longer tries to handle a NULL image object pointer.

[imager.git] / gaussian.im

diff --git a/gaussian.im b/gaussian.im
index 34fe813493aaeafeb2bae5b3c8f8f183a8a69c98..7e937692332c05852239ce97714bb27ebffba8b1 100644 (file)
--- a/gaussian.im
+++ b/gaussian.im
@@ -1,9 +1,10 @@
+#define IMAGER_NO_CONTEXT

 #include "imager.h"
 #include <math.h>
 
 static double
 gauss(int x, double std) {
 #include "imager.h"
 #include <math.h>
 
 static double
 gauss(int x, double std) {

-  return 1.0/(sqrt(2.0*PI)*std)*exp(-(double)(x)*(float)(x)/(2*std*std));
+  return 1.0/(sqrt(2.0*PI)*std)*exp(-(double)(x)*(double)(x)/(2*std*std));

 }
 
 /* Counters are as follows
 }
 
 /* Counters are as follows


@@ -18,14 +19,16 @@ gauss(int x, double std) {
 
 int
 i_gaussian(i_img *im, double stddev) {
 
 int
 i_gaussian(i_img *im, double stddev) {

-  int i,l,c,ch;
+  int i, c, ch;
+  i_img_dim x, y;

   double pc;
   double *coeff;
   double res[MAXCHANNELS];
   i_img *timg;
   int radius, diameter;
   double pc;
   double *coeff;
   double res[MAXCHANNELS];
   i_img *timg;
   int radius, diameter;

+  dIMCTXim(im);

 
 

-  mm_log((1,"i_gaussian(im %p, stdev %.2f)\n",im,stddev));
+  im_log((aIMCTX, 1,"i_gaussian(im %p, stdev %.2f)\n",im,stddev));

   i_clear_error();
 
   if (stddev <= 0) {
   i_clear_error();
 
   if (stddev <= 0) {


@@ -59,41 +62,41 @@ i_gaussian(i_img *im, double stddev) {
 
 #code im->bits <= 8
   IM_COLOR rcolor;
 
 #code im->bits <= 8
   IM_COLOR rcolor;

-  for(l=0;l<im->ysize;l++) {
-    for(i=0;i<im->xsize;i++) {
+  for(y = 0; y < im->ysize; y++) {
+    for(x = 0; x < im->xsize; x++) {

       pc=0.0;
       for(ch=0;ch<im->channels;ch++) 
        res[ch]=0; 
       for(c = 0;c < diameter; c++)
       pc=0.0;
       for(ch=0;ch<im->channels;ch++) 
        res[ch]=0; 
       for(c = 0;c < diameter; c++)

-       if (IM_GPIX(im,i+c-radius,l,&rcolor)!=-1) {
+       if (IM_GPIX(im,x+c-radius,y,&rcolor)!=-1) {

          for(ch=0;ch<im->channels;ch++) 
            res[ch]+= rcolor.channel[ch] * coeff[c];
          pc+=coeff[c];
        }
       for(ch=0;ch<im->channels;ch++) {
        double value = res[ch] / pc;
          for(ch=0;ch<im->channels;ch++) 
            res[ch]+= rcolor.channel[ch] * coeff[c];
          pc+=coeff[c];
        }
       for(ch=0;ch<im->channels;ch++) {
        double value = res[ch] / pc;

-       rcolor.channel[ch] = value > IM_SAMPLE_MAX ? IM_SAMPLE_MAX : value;
+       rcolor.channel[ch] = value > IM_SAMPLE_MAX ? IM_SAMPLE_MAX : IM_ROUND(value);

       }
       }

-      IM_PPIX(timg,i,l,&rcolor);
+      IM_PPIX(timg, x, y, &rcolor);

     }
   }
   
     }
   }
   

-  for(l=0;l<im->xsize;l++) {
-    for(i=0;i<im->ysize;i++) {
+  for(x = 0;x < im->xsize; x++) {
+    for(y = 0; y < im->ysize; y++) {

       pc=0.0;
       for(ch=0; ch<im->channels; ch++)
        res[ch]=0; 
       for(c=0; c < diameter; c++)
       pc=0.0;
       for(ch=0; ch<im->channels; ch++)
        res[ch]=0; 
       for(c=0; c < diameter; c++)

-       if (IM_GPIX(timg,l,i+c-radius,&rcolor)!=-1) {
+       if (IM_GPIX(timg, x, y+c-radius, &rcolor)!=-1) {

          for(ch=0;ch<im->channels;ch++) 
            res[ch]+= rcolor.channel[ch] * coeff[c];
          pc+=coeff[c];
        }
       for(ch=0;ch<im->channels;ch++) {
        double value = res[ch]/pc;
          for(ch=0;ch<im->channels;ch++) 
            res[ch]+= rcolor.channel[ch] * coeff[c];
          pc+=coeff[c];
        }
       for(ch=0;ch<im->channels;ch++) {
        double value = res[ch]/pc;

-       rcolor.channel[ch] = value > IM_SAMPLE_MAX ? IM_SAMPLE_MAX : value;
+       rcolor.channel[ch] = value > IM_SAMPLE_MAX ? IM_SAMPLE_MAX : IM_ROUND(value);

       }
       }

-      IM_PPIX(im,l,i,&rcolor);
+      IM_PPIX(im, x, y, &rcolor);

     }
   }
 #/code
     }
   }
 #/code