Changeset 6771

Timestamp:

Apr 4, 2006, 12:06:11 PM (20 years ago)

Author:

Paul Price

Message:

Synching changes to psFitsReadImage (removed first argument) and psFitsWriteImage (added argument extname to end)

Location:

trunk/stac/src

Files:

• calcGradient.c (modified) (2 diffs)
• combine.c (modified) (1 diff)
• shift.c (modified) (2 diffs)
• stac.c (modified) (2 diffs)
• stacRead.c (modified) (1 diff)
• sum.c (modified) (2 diffs)

trunk/stac/src/calcGradient.c

@@ -16 +16 @@
 
     // We only read PHUs --- not mucking around with extensions for now
-    psImage *image = psFitsReadImage(NULL, inFile, imageRegion, 0);
+    psImage *image = psFitsReadImage(inFile, imageRegion, 0);
     if (image == NULL) {
         psErrorStackPrint(stderr,"Fatal error: Unable to read %s\n", inName);
@@ -46 +46 @@
 
     psFits *outFile = psFitsOpen(outName, "w");
-    if (!psFitsWriteImage(outFile, NULL, grad, 0)) {
+    if (!psFitsWriteImage(outFile, NULL, grad, 0, NULL)) {
         psErrorStackPrint(stderr, "Unable to write image: %s\n", outName);
     }

trunk/stac/src/combine.c

@@ -58 +58 @@
 
     psFits *outFile = psFitsOpen(config->outName, "w");
-    if (!psFitsWriteImage(outFile, headers->data[0], combined, 0)) {
+    if (!psFitsWriteImage(outFile, headers->data[0], combined, 0, NULL)) {
         psErrorStackPrint(stderr, "Unable to write image: %s\n", config->outName);
     }

trunk/stac/src/shift.c

@@ -90 +90 @@
     psRegion imageRegion = {0, 0, 0, 0}; // Region of image to read
     psMetadata *header = psFitsReadHeader(NULL, imageFile); // FITS header
-    psImage *image = psFitsReadImage(NULL, imageFile, imageRegion, 0);
+    psImage *image = psFitsReadImage(imageFile, imageRegion, 0);
     if (image == NULL) {
         psErrorStackPrint(stderr, "Fatal error: Unable to read %s\n", inName);
@@ -155 +155 @@
         psTrace("stac", 3, "Clipping %d NaN pixels to zero.\n", numPix);
     }
-    if (!psFitsWriteImage(outFile, header, transformed->data[0], 0)) {
+    if (!psFitsWriteImage(outFile, header, transformed->data[0], 0, NULL)) {
         psErrorStackPrint(stderr, "Unable to write image: %s\n", outName);
     }

trunk/stac/src/stac.c

@@ -160 +160 @@
             image = psImageCopy(NULL, transformed->data[i], PS_TYPE_F32);
             (void)psImageClipNaN(image, 0.0);
-            if (!psFitsWriteImage(shiftFile, headers->data[i], image, 0)) {
+            if (!psFitsWriteImage(shiftFile, headers->data[i], image, 0, NULL)) {
                 psErrorStackPrint(stderr, "Unable to write image: %s\n", shiftName);
             }
@@ -266 +266 @@
         psTrace("stac", 3, "Clipping %d NaN pixels to zero.\n", numPix);
     }
-    if (!psFitsWriteImage(outFile, headers->data[0], combined, 0)) {
+    if (!psFitsWriteImage(outFile, headers->data[0], combined, 0, NULL)) {
         psErrorStackPrint(stderr, "Unable to write image: %s\n", config->output);
     }

trunk/stac/src/stacRead.c

@@ -24 +24 @@
         psTrace("stac.read.images", 2, "Reading input image %s....\n",filenames->data[i]);
         psFits *imageFile = psFitsOpen(filenames->data[i], "r");
+        if (!imageFile) {
+            psError(PS_ERR_IO, false, "Unable to open FITS file %s.\n", filenames->data[i]);
+            exit(EXIT_FAILURE);
+        }
         // We only read PHUs --- not mucking around with extensions for now
         if (headers) {
             (*headers)->data[i] = psFitsReadHeader(NULL, imageFile);
         }
-        psImage *image = psFitsReadImage(NULL, imageFile, imageRegion, 0);
+        psImage *image = psFitsReadImage(imageFile, imageRegion, 0);
         if (image == NULL) {
             psErrorStackPrint(stderr,"Fatal error: Unable to read %s\n",filenames->data[i]);

trunk/stac/src/sum.c

@@ -22 +22 @@
         psFits *fits = psFitsOpen(inputNames->data[i], "r"); // FITS file
         psRegion readRegion = {0, 0, 0, 0}; // Region to read
-        psImage *image = psFitsReadImage(NULL, fits, readRegion, 0);
+        psImage *image = psFitsReadImage(fits, readRegion, 0);
         if (numCols == 0 && numRows == 0) {
             // First run through --- set the size, initialise the output, read the header
@@ -75 +75 @@
 
     psFits *fits = psFitsOpen(outputName, "w");
-    (void)psFitsWriteImage(fits, header, output, 0);
+    (void)psFitsWriteImage(fits, header, output, 0, NULL);
     psFitsClose(fits);
     psFree(output);