Changeset 2093 for trunk/psLib/src/image

Timestamp:

Oct 13, 2004, 1:34:58 PM (22 years ago)

Author:

desonia

Message:

added test for psImageRadialCut.

Location:

trunk/psLib/src/image

Files:

• psImageErrors.dat (modified) (1 diff)
• psImageErrors.h (modified) (2 diffs)
• psImageExtraction.c (modified) (10 diffs)

trunk/psLib/src/image/psImageErrors.dat

@@ -30 +30 @@
 psImage_LINE_NOT_IN_IMAGE              Specified line, (%f,%f)->(%f,%f), does not entirely lie in psImage's boundaries, [0:%d,0:%d].
 psImage_RADII_VECTOR_NULL              Specified radii vector can not be NULL.
-psImage_CENTER_NOT_IN_IMAGE            Specified center, (%d,%d), is outside of the psImage boundaries, [0:%d,0:%d].
+psImage_CENTER_NOT_IN_IMAGE            Specified center, (%g,%g), is outside of the psImage boundaries, [0:%d,0:%d].
 psImage_RADII_VECTOR_TOOSMALL          Input radii vector size, %d, can not be less than 2.
 #

trunk/psLib/src/image/psImageErrors.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-06 21:31:30 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-13 23:34:57 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -52 +52 @@
 #define PS_ERRORTEXT_psImage_LINE_NOT_IN_IMAGE "Specified line, (%f,%f)->(%f,%f), does not entirely lie in psImage's boundaries, [0:%d,0:%d]."
 #define PS_ERRORTEXT_psImage_RADII_VECTOR_NULL "Specified radii vector can not be NULL."
-#define PS_ERRORTEXT_psImage_CENTER_NOT_IN_IMAGE "Specified center, (%d,%d), is outside of the psImage boundaries, [0:%d,0:%d]."
+#define PS_ERRORTEXT_psImage_CENTER_NOT_IN_IMAGE "Specified center, (%g,%g), is outside of the psImage boundaries, [0:%d,0:%d]."
 #define PS_ERRORTEXT_psImage_RADII_VECTOR_TOOSMALL "Input radii vector size, %d, can not be less than 2."
 #define PS_ERRORTEXT_psImageFFT_IMAGE_TYPE_UNSUPPORTED "Input psImage type (%s) is not supported. Valid image types are psF32 and psC32."

trunk/psLib/src/image/psImageExtraction.c

@@ -9 +9 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-13 22:05:03 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-13 23:34:57 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -656 +656 @@
         if (numRows != mask->numRows || numCols != mask->numCols) {
             psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut",
-                       PS_ERR_BAD_PARAMETER_VALUE, true,
+                       PS_ERR_BAD_PARAMETER_SIZE, true,
                        PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
                        mask->numCols,mask->numRows,
                        numCols, numRows);
             psFree(out);
+            return NULL;
         }
         if (mask->type.type != PS_TYPE_MASK) {
@@ -670 +671 @@
                        typeStr, PS_TYPE_MASK_NAME);
             psFree(out);
+            return NULL;
         }
     }
@@ -679 +681 @@
                    PS_ERRORTEXT_psImage_CENTER_NOT_IN_IMAGE,
                    centerCol, centerRow,
-                   numCols, numRows);
-        psFree(out);
+                   numCols-1, numRows-1);
+        psFree(out);
+        return NULL;
     }
 
@@ -693 +696 @@
     if (radii->n < 2) {
         psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
+                   PS_ERR_BAD_PARAMETER_SIZE, true,
                    PS_ERRORTEXT_psImage_RADII_VECTOR_TOOSMALL,
                    radii->n);
@@ -713 +716 @@
         psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut",
                    PS_ERR_BAD_PARAMETER_VALUE, false,
-                   PS_ERRORTEXT_psImage_BAD_STAT);
+                   PS_ERRORTEXT_psImage_BAD_STAT,
+                   stats->options);
         psFree(out);
         return NULL;
@@ -725 +729 @@
     psF64* outData = out->data.F64;
 
-    // sort the radii by value
     psVector* rSqVec = psVectorCopy(NULL, radii, PS_TYPE_F32);
-    psVectorSort(rSqVec,rSqVec);
     psF32* rSq = rSqVec->data.F32;
 
@@ -751 +753 @@
     }
 
-    // Square the data
+    // Square the radii data
     for (int d = 0; d <= numOut; d++) {
         rSq[d] *= rSq[d];
@@ -787 +789 @@
             dY = centerRow - (float)row - 0.5f;
             dist = dX*dX+dY*dY;
-            for (int r = 0; r < numOut;) {
-                if (rSq[r] < dist && dist < rSq[++r]) {
+            for (int r = 0; r < numOut; r++) {
+                if (rSq[r] < dist && dist < rSq[r+1]) {
                     int n = buffer[r]->n;
                     if (n == buffer[r]->nalloc) { // in case buffers already full, expand
@@ -828 +830 @@
     psFree(buffer);
     psFree(bufferMask);
-
+    psFree(rSqVec);
     return out;
 }