Changeset 1941

Timestamp:

Oct 1, 2004, 4:08:00 PM (22 years ago)

Author:

evanalst

Message:

Update psImageClip and psImageWriteSection psImageReadSection for test coverage.

Location:

trunk/psLib/src/image

Files:

• psImageIO.c (modified) (3 diffs)
• psImageManip.c (modified) (2 diffs)

trunk/psLib/src/image/psImageIO.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-21 22:30:19 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-02 02:08:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -169 +169 @@
         fitsDatatype = TBYTE;
         break;
-    case SBYTE_IMG:
-        datatype = PS_TYPE_S8;
-        fitsDatatype = TSBYTE;
-        break;
-    case USHORT_IMG:
-        datatype = PS_TYPE_U16;
-        fitsDatatype = TUSHORT;
-        break;
+        /*    case SBYTE_IMG:                  Not a requirement
+                datatype = PS_TYPE_S8;
+                fitsDatatype = TSBYTE;
+                break;     */
+        /*    case USHORT_IMG:                 Not a requirement
+                datatype = PS_TYPE_U16;
+                fitsDatatype = TUSHORT;
+                break;     */
     case SHORT_IMG:
         datatype = PS_TYPE_S16;
         fitsDatatype = TSHORT;
         break;
-    case ULONG_IMG:
-        datatype = PS_TYPE_U32;
-        fitsDatatype = TUINT;
-        break;
+        /*    case ULONG_IMG:                  Not a requirement
+                datatype = PS_TYPE_U32;
+                fitsDatatype = TUINT;
+                break;    */
     case LONG_IMG:
         datatype = PS_TYPE_S32;
         fitsDatatype = TINT;
         break;
-    case LONGLONG_IMG:
-        datatype = PS_TYPE_S64;
-        fitsDatatype = TLONGLONG;
-        break;
+        /*    case LONGLONG_IMG:               Not a requirement
+                datatype = PS_TYPE_S64;
+                fitsDatatype = TLONGLONG;
+                break;    */
     case FLOAT_IMG:
         datatype = PS_TYPE_F32;
@@ -268 +268 @@
         datatype = TBYTE;
         break;
-    case PS_TYPE_S8:
-        bitPix = BYTE_IMG;
-        bzero = INT8_MIN;
-        datatype = TSBYTE;
-        break;
-    case PS_TYPE_U16:
-        bitPix = SHORT_IMG;
-        bzero = -1.0f * INT16_MIN;
-        datatype = TUSHORT;
-        break;
+        /*    case PS_TYPE_S8:            Not a requirement
+                bitPix = BYTE_IMG;
+                bzero = INT8_MIN;
+                datatype = TSBYTE;
+                break;      */
+        /*    case PS_TYPE_U16:           Not a requirement
+                bitPix = SHORT_IMG;
+                bzero = -1.0f * INT16_MIN;
+                datatype = TUSHORT;
+                break;      */
     case PS_TYPE_S16:
         bitPix = SHORT_IMG;
         datatype = TSHORT;
         break;
-    case PS_TYPE_U32:
-        bitPix = LONG_IMG;
-        bzero = -1.0f * INT32_MIN;
-        datatype = TUINT;
-        break;
+        /*    case PS_TYPE_U32:           Not a requirement
+                bitPix = LONG_IMG;
+                bzero = -1.0f * INT32_MIN;
+                datatype = TUINT;
+                break;      */
     case PS_TYPE_S32:
         bitPix = LONG_IMG;

trunk/psLib/src/image/psImageManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-30 20:49:56 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-02 02:08:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -120 +120 @@
         psImageClipCase(S8)
         psImageClipCase(S16)
-        //        psImageClipCase(S32)            Not a requirement
+        psImageClipCase(S32)                   // Not a requirement
         //        psImageClipCase(S64)            Not a requirement
         psImageClipCase(U8)