Changeset 1961

Timestamp:

Oct 5, 2004, 12:21:53 PM (22 years ago)

Author:

evanalst

Message:

Add additional test cases for psImageSlice.

Location:

trunk/psLib/test/image

Files:

• tst_psImageExtraction.c (modified) (5 diffs)
• verified/tst_psImageExtraction.stderr (modified) (1 diff)

trunk/psLib/test/image/tst_psImageExtraction.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-05 19:42:51 $
+*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-05 22:21:53 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -43 +43 @@
     psVector* out = NULL;
     psImage* image = psImageAlloc( c, r, PS_TYPE_F32 );
+    psImage* imgU8 = psImageAlloc( c, r, PS_TYPE_U8 );
     psVector* positions = psVectorAlloc( r, PS_TYPE_U32 );
     psImage* mask = psImageAlloc( c, r, PS_TYPE_MASK );
+    psImage* maskS8 = psImageAlloc( c, r, PS_TYPE_S8 );
+    psImage* maskSz = psImageAlloc( r, c, PS_TYPE_MASK );
     psStats* stat = psStatsAlloc( PS_STAT_SAMPLE_MEDIAN );
 
@@ -63 +66 @@
     for ( int row = 0;row < r;row++ ) {
         psF32* imageRow = image->data.F32[ row ];
-        psMaskType* maskRow = image->data.V[ row ];
+        psU8* imgU8Row = imgU8->data.U8[ row ];
+        psMaskType* maskRow = mask->data.V[ row ];
+        psMaskType* maskSzRow = maskSz->data.V[ row ];
+        psS8* maskS8Row = maskS8->data.V[ row ];
         psF32 rowOffset = ( psF32 ) row / ( psF32 ) r;
         for ( int col = 0;col < c;col++ ) {
             imageRow[ col ] = ( psF32 ) col + rowOffset;
+            imgU8Row[ col ] = (psU8) col;
             maskRow[ col ] = 0;
+            maskS8Row[ col ] = 0;
+            maskSzRow[ col ] = 0;
         }
     }
@@ -282 +291 @@
     }
 
+    /* Verify that a mask of different size than the input image returns null and program
+       execution doesn't stop.
+    */
+    psLogMsg( __func__, PS_LOG_INFO, "Following should be an error mask size != image size.");
+    stat->options = PS_STAT_SAMPLE_MEDIAN;
+    out = psImageSlice( out, NULL,
+                        image,
+                        maskSz, 1,
+                        c/10, r/10,
+                        c/10+1, r/10+1,
+                        PS_CUT_X_POS,
+                        stat);
+    if ( out != NULL ) {
+        psError( __func__, "Mask size different than image size didn't return NULL as expected" );
+        return 110;
+    }
+
+    /* Verify the a invalid type mask returns null and program execution doesn't stop.
+    */
+    psLogMsg( __func__, PS_LOG_INFO, "Following should be an error invalid mask type.");
+    out =  psImageSlice( out, NULL,
+                         image,
+                         maskS8, 1,
+                         c/10, r/10,
+                         c/10+1, r/10+1,
+                         PS_CUT_X_POS,
+                         stat);
+    if ( out != NULL ) {
+        psError( __func__, "Mask invalid type didn't return NULL as expected.");
+        return 111;
+    }
+
+    /* Verify the input image is an invalid type */
+    psLogMsg( __func__, PS_LOG_INFO, "Following should be an error invalid image type.");
+    out = psImageSlice( out, NULL,
+                        imgU8,
+                        mask, 1,
+                        c/10, r/10,
+                        c/10+1, r/10+1,
+                        PS_CUT_X_POS,
+                        stat);
+    if ( out != NULL ) {
+        psError( __func__, "Input image with invalid type didn't return NULL as expected.");
+        return 112;
+    }
+
     psFree( image );
     psFree( positions );
@@ -287 +342 @@
     psFree( out );
     psFree( stat );
+    psFree( imgU8 );
+    psFree( maskS8 );
+    psFree( maskSz );
 
     return 0;

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

@@ -167 +167 @@
 <DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
     Specified statistic option, 0, is not valid.  Must specify one and only one statistic type.
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error mask size != image size.
+<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+    Input psImage mask size, 1000x2000, does not match psImage input size, 2000x1000.
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error invalid mask type.
+<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+    Input psImage mask type, psS8, is not the supported mask datatype of psU8.
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error invalid image type.
+<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+    Specified psImage type, psU8, is not supported.
 
 ---> TESTPOINT PASSED (psImage{psImageSlice} | tst_psImageExtraction.c)