Changeset 1944

Timestamp:

Oct 1, 2004, 5:12:25 PM (22 years ago)

Author:

evanalst

Message:

Add additional test case to psImageStats and updated verified stderr file.

Location:

trunk/psLib/test/image

Files:

• tst_psImageStats01.c (modified) (2 diffs)
• verified/tst_psImageStats01.stderr (modified) (1 diff)

trunk/psLib/test/image/tst_psImageStats01.c

@@ -89 +89 @@
                                  "psImageStats functions",
                                  "Calculate Sample Mean, no mask %d" );
-
+        psStats* tmpStats = myStats;
         myStats = psImageStats( myStats, tmpImage, NULL, 0 );
+        if ( myStats != tmpStats ) {
+            printf("ERROR: input psStats not equal to return psStats\n");
+            psAbort(__func__,"Failed input psStats equal to returned psStats");
+        }
         printf( "The sample mean was %.2f\n", myStats->sampleMean );
 
@@ -172 +176 @@
     }
 
+    tmpImage = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_F32);
+    tmpMask = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_U32);
+    myStats = psStatsAlloc( PS_STAT_SAMPLE_MEAN );
+    myStats2 = psImageStats( myStats, tmpImage, tmpMask, 0 );
+    if ( myStats2 != NULL ) {
+        printf( "ERROR: psImageStats did not return null when mask is invalid type.\n");
+    }
+    psFree(tmpImage);
+    psFree(tmpMask);
+    psFree(myStats);
+    psMemCheckCorruption(1);
+    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
+    if( memLeaks != 0 ) {
+        psAbort(__func__, "Memory Leaks! (%d leaks)", memLeaks);
+    }
+
     printFooter( stdout,
                  "psImageStats functions",

trunk/psLib/test/image/verified/tst_psImageStats01.stderr

@@ -5 +5 @@
 <DATE><TIME>|<HOST>|E|psLib.image.psImageStats
     Specified statistic option did not indicate any operation to perform.
+<DATE><TIME>|<HOST>|E|psLib.image.psImageStats
+    Input psImage mask type, psU32, is not the supported mask datatype of psU8.