Changeset 3977 for trunk/psLib/test/collections

Timestamp:

May 18, 2005, 7:18:20 PM (21 years ago)

Author:

desonia

Message:

fixes to psRegion.

Location:

trunk/psLib/test/collections

Files:

• tst_psPixels.c (modified) (3 diffs)
• verified/tst_psMetadata_01.stdout (modified) (2 diffs)

trunk/psLib/test/collections/tst_psPixels.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $
+ *  @version $Revision: 1.2 $
  *           $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 02:57:03 $
+ *  @date $Date: 2005-05-19 05:18:20 $
  *
  *  Copyright 2005 Maui High Performance Computing Center, University of Hawaii
@@ -328 +328 @@
     pixels->n = 10;
 
-    psImage* mask = psPixelsToMask(NULL,pixels,(psRegion) {
-                                       0,10,0,10
-                                   }
-                                   ,1);
+    psImage* mask = psPixelsToMask(NULL,pixels, psRegionSet(0,10,0,10), 1);
 
     if (mask == NULL) {
@@ -358 +355 @@
 
     // test when input psPixels is NULL.
-    mask = psPixelsToMask(mask, NULL, (psRegion) {
-                              0,10,0,10
-                          }
-                          ,1);
+    mask = psPixelsToMask(mask, NULL, psRegionSet(0,10,0,10), 1);
     if (mask != NULL) {
         psError(PS_ERR_UNKNOWN, true,

trunk/psLib/test/collections/verified/tst_psMetadata_01.stdout

@@ -44 +44 @@
  Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
  Key Name: XTENSION  Key mdType: 0x00010001  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key mdType: 0x0001000a  Key Value:                  Key Comment: 
+ Key Name:   BITPIX  Key mdType: 0x0001000a  Key Value:                  Key Comment: List of Metadata Items
     Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
     Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
  Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:  HISTORY  Key mdType: 0x0001000a  Key Value:                  Key Comment: 
+ Key Name:  HISTORY  Key mdType: 0x0001000a  Key Value:                  Key Comment: List of Metadata Items
     Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
     Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
@@ -81 +81 @@
  Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
  Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:  HISTORY  Key mdType: 0x0001000a  Key Value:                  Key Comment: 
+ Key Name:  HISTORY  Key mdType: 0x0001000a  Key Value:                  Key Comment: List of Metadata Items
     Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
     Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>