Changeset 30696

Timestamp:

Feb 19, 2011, 4:09:17 AM (15 years ago)

Author:

bills

Message:

fix 3 problems with destreak of camera stage.
1 erroneous free
1 use of undef variable
1 setting recovery_path_base for camera stage even though it isn't used for anything.

Location:

tags/ipp-20110218

Files:

• ippScripts/scripts/magic_destreak.pl (modified) (1 diff, 1 prop)
• ippScripts/scripts/magic_destreak_revert.pl (modified) (1 diff, 1 prop)
• ippTools/src/magicdstool.c (modified) (1 diff, 1 prop)

tags/ipp-20110218/ippScripts/scripts/magic_destreak.pl

@@ -152 +152 @@
 
 
+# We don't use recoveryroot for camera stage
+if ($stage eq 'camera') {
+    $recoveryroot = undef;
+}
+
 # default value is "NULL" do not use
 if (defined($recoveryroot) and ($recoveryroot eq "NULL")) {

tags/ipp-20110218/ippScripts/scripts/magic_destreak_revert.pl

@@ -451 +451 @@
 {
     foreach my $file (@_) {
+        next if !$file;
         if ($ipprc->file_exists($file)) {
             if (!$ipprc->file_delete($file)) {

tags/ipp-20110218/ippTools/src/magicdstool.c

@@ -771 +771 @@
         break;
     case IPP_STAGE_CAMERA:
-        psFree(query);
         query = NULL;
         clearRunQuery = "UPDATE chipBackgroundRun SET magicked = 0 where chip_bg_id = %" PRId64;