Changeset 36071 for branches/eam_branches/ipp-20130711/pstamp/src/ppstampMakeStamp.c

Timestamp:

Aug 30, 2013, 4:48:58 PM (13 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20130711/pstamp/src/ppstampMakeStamp.c (modified) (4 diffs)

branches/eam_branches/ipp-20130711/pstamp/src/ppstampMakeStamp.c

@@ -20 +20 @@
 static bool setMaskedToNAN(pmConfig *config, psImage *image, psImage *mask, psImage *variance);
 static bool copySources(pmReadout *outputReadout, pmReadout *inputReadout, pmReadout *astromReadout, psRegion extractRegion);
+static bool imageHasValidPixels(psImage *image);
 
 // convert the input chip's transforms to the output
@@ -166 +167 @@
     ppstampVersionMetadata(outHDU->header, options);
 
+    // copy any user supplied keywords
+    if (options->headerAdditions) {
+        if (!psMetadataOverlay(outHDU->header, options->headerAdditions)) {
+            psError(PS_ERR_UNKNOWN, false, "Failed to copy header additions to output\n");
+            return false;
+        }
+    }
+
+
     return true;
 }
@@ -328 +338 @@
             status = false;
             break;
+        }
+        if (!imageHasValidPixels(outReadout->image)) {
+            return PSTAMP_NO_VALID_PIXELS;
         }
         if (readout->variance) {
@@ -876 +889 @@
     return true;
 }
+
+static bool
+imageHasValidPixels(psImage *image) {
+    // check F32 image and return true if any pixel is finite
+    if (image->type.type != PS_TYPE_F32) {
+        return true;
+    }
+    for (int y=0; y<image->numRows; y++) {
+        for (int x=0; x<image->numCols; x++) {
+            psF32 pixel = image->data.F32[y][x];
+            if (isfinite(pixel)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}