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

Timestamp:

Mar 17, 2010, 3:12:15 PM (16 years ago)

Author:

Paul Price

Message:

Preserve type in psFitsReadImageBuffer.

File:

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

trunk/psLib/src/fits/psFitsImage.c

@@ -498 +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);
@@ -511 +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);