Index: trunk/psModules/src/pmImageSubtract.c
===================================================================
--- trunk/psModules/src/pmImageSubtract.c	(revision 4579)
+++ trunk/psModules/src/pmImageSubtract.c	(revision 4992)
@@ -7,6 +7,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-19 01:44:48 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-11 22:25:39 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -124,6 +124,6 @@
     tmp->subIndex = 0;
     tmp->preCalc = NULL;
-    tmp->p_size = size;
-    tmp->p_spatialOrder = spatialOrder;
+    tmp->size = size;
+    tmp->spatialOrder = spatialOrder;
 
     //
@@ -220,6 +220,6 @@
     tmp->yOrder = psVectorAlloc(nBF, PS_TYPE_F32);
     tmp->subIndex = 0;
-    tmp->p_size = size;
-    tmp->p_spatialOrder = spatialOrder;
+    tmp->size = size;
+    tmp->spatialOrder = spatialOrder;
     tmp->preCalc = psArrayAlloc(nBF);
 
@@ -499,6 +499,6 @@
     psTrace("ImageSubtract.IsisKernelConvolve", 4,
             "Calling IsisKernelConvolve(%d, %d, %d)\n", kernelID, col, row);
-    psS32 spatialOrder = kernels->p_spatialOrder;
-    psS32 kernelSize = kernels->p_size;
+    psS32 spatialOrder = kernels->spatialOrder;
+    psS32 kernelSize = kernels->size;
     psS32 xOrder = (psS32) kernels->xOrder->data.F32[kernelID];
     psS32 yOrder = (psS32) kernels->yOrder->data.F32[kernelID];
@@ -557,5 +557,5 @@
     psF32 numRowsHalf = 0.5 * (psF32) input->numRows;
     psF32 background = solution->data.F64[solution->n-1];
-    psS32 spatialOrder = kernels->p_spatialOrder;
+    psS32 spatialOrder = kernels->spatialOrder;
     psF32 conv = background; // Initial convolved value
 
@@ -671,5 +671,5 @@
     psS32 numCols = input->numCols;
     psS32 numRows = input->numRows;
-    psS32 kernelSize = kernels->p_size;
+    psS32 kernelSize = kernels->size;
 
     psImage *convolved = psImageAlloc(numCols, numRows, PS_TYPE_F32);
@@ -746,5 +746,5 @@
         PS_ASSERT_VECTORS_SIZE_EQUAL(kernels->u, kernels->preCalc, false);
     }
-    psS32 kernelSize = kernels->p_size;
+    psS32 kernelSize = kernels->size;
     PS_ASSERT_INT_NONNEGATIVE(footprint, false);
     //
@@ -777,5 +777,5 @@
     psS32 numHalfRows = reference->numRows;
     psS32 numHalfCols = reference->numCols;
-    psS32 spatialOrder = kernels->p_spatialOrder;
+    psS32 spatialOrder = kernels->spatialOrder;
 
     //
@@ -1163,5 +1163,5 @@
     PS_ASSERT_VECTOR_SIZE(solution, nBF+1, NULL);
 
-    psS32 kernelSize = kernels->p_size;
+    psS32 kernelSize = kernels->size;
     int xSize = footprint + kernelSize;
     int ySize = footprint + kernelSize;
@@ -1332,6 +1332,6 @@
 
     psS32 nBF = kernels->u->n;
-    psS32 spatialOrder = kernels->p_spatialOrder;
-    psS32 kernelSize = kernels->p_size;
+    psS32 spatialOrder = kernels->spatialOrder;
+    psS32 kernelSize = kernels->size;
 
     if (out != NULL) {