Changeset 6750 for trunk/psLib/test/imageops/tst_psImagePixelExtract.c

Timestamp:

Mar 31, 2006, 4:43:57 PM (20 years ago)

Author:

drobbin

Message:

Made several changes to image functions/tests w.r.t. subimage v. parent image issue.

File:

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

trunk/psLib/test/imageops/tst_psImagePixelExtract.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-02-24 23:43:15 $
+*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-04-01 02:43:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
 static psS32 testImageCut(void);
 static psS32 testImageRadialCut(void);
+static psS32 testImageRowColError(void);
 static psS32 testImageRowColF32(void);
 static psS32 testImageRowColF64(void);
@@ -37 +38 @@
                               {testImageSlice, 552, "psImageSlice", 0, false},
                               {testImageCut, 555, "psImageCut", 0, false},
-                              {testImageRadialCut, 557, "psImageRadialCut", 0, false},
+                              {testImageRadialCut, 556, "psImageRadialCut", 0, false},
+                              {testImageRowColError, 557, "testImageRowColError", 0, false},
                               {testImageRowColF32, 558, "psImageRowColF32", 0, false},
                               {testImageRowColF64, 559, "psImageRowColF64", 0, false},
@@ -765 +767 @@
 }
 
-psS32 testImageRowColF64(void)
-{
-    psVector *rowcol = NULL;
-    psVector *empty = NULL;
+psS32 testImageRowColError(void)
+{
     psImage *image = NULL;
-    psImage *emptyImage = NULL;
+    psVector *out = NULL;
+    int num = 0;
+
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    out = psImageRow(NULL, image, num);
+    if (out != NULL) {
+        return 1;
+    }
+
 
     image = psImageAlloc(3, 3, PS_TYPE_F64);
-    rowcol = psVectorAlloc(3, PS_TYPE_F64);
-
+    *(psS32*)&(image->row0) = 5;
+    *(psS32*)&(image->col0) = 10;
     image->data.F64[0][0] = 666.666;
     image->data.F64[1][0] = 66.6;
@@ -785 +793 @@
     image->data.F64[2][2] = 66.66;
 
+
+
+    psFree(out);
+    psFree(image);
+    return 0;
+}
+
+psS32 testImageRowColF64(void)
+{
+    psVector *rowcol = NULL;
+    psVector *empty = NULL;
+    psImage *image = NULL;
+    psImage *emptyImage = NULL;
+
+    image = psImageAlloc(3, 3, PS_TYPE_F64);
+    rowcol = psVectorAlloc(3, PS_TYPE_F64);
+
+    image->data.F64[0][0] = 666.666;
+    image->data.F64[1][0] = 66.6;
+    image->data.F64[2][0] = 6.66;
+    image->data.F64[0][1] = 6.6;
+    image->data.F64[1][1] = 6.666;
+    image->data.F64[2][1] = 66.666;
+    image->data.F64[0][2] = 666.6;
+    image->data.F64[1][2] = 666.66;
+    image->data.F64[2][2] = 66.66;
+
     //Test for error with NULL image
     empty = psImageCol(empty, emptyImage, 0);