Changeset 1924 for trunk/psLib/test/image/tst_psImageExtraction.c

Timestamp:

Sep 28, 2004, 3:10:27 PM (22 years ago)

Author:

desonia

Message:

fixed psImageSlice to match current SDR specifications (image range
specified differently).

File:

• trunk/psLib/test/image/tst_psImageExtraction.c (modified) (12 diffs)

trunk/psLib/test/image/tst_psImageExtraction.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-11 02:55:29 $
+*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-29 01:10:27 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 
 testDescription tests[] = {
-                              {
-                                  testImageSlice, 552, "psImageSlice", 0, false
-                              },
-                              {
-                                  NULL
-                              }
+                              {testImageSlice, 552, "psImageSlice", 0, false},
+                              {NULL}
                           };
 
@@ -72 +68 @@
 
     #define PSIMAGESLICE_TEST1(M,N,DIRECTION,TRUTH_SIZE,TRUTHPIX_X,TRUTHPIX_Y,TESTNUM) \
-    out = psImageSlice(out,positions,image,mask,1,c/10,r/10,M,N,DIRECTION,stat); \
+    out = psImageSlice(out,positions,image,mask,1,c/10,r/10,c/10+M,r/10+N,DIRECTION,stat); \
     \
     if (out->n != TRUTH_SIZE) { \
@@ -136 +132 @@
     */
     psLogMsg( __func__, PS_LOG_INFO, "Following should be an error." );
-    out = psImageSlice( out, NULL, NULL, NULL, 0, c / 10, r / 10, 1, 1, PS_CUT_X_POS, stat );
+    out = psImageSlice( out,
+                        NULL, NULL,
+                        NULL, 0,
+                        c/10, r/10,
+                        c/10 + 1, r/10 + 1,
+                        PS_CUT_X_POS,
+                        stat );
     if ( out != NULL ) {
         psError( __func__, "Giving a NULL image, psImageSlice didn't return NULL as expected" );
@@ -148 +150 @@
     */
     psLogMsg( __func__, PS_LOG_INFO, "Following should be an error." );
-    out = psImageSlice( out, NULL, image, mask, 1, c / 10, r / 10, 1, 1, PS_CUT_X_POS, NULL );
+    out = psImageSlice( out,
+                        NULL, image,
+                        mask, 1,
+                        c/10, r/10,
+                        c/10 + 1,
+                        r/10 + 1,
+                        PS_CUT_X_POS,
+                        NULL );
     if ( out != NULL ) {
         psError( __func__, "Giving a NULL stat struct, psImageSlice didn't return NULL as expected" );
@@ -161 +170 @@
     */
     psLogMsg( __func__, PS_LOG_INFO, "Following should be an error." );
-    out = psImageSlice( out, NULL, image, mask, 1, c / 10, r / 10, 1, 1, 5, stat );
+    out = psImageSlice( out, NULL,
+                        image,
+                        mask, 1,
+                        c/10, r/10,
+                        c/10+1, r/10+1,
+                        5,
+                        stat);
     if ( out != NULL ) {
         psError( __func__, "Giving a bogus direction flag, psImageSlice didn't return NULL as expected" );
@@ -172 +187 @@
     */
     psLogMsg( __func__, PS_LOG_INFO, "Following should be an error." );
-    out = psImageSlice( out, NULL, image, mask, 1, c / 10, r / 10, 0, 0, PS_CUT_X_POS, stat );
+    out = psImageSlice( out,
+                        NULL,
+                        image,
+                        mask, 1,
+                        c/10, r/10,
+                        c/10, r/10,
+                        PS_CUT_X_POS,
+                        stat );
     if ( out != NULL ) {
         psError( __func__, "Giving a 0x0 region, psImageSlice didn't return NULL as expected" );
@@ -184 +206 @@
     */
     psLogMsg( __func__, PS_LOG_INFO, "Following should be an error." );
-    out = psImageSlice( out, NULL, image, mask, 1, c + 1, r / 10, 1, 1, PS_CUT_X_POS, stat );
+    out = psImageSlice( out, NULL,
+                        image,
+                        mask, 1,
+                        c+1, r/10,
+                        c+2, r/10+10,
+                        PS_CUT_X_POS,
+                        stat );
     if ( out != NULL ) {
         psError( __func__, "Giving an invalid x position, psImageSlice didn't return NULL as expected" );
@@ -191 +219 @@
 
     psLogMsg( __func__, PS_LOG_INFO, "Following should be an error." );
-    out = psImageSlice( out, NULL, image, mask, 1, c / 10, r + 1, 1, 1, PS_CUT_X_POS, stat );
+    out = psImageSlice( out, NULL,
+                        image,
+                        mask, 1,
+                        c/10, r+1,
+                        c/10+1,r+5,
+                        PS_CUT_X_POS,
+                        stat );
     if ( out != NULL ) {
         psError( __func__, "Giving an invalid y position, psImageSlice didn't return NULL as expected" );
@@ -198 +232 @@
 
     psLogMsg( __func__, PS_LOG_INFO, "Following should be an error." );
-    out = psImageSlice( out, NULL, image, mask, 1, c / 10, r / 10, c, 1, PS_CUT_X_POS, stat );
+    out = psImageSlice( out, NULL,
+                        image,
+                        mask, 1,
+                        c/10, r/10,
+                        c+1, r/10+1,
+                        PS_CUT_X_POS,
+                        stat);
     if ( out != NULL ) {
         psError( __func__, "Giving an invalid numCols, psImageSlice didn't return NULL as expected" );
@@ -205 +245 @@
 
     psLogMsg( __func__, PS_LOG_INFO, "Following should be an error." );
-    out = psImageSlice( out, NULL, image, mask, 1, c / 10, r / 10, 1, r, PS_CUT_X_POS, stat );
+    out = psImageSlice( out, NULL,
+                        image,
+                        mask, 1,
+                        c/10, r/10,
+                        c/10+1, r + 1,
+                        PS_CUT_X_POS,
+                        stat);
     if ( out != NULL ) {
         psError( __func__, "Giving an invalid numRows, psImageSlice didn't return NULL as expected" );
@@ -218 +264 @@
     psLogMsg( __func__, PS_LOG_INFO, "Following should be an error." );
     stat->options = 0;
-    out = psImageSlice( out, NULL, image, mask, 1, c / 10, r / 10, 1, 1, PS_CUT_X_POS, stat );
+    out = psImageSlice( out, NULL,
+                        image,
+                        mask, 1,
+                        c/10, r/10,
+                        c/10+1, r/10+1,
+                        PS_CUT_X_POS,
+                        stat);
     if ( out != NULL ) {
         psError( __func__, "Giving an invalid numRows, psImageSlice didn't return NULL as expected" );