Changeset 1940 for trunk/psLib/src/image/psImageConvolve.c

Timestamp:

Oct 1, 2004, 10:58:32 AM (22 years ago)

Author:

desonia

Message:

changes related to addition of test for psKernelGenerate.

File:

• trunk/psLib/src/image/psImageConvolve.c (modified) (7 diffs)

trunk/psLib/src/image/psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-30 21:01:09 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-01 20:58:32 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
     result->yMax = yMax;
     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);
 
@@ -94 +95 @@
     int y = 0;
     int t = 0;
-    int deltaT = 0;
+    int deltaT;
+    int oldX;
+    int oldY;
     int xMin = 0;
     int xMax = 0;
@@ -105 +108 @@
 
     // got non-NULL vectors?
-    if (xShifts == NULL || yShifts == NULL) {
+    if (tShifts == NULL || xShifts == NULL || yShifts == NULL) {
         psErrorMsg(PS_ERRORNAME_DOMAIN "psKernelGenerate",
                    PS_ERR_BAD_PARAMETER_NULL, true,
@@ -146 +149 @@
         ps##TYPE *xShiftData = xShifts->data.TYPE; \
         ps##TYPE *yShiftData = yShifts->data.TYPE; \
+        x = 0; \
+        y = 0; \
+        t = 0; \
         for (int lcv = 0; lcv < length; lcv++) { \
             if (relative) { \
                 x += xShiftData[lcv]; \
                 y += yShiftData[lcv]; \
+                t += tShiftData[lcv]; \
             } else { \
                 x = xShiftData[lcv]; \
                 y = yShiftData[lcv]; \
+                t = tShiftData[lcv]; \
             } \
             if (x < xMin) { \
@@ -168 +176 @@
         kernel = result->kernel; \
         \
-        x = xShiftData[0]; \
-        y = yShiftData[0]; \
-        t = tShiftData[0]; \
-        normalizeTime = 1.0 / (psKernelType)(tShiftData[length-1]-t); \
-        for (int i = 1; i < length; i++) { \
+        normalizeTime = 1.0 / (psKernelType)(t); \
+        x = 0; \
+        y = 0; \
+        t = 0; \
+        for (int i = 0; i < length; i++) { \
             deltaT = t; \
+            oldX = x; \
+            oldY = y; \
             if (relative) { \
                 t += tShiftData[i]; \
@@ -185 +195 @@
             deltaT = t - deltaT; \
             \
-            kernel[y][x] += deltaT * normalizeTime; \
+            kernel[oldY][oldX] += deltaT * normalizeTime; \
         } \
+        break; \
     }