Index: trunk/psLib/test/image/tst_psImageStats.c
===================================================================
--- trunk/psLib/test/image/tst_psImageStats.c	(revision 3973)
+++ trunk/psLib/test/image/tst_psImageStats.c	(revision 3977)
@@ -113,14 +113,8 @@
             tmpImage2 = psImageAlloc( IMAGE_X_SIZE*2, IMAGE_Y_SIZE*2, PS_TYPE_F32 );
             tmpMask2 = psImageAlloc( IMAGE_X_SIZE*2, IMAGE_Y_SIZE*2, PS_TYPE_U8 );
-            tmpImage = psImageSubset(tmpImage2, (psRegion) {
-                                         IMAGE_X_SIZE/4, IMAGE_Y_SIZE/4,
-                                         IMAGE_X_SIZE/4+IMAGE_X_SIZE, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE
-                                     }
-                                    );
-            tmpMask= psImageSubset(tmpMask2,(psRegion) {
-                                       IMAGE_X_SIZE/4, IMAGE_Y_SIZE/4,
-                                       IMAGE_X_SIZE/4+IMAGE_X_SIZE, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE
-                                   }
-                                  );
+            tmpImage = psImageSubset(tmpImage2, psRegionSet(IMAGE_X_SIZE/4, IMAGE_X_SIZE/4+IMAGE_X_SIZE,
+                                     IMAGE_Y_SIZE/4, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE));
+            tmpMask= psImageSubset(tmpMask2, psRegionSet(IMAGE_X_SIZE/4, IMAGE_X_SIZE/4+IMAGE_X_SIZE,
+                                   IMAGE_Y_SIZE/4, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE));
         }
 
@@ -291,97 +285,101 @@
             tmpImage2 = psImageAlloc( IMAGE_X_SIZE*2, IMAGE_Y_SIZE*2, PS_TYPE_F32 );
             tmpMask2 = psImageAlloc( IMAGE_X_SIZE*2, IMAGE_Y_SIZE*2, PS_TYPE_U8 );
