Changeset 4920 for trunk/psLib/src/imageops/psImageConvolve.c

Timestamp:

Aug 30, 2005, 4:07:12 PM (21 years ago)

Author:

drobbin

Message:

Updated code w.r.t the latest api-delta report

File:

• trunk/psLib/src/imageops/psImageConvolve.c (modified) (4 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-30 01:14:13 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-31 02:07:11 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -488 +488 @@
 
 void psImageSmooth (psImage *image,
-                    float sigma,
-                    float Nsigma)
+                    double  sigma,
+                    double  Nsigma)
 {
 
     int Nx, Ny, Npixel, Nrange;
-    float factor, g, s;
+    double factor, g, s;
     psVector *temp;
 
@@ -505 +505 @@
 
     // generate gaussian
-    psVector *gaussnorm = psVectorAlloc (Npixel, PS_TYPE_F32);
+    psVector *gaussnorm = psVectorAlloc (Npixel, PS_TYPE_F64);
     for (int i = -Nrange; i < Nrange + 1; i++) {
-        gaussnorm->data.F32[i+Nrange] = exp (factor*i*i);
-    }
-    psF32 *gauss = &gaussnorm->data.F32[Nrange];
+        gaussnorm->data.F64[i+Nrange] = exp (factor*i*i);
+    }
+    psF64 *gauss = &gaussnorm->data.F64[Nrange];
 
     // smooth in X direction
-    temp = psVectorAlloc (Nx, PS_TYPE_F32);
+    temp = psVectorAlloc (Nx, PS_TYPE_F64);
     for (int j = 0; j < Ny; j++) {
-        psF32 *vi = image->data.F32[j];
-        psF32 *vo = temp->data.F32;
+        psF64 *vi = image->data.F64[j];
+        psF64 *vo = temp->data.F64;
         for (int i = 0; i < Nx; i++) {
             g = s = 0;
@@ -528 +528 @@
             vo[i] = s / g;
         }
-        memcpy (image->data.F32[j], temp->data.F32, Nx*sizeof(psF32));
+        memcpy (image->data.F64[j], temp->data.F64, Nx*sizeof(psF64));
     }
     psFree (temp);
 
     // smooth in Y direction
-    temp = psVectorAlloc (image->numRows, PS_TYPE_F32);
+    temp = psVectorAlloc (image->numRows, PS_TYPE_F64);
     for (int i = 0; i < Nx; i++) {
-        psF32  *vo = temp->data.F32;
-        psF32 **vi = image->data.F32;
+        psF64  *vo = temp->data.F64;
+        psF64 **vi = image->data.F64;
         for (int j = 0; j < Ny; j++) {
             g = s = 0;