Changeset 13123 for trunk/psLib/test/imageops/tap_psImageStats.c

Timestamp:

May 1, 2007, 6:14:33 PM (19 years ago)

Author:

gusciora

Message:

Added tabular file of all psLib functions in Chapter 6 of the SDRS (Data
Manipulation). Most of the test file changes in this check-in are fairly
cosmetic.

File:

• trunk/psLib/test/imageops/tap_psImageStats.c (modified) (5 diffs)

trunk/psLib/test/imageops/tap_psImageStats.c

@@ -273 +273 @@
     const int CHEBY_Y_DIM = 8;
     const int THRESHOLD = 1;
-    psImage *imgIn = psImageAlloc( IMAGE_SIZE, IMAGE_SIZE, PS_TYPE_F32 );
-    psImage *imgOut = psImageAlloc( IMAGE_SIZE, IMAGE_SIZE, PS_TYPE_F32 );
-    for (int i = 0;i < IMAGE_SIZE;i++ ) {
-        for (int j = 0;j < IMAGE_SIZE;j++ ) {
+    psImage *imgIn = psImageAlloc(IMAGE_SIZE, IMAGE_SIZE, PS_TYPE_F32);
+    psImage *imgOut = psImageAlloc(IMAGE_SIZE, IMAGE_SIZE, PS_TYPE_F32);
+    for (int i = 0;i < IMAGE_SIZE;i++) {
+        for (int j = 0;j < IMAGE_SIZE;j++) {
             imgIn->data.F32[ i ][ j ] = 4.0;
-            imgIn->data.F32[ i ][ j ] = ( float ) ( i + j );
-            imgIn->data.F32[ i ][ j ] = ( float ) ( i + j ) + ( 4.0 * ( float ) i );
+            imgIn->data.F32[ i ][ j ] = (float) (i + j);
+            imgIn->data.F32[ i ][ j ] = (float) (i + j) + (4.0 * (float) i);
             imgOut->data.F32[ i ][ j ] = 0.0;
         }
     }
     psPolynomial2D *my2DPoly = psPolynomial2DAlloc(PS_POLYNOMIAL_CHEB, CHEBY_X_DIM-1, CHEBY_Y_DIM-1);
-    my2DPoly = psImageFitPolynomial(my2DPoly, imgIn );
+    my2DPoly = psImageFitPolynomial(my2DPoly, imgIn);
     ok(my2DPoly != NULL, "psImageFitPolynomial() returned non-NULL");
 
-    imgOut = psImageEvalPolynomial( imgOut, my2DPoly );
+    imgOut = psImageEvalPolynomial(imgOut, my2DPoly);
     bool errorFlag = false;
-    for (int i = 0;i < IMAGE_SIZE;i++ ) {
-        for (int j = 0;j < IMAGE_SIZE;j++ ) {
-            if ( fabs( imgOut->data.F32[ i ][ j ] - imgIn->data.F32[ i ][ j ] ) > THRESHOLD ) {
+    for (int i = 0;i < IMAGE_SIZE;i++) {
+        for (int j = 0;j < IMAGE_SIZE;j++) {
+            if (fabs(imgOut->data.F32[ i ][ j ] - imgIn->data.F32[ i ][ j ]) > THRESHOLD) {
                 diag("Pixel (%d, %d) is %.2f, should be %.2f\n", i, j,
                      imgOut->data.F32[ i ][ j ],
@@ -357 +357 @@
         ok(hist2 == hist, "psImageHistogram() correctly recycled the input psHistogram");
         bool errorFlag = false;
-        for (int i = 0;i < numBins;i++ ) {
+        for (int i = 0;i < numBins;i++) {
             if (hist2->nums->data.F32[i] != (numCols * (numRows/numBins))) {
                 diag("ERROR: Bin number %d bounds: (%.1f - %.1f) data (%.2f)\n", i,
@@ -434 +434 @@
     }
 
-    // Ensure psImageCountPixelMask returns -1 for NULL input image
+    // Ensure psImageCountPixelMask returns -1 for wrong input image type
     // Following should generate error
     // XXX: Verify error
@@ -486 +486 @@
     // --------------------------------------------------------------
     // psImageStats()
-    // Ensure psImageStats() returnes NULL for NULL input image
+    // Ensure psImageStats() returns NULL for NULL input image
     // Following should generate error
     // XXX: Verify error
@@ -499 +499 @@
     }
 
-    // Ensure psImageStats() returnes NULL for NULL psStats
+    // Ensure psImageStats() returns NULL for NULL psStats
     // Following should generate error
     // XXX: Verify error