Index: /trunk/psLib/src/imageops/psImageConvolve.c
===================================================================
--- /trunk/psLib/src/imageops/psImageConvolve.c	(revision 7075)
+++ /trunk/psLib/src/imageops/psImageConvolve.c	(revision 7076)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-05 02:48:34 $
+ *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-05 22:32:35 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -587,15 +587,11 @@
     PS_ASSERT_IMAGE_NON_NULL(image, NULL);
 
-    int Nx, Ny, Npixel, Nrange, Nr;
-    double factor, g, s, sum;
-    psVector *temp;
-
     // relevant terms
-    Nrange = sigma*Nsigma + 0.5;
-    Npixel = 2*Nrange + 1;
-    factor = -0.5/(sigma*sigma);
-
-    Nx = image->numCols;
-    Ny = image->numRows;
+    int Nrange = sigma*Nsigma + 0.5;
+    int Npixel = 2*Nrange + 1;
+    double factor = -0.5/(sigma*sigma);
+
+    int Nx = image->numCols;
+    int Ny = image->numRows;
 
     #define IMAGESMOOTH_CASE(TYPE) \
@@ -604,5 +600,5 @@
         psVector *gaussnorm = psVectorAlloc (Npixel, PS_TYPE_##TYPE); \
         gaussnorm->n = gaussnorm->nalloc; \
-        sum = 0.0; \
+        double sum = 0.0; \
         for (int i = -Nrange; i < Nrange + 1; i++) { \
             gaussnorm->data.TYPE[i+Nrange] = exp (factor*i*i); \
@@ -615,5 +611,5 @@
         \
         /* smooth in X direction */ \
-        temp = psVectorAlloc (Nx, PS_TYPE_##TYPE); \
+        psVector *temp = psVectorAlloc (Nx, PS_TYPE_##TYPE); \
         temp->n = temp->nalloc; \
         for (int j = 0; j < Ny; j++) { \
@@ -625,5 +621,6 @@
                 ps##TYPE *vr = vi - i; \
                 ps##TYPE *vg = gauss - i; \
-                g = s = 0; \
+                double g = 0; \
+                double s = 0; \
                 for (int n = -i; n < Nrange + 1; n++, vr++, vg++) { \
                     s += *vg * *vr; \
@@ -636,5 +633,5 @@
                 ps##TYPE *vr = vi - Nrange; \
                 ps##TYPE *vg = gauss - Nrange; \
-                s = 0; \
+                double s = 0; \
                 for (int n = -Nrange; n < Nrange + 1; n++, vr++, vg++) { \
                     s += *vg * *vr; \
@@ -647,5 +644,6 @@
                 ps##TYPE *vr = vi - Nrange; \
                 ps##TYPE *vg = gauss - Nrange; \
-                g = s = 0; \
+                double g = 0; \
+                double s = 0; \
                 for (int n = -Nrange; n < Nx - i - 1; n++, vr++, vg++) { \
                     s += *vg * *vr; \
@@ -670,5 +668,5 @@
                 ps##TYPE *vi = image->data.TYPE[j+n]; \
                 ps##TYPE *vo = temp->data.TYPE; \
-                g = gauss[n]; \
+                double g = gauss[n]; \
                 for (int i = 0; i < Nx; i++, vi++, vo++) { \
                     *vo += *vi * g; \
@@ -680,5 +678,5 @@
         for (int j = Nrange; j < Ny - Nrange; j++) { \
             /* save the Nrange-offset output row, then zero */ \
-            Nr = j % Nrange; \
+            int Nr = j % Nrange; \
             temp = temprows->data[Nr]; \
             memcpy (image->data.TYPE[j-Nrange], temp->data.TYPE, Nx*sizeof(ps##TYPE)); \
@@ -687,5 +685,5 @@
                 ps##TYPE *vi = image->data.TYPE[j+n]; \
                 ps##TYPE *vo = temp->data.TYPE; \
-                g = gauss[n]; \
+                double g = gauss[n]; \
                 for (int i = 0; i < Nx; i++, vi++, vo++) { \
                     *vo += *vi * g; \
@@ -695,5 +693,5 @@
         for (int j = Ny - Nrange; j < Ny; j++) { \
             /* save the Nrange-offset output row, then zero */ \
-            Nr = j % Nrange; \
+            int Nr = j % Nrange; \
             temp = temprows->data[Nr]; \
             memcpy (image->data.TYPE[j-Nrange], temp->data.TYPE, Nx*sizeof(ps##TYPE)); \
@@ -703,5 +701,5 @@
                 ps##TYPE *vi = image->data.TYPE[j+n]; \
                 ps##TYPE *vo = temp->data.TYPE; \
-                g = gauss[n]; \
+                double g = gauss[n]; \
                 for (int i = 0; i < Nx; i++, vi++, vo++) { \
                     *vo += *vi * g; \
@@ -711,5 +709,5 @@
         for (int j = Ny; j < Ny + Nrange; j++) { \
             /* save the Nrange-offset output row, then zero */ \
-            Nr = j % Nrange; \
+            int Nr = j % Nrange; \
             temp = temprows->data[Nr]; \
             memcpy (image->data.TYPE[j-Nrange], temp->data.TYPE, Nx*sizeof(ps##TYPE)); \