-            tmpImage = psImageSubset(tmpImage2,(psRegion) {
-                                         IMAGE_X_SIZE/4, IMAGE_Y_SIZE/4,
-                                         IMAGE_X_SIZE/4+IMAGE_X_SIZE, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE
-                                     }
-                                    );
-            tmpMask = psImageSubset(tmpMask2,(psRegion) {
-                                        IMAGE_X_SIZE/4, IMAGE_Y_SIZE/4,
-                                        IMAGE_X_SIZE/4+IMAGE_X_SIZE, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE
-                                    }
-                                   );
-        }
-
-        for ( i = 0;i < tmpImage->numRows;i++ ) {
-            for ( j = 0;j < tmpImage->numCols;j++ ) {
-                tmpImage->data.F32[ i ][ j ] = ( float ) ( i + j );
-            }
-        }
-        for ( i = 0;i < tmpMask->numRows;i++ ) {
-            for ( j = 0;j < tmpMask->numCols;j++ ) {
-                if ( ( i > ( tmpMask->numRows / 2 ) ) &&
-                        ( j > ( tmpMask->numCols / 2 ) ) ) {
-                    tmpMask->data.U8[ i ][ j ] = 1;
-                } else {
-                    tmpMask->data.U8[ i ][ j ] = 0;
-                }
-            }
-        }
-
-        myStats = psStatsAlloc( PS_STAT_SAMPLE_MEAN );
-        /*************************************************************************/
-        /*  Calculate Sample Mean with no mask                           */
-        /*************************************************************************/
-        psStats* tmpStats = myStats;
-        myStats = psImageStats( myStats, tmpImage, NULL, 0 );
-        if ( myStats != tmpStats ) {
-            fprintf(stderr,"ERROR: input psStats not equal to return psStats\n");
-            psAbort(__func__,"Failed input psStats equal to returned psStats");
-        }
-        fprintf(stderr, "The sample mean was %.2f\n", myStats->sampleMean );
-
-        /*************************************************************************/
-        /*  Calculate Sample Mean with mask                              */
-        /*************************************************************************/
-
-        myStats = psImageStats( myStats, tmpImage, tmpMask, 1 );
-        fprintf(stderr, "The sample mean was %.2f\n", myStats->sampleMean );
-
-        /*************************************************************************/
-        /*  Deallocate data structures                                   */
-        /*************************************************************************/
-        psFree( myStats );
-        psFree( tmpImage );
-        psFree( tmpMask );
-        psFree( tmpImage2 );
-        psFree( tmpMask2 );
-    }
-
-    /*************************************************************************/
-    /*  Test With Various Null Inputs                                        */
-    /*************************************************************************/
-
-    tmpImage = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_F32 );
-    tmpMask = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_U8 );
-    myStats = psStatsAlloc( 0 );
-
-    myStats2 = psImageStats( myStats, NULL, NULL, 0 );
-    if ( myStats2 != NULL ) {
-        fprintf(stderr, "ERROR: myStats2 = psImageStats(myStats, NULL, NULL, 0) != NULL\n" );
-    }
-
-    myStats2 = psImageStats( NULL, tmpImage, NULL, 0 );
-    if ( myStats2 != NULL ) {
-        fprintf(stderr, "ERROR: myStats2 = psImageStats(NULL, tmpImage, NULL, 0) != NULL\n" );
-    }
-
-    myStats2 = psImageStats( myStats, tmpImage, NULL, 0 );
-
-    psFree( myStats );
-    psFree( tmpImage );
-    psFree( tmpMask );
-
-    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 ) {
-        fprintf(stderr, "ERROR: psImageStats did not return null when mask is invalid type.\n");
-    }
-    psFree(tmpImage);
-    psFree(tmpMask);
-    psFree(myStats);
-
-    return ( !testStatus );
+            tmpImage = psImageSubset(tmpImage2, psRegionSet(IMAGE_X_SIZE/4, IMAGE_X_SIZE/4+IMAGE_X_SIZE,
+                                     IMAGE_Y_SIZE/4, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE
+                                 }
+                                                       );
+        tmpMask = psImageSubset(tmpMask2, psRegionSet(IMAGE_X_SIZE/4, IMAGE_X_SIZE/4+IMAGE_X_SIZE,
+                                IMAGE_Y_SIZE/4, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE
+                            }
+                                                 );
+}
+
+for ( i = 0;i < tmpImage->numRows;i++ )
+{
+    for ( j = 0;j < tmpImage->numCols;j++ ) {
+        tmpImage->data.F32[ i ][ j ] = ( float ) ( i + j );
+    }
+}
+for ( i = 0;i < tmpMask->numRows;i++ )
+{
+    for ( j = 0;j < tmpMask->numCols;j++ ) {
+        if ( ( i > ( tmpMask->numRows / 2 ) ) &&
+                ( j > ( tmpMask->numCols / 2 ) ) ) {
+            tmpMask->data.U8[ i ][ j ] = 1;
+        } else {
+            tmpMask->data.U8[ i ][ j ] = 0;
+        }
+    }
+}
+
+myStats = psStatsAlloc( PS_STAT_SAMPLE_MEAN );
+/*************************************************************************/
+/*  Calculate Sample Mean with no mask                           */
+/*************************************************************************/
+psStats* tmpStats = myStats;
+myStats = psImageStats( myStats, tmpImage, NULL, 0 );
+if ( myStats != tmpStats )
+{
+    fprintf(stderr,"ERROR: input psStats not equal to return psStats\n");
+    psAbort(__func__,"Failed input psStats equal to returned psStats");
+}
+fprintf(stderr, "The sample mean was %.2f\n", myStats->sampleMean );
+
+/*************************************************************************/
+/*  Calculate Sample Mean with mask                              */
+/*************************************************************************/
+
+myStats = psImageStats( myStats, tmpImage, tmpMask, 1 );
+fprintf(stderr, "The sample mean was %.2f\n", myStats->sampleMean );
+
+/*************************************************************************/
+/*  Deallocate data structures                                   */
+/*************************************************************************/
+psFree( myStats );
+psFree( tmpImage );
+psFree( tmpMask );
+psFree( tmpImage2 );
+psFree( tmpMask2 );
+}
+
+/*************************************************************************/
+/*  Test With Various Null Inputs                                        */
+/*************************************************************************/
+
+tmpImage = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_F32 );
+tmpMask = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_U8 );
+myStats = psStatsAlloc( 0 );
+
+myStats2 = psImageStats( myStats, NULL, NULL, 0 );
+if ( myStats2 != NULL ) {
+    fprintf(stderr, "ERROR: myStats2 = psImageStats(myStats, NULL, NULL, 0) != NULL\n" )
+    ;
+}
+
+myStats2 = psImageStats( NULL, tmpImage, NULL, 0 );
+if ( myStats2 != NULL ) {
+    fprintf(stderr, "ERROR: myStats2 = psImageStats(NULL, tmpImage, NULL, 0) != NULL\n" )
+    ;
+}
+
+myStats2 = psImageStats( myStats, tmpImage, NULL, 0 );
+
+psFree( myStats );
+psFree( tmpImage );
+psFree( tmpMask );
+
+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 ) {
+    fprintf(stderr, "ERROR: psImageStats did not return null when mask is invalid type.\n")
+    ;
+}
+psFree(tmpImage);
+psFree(tmpMask);
+psFree(myStats);
+
+return ( !testStatus );
 }