Changeset 2911 for trunk/psLib/src/image/psImageIO.c

Timestamp:

Jan 5, 2005, 11:16:15 AM (22 years ago)

Author:

desonia

Message:

adjusted psKernelGenerate to better match Tonry's code. Also made
mis-match sizes of input vectors an error.

File:

• trunk/psLib/src/image/psImageIO.c (modified) (5 diffs)

trunk/psLib/src/image/psImageIO.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-04 01:05:00 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-05 21:16:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -33 +33 @@
 {
     fitsfile *fptr = NULL;      /* Pointer to the FITS file */
-    psS32 status = 0;             /* CFITSIO file vars */
+    psS32 status = 0;           /* CFITSIO file vars */
     psS32 nAxis = 0;
     psS32 anynull = 0;
-    psS32 bitPix = 0;             /* Pixel type */
+    psS32 bitPix = 0;           /* Pixel type */
     long nAxes[3];
     long firstPixel[3];         /* lower-left corner of image subset */
@@ -160 +160 @@
         fitsDatatype = TBYTE;
         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 SBYTE_IMG:
+        datatype = PS_TYPE_S8;
+        fitsDatatype = TSBYTE;
+        break;
+    case USHORT_IMG:
+        datatype = PS_TYPE_U16;
+        fitsDatatype = TUSHORT;
+        break;
     case SHORT_IMG:
         datatype = PS_TYPE_S16;
         fitsDatatype = TSHORT;
         break;
-        /*    case ULONG_IMG:                  Not a requirement
-                datatype = PS_TYPE_U32;
-                fitsDatatype = TUINT;
-                break;    */
+    case ULONG_IMG:
+        datatype = PS_TYPE_U32;
+        fitsDatatype = TUINT;
+        break;
     case LONG_IMG:
         datatype = PS_TYPE_S32;
         fitsDatatype = TINT;
         break;
-        /*    case LONGLONG_IMG:               Not a requirement
-                datatype = PS_TYPE_S64;
-                fitsDatatype = TLONGLONG;
-                break;    */
+    case LONGLONG_IMG:
+        datatype = PS_TYPE_S64;
+        fitsDatatype = TLONGLONG;
+        break;
     case FLOAT_IMG:
         datatype = PS_TYPE_F32;
@@ -256 +256 @@
         datatype = TBYTE;
         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_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_S16:
         bitPix = SHORT_IMG;
         datatype = TSHORT;
         break;
-        /*    case PS_TYPE_U32:           Not a requirement
-                bitPix = LONG_IMG;
-                bzero = -1.0f * INT32_MIN;
-                datatype = TUINT;
-                break;      */
+    case PS_TYPE_U32:
+        bitPix = LONG_IMG;
+        bzero = -1.0f * INT32_MIN;
+        datatype = TUINT;
+        break;
     case PS_TYPE_S32:
         bitPix = LONG_IMG;
@@ -344 +344 @@
         }
 
-    } else {                               // file
-        // does
-        // not
-        // exist
+    } else {
+        // file does not exist
 
         (void)fits_create_file(&fptr, filename, &status);