Changeset 1664

Timestamp:

Aug 31, 2004, 9:36:02 AM (22 years ago)

Author:

desonia

Message:

added test for psImage of PS_TYPE_PTR.

Location:

trunk/psLib/test/image

Files:

• tst_psImage.c (modified) (4 diffs)
• verified/tst_psImage.stderr (modified) (1 diff)

trunk/psLib/test/image/tst_psImage.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-23 22:36:03 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-31 19:36:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -63 +63 @@
                                  0,1,100,1,150,100
                              };
-    unsigned int types = 12;
+    unsigned int types = 13;
     psElemType type[] = { PS_TYPE_S8, PS_TYPE_S16, PS_TYPE_S32, PS_TYPE_S64,
                           PS_TYPE_U8, PS_TYPE_U16, PS_TYPE_U32, PS_TYPE_U64,
-                          PS_TYPE_F32, PS_TYPE_F64, PS_TYPE_C32, PS_TYPE_C64 };
+                          PS_TYPE_F32, PS_TYPE_F64, PS_TYPE_C32, PS_TYPE_C64,
+                          PS_TYPE_PTR };
 
     psLogMsg(__func__,PS_LOG_INFO,"#546 - psImageAlloc shall allocate memory for a psImage structure");
@@ -74 +75 @@
 
         for (unsigned int i=0;i<sizes;i++) {
+
+            if (numRows[i] == 0 || numCols[i] == 0) {
+                psLogMsg(__func__,PS_LOG_INFO,"Following should be an error.");
+            }
 
             image = psImageAlloc(numCols[i],numRows[i],type[t]);
@@ -206 +211 @@
                         }
                     }
+                }
+                break;
+            case PS_TYPE_PTR: {
+                    unsigned int rows = numRows[i];
+                    unsigned int cols = numCols[i];
+                    psImage* temp = psImageAlloc(1,1,PS_TYPE_F32);
+
+                    for (int r=0;r<rows;r++) {
+                        for (int c=0;c<cols;c++) {
+                            image->data.PTR[r][c] = psMemIncrRefCounter(temp);
+                        }
+                    }
+                    for (int r=0;r<rows;r++) {
+                        for (int c=0;c<cols;c++) {
+                            if (image->data.PTR[r][c] != temp) {
+                                psError(__func__, "Could not set pixel in pointer image at (%d,%d): %x %x",
+                                        c,r,image->data.PTR[r][c],temp);
+                                psFree(image);
+                                psFree(temp);
+                                return 8;
+                            }
+                        }
+                    }
+                    psFree(temp);
                 }
                 break;

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

@@ -7 +7 @@
 <DATE><TIME>|<HOST>|I| testImageAlloc|#546 - psImageAlloc shall allocate memory for a psImage structure
 <DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 101h
+<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
 <DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
 <DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 102h
+<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
 <DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
 <DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 104h
+<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
 <DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
 <DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 108h
+<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
 <DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
 <DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 301h
+<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
 <DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
 <DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 302h
+<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
 <DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
 <DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 304h
+<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
 <DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
 <DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 308h
+<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
 <DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
 <DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 404h
+<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
 <DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
 <DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 408h
+<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
 <DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
 <DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 808h
+<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
 <DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
 <DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 810h
+<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
+<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 0h
+<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
 <DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).