Changeset 30406

Timestamp:

Jan 28, 2011, 12:05:59 PM (15 years ago)

Author:

bills

Message:

handle F64 images which were not expected

Location:

tags/ipp-20101215/magic/remove/src

Files:

• . (modified) (1 prop)
• streaksio.c (modified) (1 diff)
• streaksremove.c (modified) (2 diffs)

tags/ipp-20101215/magic/remove/src/streaksio.c

@@ -1191 +1191 @@
                                 weight->data.F32[y][x] = NAN;
                             }
+                        } else if (weightType == PS_TYPE_F64) {
+                            double weightVal = weight->data.F64[y][x];
+                            if (!isnan(weightVal)) {
+                                ++nandWeights;
+                                weight->data.F64[y][x] = NAN;
+                            }
                         } else if(weightType == PS_TYPE_S16) {
                             double weightVal = weight->data.S16[y][x];

tags/ipp-20101215/magic/remove/src/streaksremove.c

@@ -771 +771 @@
             }
         }
-    } else {
+    } else if (sfiles->inImage->image->type.type == PS_TYPE_F32) {
         float imageValue  = sfiles->inImage->image->data.F32[y][x];
         if (sfiles->recImage && !isExciseValue(imageValue, sfiles->inImage->exciseValue) ) {
@@ -787 +787 @@
             }
         }
+    } else {
+        // We could handle F64 but I don't think we ever get them.
+        // Should catch this earlier
+        psError(PS_ERR_IO, true, "unexpected image type %x found", sfiles->inImage->image->type.type );
+        streaksExit("", PS_EXIT_PROG_ERROR);
     }
 
     if (sfiles->outWeight) {
-        if (sfiles->recWeight) {
-            sfiles->recWeight->image->data.F32[y][x] = sfiles->inWeight->image->data.F32[y][x];
-        }
         // Assume that weight images are always a floating point type
-        sfiles->outWeight->image->data.F32[y][x] = NAN;
+        if (sfiles->inWeight->image->type.type == PS_TYPE_F32) {
+            if (sfiles->recWeight) {
+                sfiles->recWeight->image->data.F32[y][x] = sfiles->inWeight->image->data.F32[y][x];
+            }
+            sfiles->outWeight->image->data.F32[y][x] = NAN;
+        } else if (sfiles->inWeight->image->type.type == PS_TYPE_F64) {
+            if (sfiles->recWeight) {
+                sfiles->recWeight->image->data.F64[y][x] = sfiles->inWeight->image->data.F64[y][x];
+            }
+            sfiles->outWeight->image->data.F64[y][x] = NAN;
+        } else {
+            // Should catch this earlier
+            psError(PS_ERR_IO, true, "unexpected weight image type %x found", sfiles->inWeight->image->type.type );
+            streaksExit("", PS_EXIT_PROG_ERROR);
+        }
     }
     if (sfiles->outMask) {