Changeset 889 for trunk/psLib/src/image/psImageStats.c

Timestamp:

Jun 6, 2004, 2:32:53 PM (22 years ago)

Author:

gusciora

Message:

Lots of bug fixes and such.

File:

• trunk/psLib/src/image/psImageStats.c (modified) (12 diffs)

trunk/psLib/src/image/psImageStats.c

@@ -19 +19 @@
 
 /// This routine must determine the various statistics for the image.
+/*****************************************************************************
+    GUS: verify that image/mask have the
+ correct types
+ sizes
+ *****************************************************************************/
 psStats *psImageStats(psStats *stats,
                       psImage *in,
@@ -26 +31 @@
     psVector *junkData=NULL;
     psVector *junkMask=NULL;
+    int ptr = 0;
+    int i = 0;
+    int j = 0;
 
     junkData = psVectorAlloc(in->numRows * in->numCols, in->type.type);
-    junkMask = psVectorAlloc(mask->numRows * mask->numCols, mask->type.type);
-
-    // GUS: figure out mask types
-    junkData->data.F32 = (float *) in->data.F32;
-    junkMask->data.F32 = (float *) mask->data.F32;
-    stats = psVectorStats(stats, junkData, junkMask, maskVal);
+    junkData->n = junkData->nalloc;
+    ptr=0;
+    for (i=0;i<in->numRows;i++) {
+        for (j=0;j<in->numCols;j++) {
+            junkData->data.F32[ptr++] = in->data.F32[i][j];
+        }
+    }
+
+    if (mask != NULL) {
+        // GUS: verify that mask data is PS_TYPE_U8.
+        // GUS: figure out mask types
+
+        junkMask = psVectorAlloc(mask->numRows * mask->numCols,
+                                 mask->type.type);
+        junkMask->n = junkMask->nalloc;
+        // GUS: Is there a more efficient way to do this?
+        ptr=0;
+        for (i=0;i<mask->numRows;i++) {
+            for (j=0;j<mask->numCols;j++) {
+                junkMask->data.U8[ptr++] = mask->data.U8[i][j];
+            }
+        }
+
+        stats = psVectorStats(stats, junkData, junkMask, maskVal);
+        psVectorFree(junkMask);
+    } else {
+        stats = psVectorStats(stats, junkData, NULL, 0);
+    }
 
     psVectorFree(junkData);
-    psVectorFree(junkMask);
 
     return(stats);
@@ -44 +73 @@
     NOTE: We assume that the psHistogram structure out has already been
     allocated and initialized.
+ 
+    GUS: verify that image/mask have the
+ correct types
+ sizes
  *****************************************************************************/
 psHistogram *psImageHistogram(psHistogram *out,
@@ -52 +85 @@
     psVector *junkData=NULL;
     psVector *junkMask=NULL;
+    int ptr = 0;
+    int i = 0;
+    int j = 0;
 
     junkData = psVectorAlloc(in->numRows * in->numCols, in->type.type);
-    junkMask = psVectorAlloc(mask->numRows * mask->numCols, mask->type.type);
-
-    // GUS: figure out mask types
-    junkData->data.F32 = (float *) in->data.F32;
-    junkMask->data.F32 = (float *) mask->data.F32;
-
-    out = psHistogramVector(out, junkData, junkMask, maskVal);
-
+    junkData->n = junkData->nalloc;
+
+    // GUS: Is there a more efficient way to do this?  memcopy() won't work.
+    // Can we trick the junkData structure to use the image buffer, then
+    // untrick it before we deallocate it (so we won't deallocate that buffer
+    // twice?
+
+    // GUS: Make sure you have the numRows/NumCols in the right place.
+    ptr=0;
+    for (i=0;i<in->numRows;i++) {
+        for (j=0;j<in->numCols;j++) {
+            junkData->data.F32[ptr++] = in->data.F32[i][j];
+        }
+    }
+
+    if (mask != NULL) {
+        // GUS: verify that mask data is PS_TYPE_U8.
+        // GUS: figure out mask types
+
+        junkMask = psVectorAlloc(mask->numRows * mask->numCols,
+                                 mask->type.type);
+        junkMask->n = junkMask->nalloc;
+
+        // GUS: Is there a more efficient way to do this?
+        ptr=0;
+        for (i=0;i<mask->numRows;i++) {
+            for (j=0;j<mask->numCols;j++) {
+                junkMask->data.U8[ptr++] = mask->data.U8[i][j];
+            }
+        }
+        out = psHistogramVector(out, junkData, junkMask, maskVal);
+        psVectorFree(junkMask);
+    } else {
+        out = psHistogramVector(out, junkData, NULL, 0);
+    }
     psVectorFree(junkData);
-    psVectorFree(junkMask);
 
     return(out);
@@ -91 +153 @@
     int maxChebyPoly = 0;
 
+
     // Create the sums[][] data structure.  This will hold the LHS of equation
     // 29 in the ADD: sums[k][l] = SUM { image(x,y) * Tk(x) * Tl(y) }
+
     sums = (float **) psAlloc(coeffs->nX * sizeof(float *));
     for (i=0;i<coeffs->nX;i++) {
@@ -105 +169 @@
     // Determine how many Chebyshev polynomials are needed, then create them.
     maxChebyPoly = coeffs->nX;
-    if (coeffs->nX > coeffs->nY) {
+    if (coeffs->nY > coeffs->nX) {
         maxChebyPoly = coeffs->nY;
     }
@@ -133 +197 @@
                                  psEvalPolynomial1D((float) x, chebPolys[i]) *
                                  psEvalPolynomial1D((float) y, chebPolys[j]);
+
                 }
             }
@@ -160 +225 @@
     }
 
-
     // Free the Chebyshev polynomials that were created in this routine.
     for (i=0;i<maxChebyPoly;i++) {
-        psFree(chebPolys[i]);
-    }
+        psPolynomial1DFree(chebPolys[i]);
+    }
+    psFree(chebPolys);
+
+    // Free some data
+    for (i=0;i<coeffs->nX;i++) {
+        psFree(sums[i]);
+    }
+    psFree(sums);
 
     return(coeffs);
@@ -199 +270 @@
     // Determine how many Chebyshev polynomials are needed, then create them.
     maxChebyPoly = coeffs->nX;
-    if (coeffs->nX > coeffs->nY) {
+    if (coeffs->nY > coeffs->nX) {
         maxChebyPoly = coeffs->nY;
     }
@@ -219 +290 @@
         }
     }
-
 
     for (x=0;x<input->numRows;x++) {
@@ -227 +297 @@
                 for (j=0;j<coeffs->nY;j++) {
                     polySum+= psEvalPolynomial1D((float)x, chebPolys[i]) *
-                              psEvalPolynomial1D((float)y, chebPolys[y]) *
+                              psEvalPolynomial1D((float)y, chebPolys[j]) *
                               coeffs->coeff[i][j];
-
                 }
             }
@@ -236 +305 @@
     }
 
-
     // Free the Chebyshev polynomials that were created in this routine.
     for (i=0;i<maxChebyPoly;i++) {
-        psFree(chebPolys[i]);
-    }
+        psPolynomial1DFree(chebPolys[i]);
+    }
+    psFree(chebPolys);
+
+    // Free some data
+    for (i=0;i<coeffs->nX;i++) {
+        psFree(sums[i]);
+    }
+    psFree(sums);
 
     return(0);