Changeset 32694 for branches/eam_branches/ipp-20111110/magic

Timestamp:

Nov 17, 2011, 2:02:08 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111110

Files:

• . (modified) (1 prop)
• magic/remove/src/streaksio.c (modified) (2 diffs)

branches/eam_branches/ipp-20111110/magic/remove/src/streaksio.c

@@ -632 +632 @@
 
     if (!isImage(in)) {
+        psLogMsg("streaksremove", PS_LOG_INFO, "%s contains no image\n", in->name);
         return;
     }
@@ -779 +780 @@
 setupImageRefs(sFile *out, sFile *recoveryOut, sFile *in, int extnum, bool exciseAll)
 {
+    if (!in->image) {
+        // Input file is likely corrupt. XXX: Shouldn't we have caught this earlier?
+        psError(PS_ERR_UNKNOWN, true, "image is null for extension %d of %s file is likely corrupt", extnum, in->name);
+        streaksExit("", PS_EXIT_UNKNOWN_ERROR);
+    }
     if (!exciseAll) {
         // set output image to be the input image