Changeset 27839 for branches/simmosaic_branches/psLib/src/fits/psFitsImage.c

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

• . (modified) (1 prop)
• psLib/src/fits/psFitsImage.c (modified) (7 diffs)

branches/simmosaic_branches/psLib/src/fits/psFitsImage.c

@@ -439 +439 @@
 
     p_psFitsReadInfo *info = p_psFitsReadInfoAlloc(fits, region, z);
+    if (!info) {
+        psError(PS_ERR_IO, false, "Unable to read FITS information");
+        return NULL;
+    }
 
     // Size of image
@@ -494 +498 @@
     psImage *inImage;                   // Image to read in
     if (floatType == PS_FITS_FLOAT_NONE) {
-        inImage = psImageRecycle(outImage, numCols, numRows, info->psDatatype);
-        outImage = psMemIncrRefCounter(inImage);
+        if (!outImage || outImage->type.type == info->psDatatype) {
+            outImage = psImageRecycle(outImage, numCols, numRows, info->psDatatype);
+            inImage = psMemIncrRefCounter(outImage);
+        } else {
+            outImage = psImageRecycle(outImage, numCols, numRows, outImage->type.type);
+            inImage = psImageAlloc(numCols, numRows, info->psDatatype);
+        }
     } else {
         inImage = psImageAlloc(numCols, numRows, info->psDatatype);
@@ -507 +516 @@
         return NULL;
     }
-    psFree(info);
 
     if (floatType != PS_FITS_FLOAT_NONE) {
         outImage = psFitsFloatImageFromDisk(outImage, inImage, floatType);
-    }
+    } else if (outImage->type.type != info->psDatatype) {
+        outImage = psImageCopy(outImage, inImage, outImage->type.type);
+    }
+    psFree(info);
     psFree(inImage);
 
@@ -612 +623 @@
     }
 
+    bool createPHU = false;             // Are we creating a PHU?
+
     // Create the image HDU
     int hdus = psFitsGetSize(fits);     // Number of HDUs in file
@@ -617 +630 @@
         // We're creating the first image
         fits_create_img(fits->fd, bitPix, naxis, naxes, &status);
+        createPHU = true;
     } else {
         if (!after) {
@@ -623 +637 @@
                 // Set status to signal fits_insert_img to insert a new primary HDU
                 status = PREPEND_PRIMARY;
+                createPHU = true;
             } else {
                 // Move back one to perform an insert after the previous HDU
@@ -637 +652 @@
 
     // write the header, if any.
-    if (header && !psFitsWriteHeader(fits, header)) {
+    if (header && !psFitsWriteHeaderImage(fits, header, createPHU)) {
         psError(PS_ERR_IO, false, "Unable to write FITS header.\n");
         success = false;