Changeset 36060

Timestamp:

Aug 30, 2013, 3:06:50 PM (13 years ago)

Author:

bills

Message:

In ppstamp check floating point stamp image and if no valid pixels are found
return new error PSTAMP_NO_VALID_PIXELS instead of writing out a completely
empty image

Location:

trunk/pstamp/src

Files:

• Makefile.am (modified) (1 diff)
• ppstampMakeStamp.c (modified) (3 diffs)
• pstamp.h (modified) (4 diffs)

trunk/pstamp/src/Makefile.am

@@ -1 @@
-bin_PROGRAMS = ppstamp pstamprequest pstampdump
+bin_PROGRAMS = ppstamp pstampdump
 
 include_HEADERS = \

trunk/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
@@ -337 +338 @@
             status = false;
             break;
+        }
+        if (!imageHasValidPixels(outReadout->image)) {
+            return PSTAMP_NO_VALID_PIXELS;
         }
         if (readout->variance) {
@@ -885 +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;
+}

trunk/pstamp/src/pstamp.h

@@ -15 +15 @@
         PSTAMP_DUP_REQUEST      = 20,
         PSTAMP_INVALID_REQUEST  = 21,
-        PSTAMP_UNKNOWN_PRODUCT  = 22,
+        PSTAMP_UNKNOWN_PROJECT  = 22,
         PSTAMP_NO_IMAGE_MATCH   = 23,
         PSTAMP_NOT_DESTREAKED   = 24,
@@ -21 +21 @@
         PSTAMP_GONE             = 26,
         PSTAMP_NO_JOBS_QUEUED   = 27,
-        PSTAMP_NO_OVERLAP       = 28
+        PSTAMP_NO_OVERLAP       = 28,
+        PSTAMP_NOT_AUTHORIZED   = 29,
+        PSTAMP_NO_VALID_PIXELS  = 30,
 } pstampJobErrors;
 
@@ -34 +36 @@
 #define PSTAMP_SELECT_BACKMDL       32
 #define PSTAMP_SELECT_JPEG          64
-// unused                           128
-// unused                           256
+#define PSTAMP_SELECT_EXP           128
+#define PSTAMP_SELECT_NUM           256
 #define PSTAMP_SELECT_UNCOMPRESSED  512
 #define PSTAMP_SELECT_INVERSE       1024
@@ -44 +46 @@
 
 #define PSTAMP_NO_WAIT_FOR_UPDATE   32768
+#ifdef notdef
 #define PSTAMP_REQUEST_UNCENSORED  0x10000
 #define PSTAMP_REQUIRE_UNCENSORED  0x20000
+#endif
 
 #define PSTAMP_CENTER_IN_PIXELS 1