Changeset 2204 for trunk/psLib/test/image/tst_psImageConvolve.c

Timestamp:

Oct 26, 2004, 2:57:34 PM (22 years ago)

Author:

desonia

Message:

converted native C types to ps Types, where practical.

File:

• trunk/psLib/test/image/tst_psImageConvolve.c (modified) (15 diffs)

trunk/psLib/test/image/tst_psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-13 01:22:38 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #include "psType.h"
 
-static int testKernelAlloc(void);
-static int testKernelGenerate(void);
-//static int testImageConvolve(void);
+static psS32 testKernelAlloc(void);
+static psS32 testKernelGenerate(void);
+//static psS32 testImageConvolve(void);
 
 testDescription tests[] = {
@@ -31 +31 @@
                           };
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
     psLogSetLevel(PS_LOG_INFO);
@@ -38 +38 @@
 }
 
-static int testKernelAlloc(void)
+static psS32 testKernelAlloc(void)
 {
-    int numCases = 4;
-    int xMin[] = { -5,  0,-10,  5};
-    int xMax[] = {  0,  5, -5, 10};
-    int yMin[] = { -4,  0, -8,  4};
-    int yMax[] = {  0,  4, -4,  8};
-    int i;
+    psS32 numCases = 4;
+    psS32 xMin[] = { -5,  0,-10,  5};
+    psS32 xMax[] = {  0,  5, -5, 10};
+    psS32 yMin[] = { -4,  0, -8,  4};
+    psS32 yMax[] = {  0,  4, -4,  8};
+    psS32 i;
     psKernel* k;
 
@@ -73 +73 @@
         }
 
-        for (int j=yMin[i]; j<yMax[i]; j++) {
+        for (psS32 j=yMin[i]; j<yMax[i]; j++) {
             if (k->kernel[j]+xMin[i] != k->image->data.PS_TYPE_KERNEL_DATA[j-yMin[i]]) {
                 psError(__func__,"The kernel pointer was set wrong for row %d.",
@@ -115 +115 @@
 }
 
-static int testKernelGenerate(void)
+static psS32 testKernelGenerate(void)
 {
-    int size = 4;
-    int t[] = { 1, 2, 8, 10 };
-    int x[] = { 0, 1, 0, -1 };
-    int y[] = { 2, 1, -1, -2 };
+    psS32 size = 4;
+    psS32 t[] = { 1, 2, 8, 10 };
+    psS32 x[] = { 0, 1, 0, -1 };
+    psS32 y[] = { 2, 1, -1, -2 };
     psKernelType sum;
 
@@ -127 +127 @@
     psVector* tVec = psVectorAlloc(size,PS_TYPE_U32);
 
-    for (int i = 0; i < size; i++) {
+    for (psS32 i = 0; i < size; i++) {
         xVec->data.U32[i] = x[i];
         yVec->data.U32[i] = y[i];
@@ -148 +148 @@
 
     sum = 0.0;
-    for (int y = result->yMin; y <= result->yMax; y++) {
-        for (int x = result->xMin; x <= result->xMax; x++) {
+    for (psS32 y = result->yMin; y <= result->yMax; y++) {
+        for (psS32 x = result->xMin; x <= result->xMax; x++) {
             sum += result->kernel[y][x];
         }
@@ -182 +182 @@
     tVec = psVectorAlloc(size,PS_TYPE_S16);
 
-    for (int i = 0; i < size; i++) {
+    for (psS32 i = 0; i < size; i++) {
         xVec->data.S16[i] = x[i];
         yVec->data.S16[i] = y[i];
@@ -203 +203 @@
 
     sum = 0.0;
-    for (int y = result->yMin; y <= result->yMax; y++) {
-        for (int x = result->xMin; x <= result->xMax; x++) {
+    for (psS32 y = result->yMin; y <= result->yMax; y++) {
+        for (psS32 x = result->xMin; x <= result->xMax; x++) {
             sum += result->kernel[y][x];
         }
@@ -236 +236 @@
     tVec = psVectorAlloc(size,PS_TYPE_F32);
 
-    for (int i = 0; i < size; i++) {
+    for (psS32 i = 0; i < size; i++) {
         xVec->data.F32[i] = x[i]+0.1;
         yVec->data.F32[i] = y[i]+0.2;
@@ -291 +291 @@
 
 /*
-static int testImageConvolve(void)
+static psS32 testImageConvolve(void)
 {
-    const int r = 200;
-    const int c = 300;
-    int sum;
+    const psS32 r = 200;
+    const psS32 c = 300;
+    psS32 sum;
  
     // approximate a normalized gaussian kernel.
@@ -312 +312 @@
     psKernel* nsk = psKernelAlloc(0,2,0,2);
     sum = 0.0;
-    for (int i=0;i<2;i++) {
-        for (int j=0;j<2;j++) {
+    for (psS32 i=0;i<2;i++) {
+        for (psS32 j=0;j<2;j++) {
             nsk->kernel[i][j] = i+j;
             sum = i+j;
         }
     }
-    for (int i=0;i<2;i++) {
-        for (int j=0;j<2;j++) {
+    for (psS32 i=0;i<2;i++) {
+        for (psS32 j=0;j<2;j++) {
             nsk->kernel[i][j] /= sum;
         }
@@ -356 +356 @@
  
     // test values
-    for (int i=-1;i<1;i++) {
-        for (int j=-1;j<1;j++) {
+    for (psS32 i=-1;i<1;i++) {
+        for (psS32 j=-1;j<1;j++) {
             if (fabsf(out->data.F32[r/2+i][c/2+j] - g->kernel[i][j]) > 0.0001) {
                 psError(__func__,"Convolved image wrong at %d,%d.  Value is %g, expected %g.",
@@ -423 +423 @@
     psImageWriteSection(out2,0,0,0,NULL,0,"out2.fits");
     // test values
-    for (int i=-1;i<1;i++) {
-        for (int j=-1;j<1;j++) {
+    for (psS32 i=-1;i<1;i++) {
+        for (psS32 j=-1;j<1;j++) {
             if (fabsf(out->data.F32[r/2+i][c/2+j] - g->kernel[i][j]) > 0.0001) {
                 psError(__func__,"Convolved image wrong at %d,%d.  Value is %g, expected %g.",