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

Timestamp:

Jul 12, 2005, 9:12:01 AM (21 years ago)

Author:

desonia

Message:

massive restructuring of codebase.

File:

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

trunk/psLib/src/imageops/psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-25 02:02:05 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-12 19:12:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -65 +65 @@
     result->image = psImageAlloc(numCols,numRows,PS_TYPE_KERNEL);
     memset(result->image->rawDataBuffer,0,numCols*numRows*PSELEMTYPE_SIZEOF(PS_TYPE_KERNEL));
-    result->p_kernelRows = psAlloc(sizeof(psKernelType*)*numRows);
-
-    psKernelType** kernelRows = result->p_kernelRows;
-    psKernelType** imageRows = result->image->data.PS_TYPE_KERNEL_DATA;
+    result->p_kernelRows = psAlloc(sizeof(float*)*numRows);
+
+    float** kernelRows = result->p_kernelRows;
+    float** imageRows = result->image->data.PS_TYPE_KERNEL_DATA;
     for (psS32 i = 0; i < numRows; i++) {
         kernelRows[i] = imageRows[i] - xMin;
@@ -103 +103 @@
     psS32 yMax = 0;
     psS32 length = 0;
-    psKernelType normalizeTime = 1.0;  // fraction of total time for each shift clock
+    float normalizeTime = 1.0;  // fraction of total time for each shift clock
     psKernel* result = NULL;
-    psKernelType** kernel = NULL;
+    float** kernel = NULL;
 
     // got non-NULL vectors?
@@ -170 +170 @@
         } \
         \
-        normalizeTime = 1.0 / (psKernelType)(tShiftData[length-1]); \
+        normalizeTime = 1.0 / (float)(tShiftData[length-1]); \
         result = psKernelAlloc(xMin,xMax,yMin,yMax); \
         kernel = result->kernel; \
@@ -180 +180 @@
             y = lastY - yShiftData[i]; \
             \
-            kernel[y][x] += (psKernelType)t / (psKernelType)lastT; \
+            kernel[y][x] += (float)t / (float)lastT; \
             prevT = tShiftData[i]; \
         } \
@@ -216 +216 @@
         kernel = result->kernel; \
         \
-        normalizeTime = 1.0 / (psKernelType)t; \
+        normalizeTime = 1.0 / (float)t; \
         x = 0; \
         y = 0; \
         for (psS32 i = length-1; i >= 0; i--) { \
-            kernel[y][x] += (psKernelType)(tShiftData[i]) * normalizeTime; \
+            kernel[y][x] += (float)(tShiftData[i]) * normalizeTime; \
             x -= xShiftData[i]; \
             y -= yShiftData[i]; \
@@ -296 +296 @@
     psS32 yMin = kernel->yMin;
     psS32 yMax = kernel->yMax;
-    psKernelType** kData = kernel->kernel;
+    float** kData = kernel->kernel;
 
     // make the output image to the proper size and type
@@ -399 +399 @@
         // pad the kernel to the same size of paddedImage
         psImage* paddedKernel = psImageAlloc(paddedCols,paddedRows,PS_TYPE_KERNEL);
-        memset(paddedKernel->data.U8[0],0,sizeof(psKernelType)*numCols*numRows); // zero-out image
+        memset(paddedKernel->data.U8[0],0,sizeof(float)*numCols*numRows); // zero-out image
         psS32 yMax = kernel->yMax;
         psS32 xMax = kernel->xMax;
@@ -407 +407 @@
                 padRow += paddedRows;
             }
-            psKernelType* padData = paddedKernel->data.PS_TYPE_KERNEL_DATA[padRow];
-            psKernelType* kernelRow = kernel->kernel[row];
+            float* padData = paddedKernel->data.PS_TYPE_KERNEL_DATA[padRow];
+            float* kernelRow = kernel->kernel[row];
             for (psS32 col = kernel->xMin; col <= xMax; col++) {
                 if (col < 0) {