Changeset 21183 for trunk/psLib/src/fits/psFitsImage.c

Timestamp:

Jan 26, 2009, 8:40:07 PM (17 years ago)

Author:

eugene

Message:

incorporating changes from 16bit mask upgrades (eam_branch_20081230)

File:

• trunk/psLib/src/fits/psFitsImage.c (modified) (9 diffs)

trunk/psLib/src/fits/psFitsImage.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-09-05 08:08:33 $
+ *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-27 06:39:37 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -251 +251 @@
                                           const psImage *image, // Image to convert
                                           const psImage *mask, // Mask image, or NULL
-                                          psMaskType maskVal, // Value to mask
+                                          psImageMaskType maskVal, // Value to mask
                                           psRandom *rng, // Random number generator
                                           bool newScaleZero // Determine a new BSCALE and BZERO?
@@ -506 +506 @@
 
 bool psFitsWriteImageWithMask(psFits *fits, psMetadata *header, const psImage *input,
-                              const psImage *mask, psMaskType maskVal, int numZPlanes,
+                              const psImage *mask, psImageMaskType maskVal, int numZPlanes,
                               const char *extname)
 {
@@ -525 +525 @@
 
 bool psFitsInsertImageWithMask(psFits *fits, psMetadata *header, const psImage *image,
-                               const psImage *mask, psMaskType maskVal, int numZPlanes,
+                               const psImage *mask, psImageMaskType maskVal, int numZPlanes,
                                const char *extname, bool after)
 {
@@ -532 +532 @@
     PS_ASSERT_IMAGE_NON_NULL(image, false);
     if (mask) {
-        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_MASK, false);
+        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_IMAGE_MASK, false);
         PS_ASSERT_IMAGES_SIZE_EQUAL(mask, image, false);
     }
@@ -706 +706 @@
 }
 
-bool psFitsUpdateImageWithMask(psFits *fits, const psImage *input, const psImage *mask, psMaskType maskVal,
+bool psFitsUpdateImageWithMask(psFits *fits, const psImage *input, const psImage *mask, psImageMaskType maskVal,
                                int x0, int y0, int z)
 {
@@ -713 +713 @@
     PS_ASSERT_IMAGE_NON_NULL(input, false);
     if (mask) {
-        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_MASK, false);
+        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_IMAGE_MASK, false);
         PS_ASSERT_IMAGES_SIZE_EQUAL(mask, input, false);
     }
@@ -896 +896 @@
 
 bool psFitsWriteImageCubeWithMask(psFits *fits, psMetadata *header, const psArray *input,
-                                  const psArray *masks, psMaskType maskVal, const char *extname)
+                                  const psArray *masks, psImageMaskType maskVal, const char *extname)
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
@@ -976 +976 @@
 
 bool psFitsUpdateImageCubeWithMask(psFits *fits, const psArray *input,
-                                   const psArray *masks, psMaskType maskVal, int x0, int y0)
+                                   const psArray *masks, psImageMaskType maskVal, int x0, int y0)
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);