cleanup, fix incorrect block mode fade exposed by cleanup

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4593 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 34 insertions, 34 deletions

diff --git a/editor/ppmfade b/editor/ppmfade
index e785aacd..eddd399e 100755
--- a/editor/ppmfade
+++ b/editor/ppmfade
@@ -190,15 +190,15 @@ my $fromDesc = defined($firstFileNm) ? "'$firstFileNm'" : "black";
 my $toDesc   = defined($lastFileNm)  ? "'$lastFileNm'"  : "black";
 
 if (!defined($firstFileNm)) {
-    system("ppmmake \\#000 $width $height >$tmpdir/junk1.ppm");
+    system("ppmmake \\#000 $width $height >$tmpdir/first.ppm");
 } else {
-    system("cp", $firstFileNm, "$tmpdir/junk1.ppm");
+    system("cp", $firstFileNm, "$tmpdir/first.ppm");
 }
 
 if (!defined($lastFileNm)) {
-    system("ppmmake \\#000 $width $height >$tmpdir/junk2.ppm");
+    system("ppmmake \\#000 $width $height >$tmpdir/last.ppm");
 } else {
-    system("cp", $lastFileNm, "$tmpdir/junk2.ppm");
+    system("cp", $lastFileNm, "$tmpdir/last.ppm");
 }
 
 print("Fading from $fromDesc to $toDesc\n");
@@ -208,8 +208,8 @@ print("Fading from $fromDesc to $toDesc\n");
 #
 
 # Here's what our temporary files are:
-#   junk1.ppm: The original (fade-from) image
-#   junk2.ppm: The target (fade-from) image
+#   first.ppm: The original (fade-from) image
+#   last.ppm: The target (fade-from) image
 #   junk3.ppm: The frame of the fade for the current iteration of the
 #              the for loop.
 #   junk1a.ppm: If the fade involves a ppmmix sequence from one intermediate
@@ -223,114 +223,114 @@ for ($i = 1; $i <= $nFrame; $i++) {
     if ($mode eq $SPREAD) {
         if ($i <= 10) {
             my $n = $spline20[$i] * 100;
-            system("ppmspread $n $tmpdir/junk1.ppm >$tmpdir/junk3.ppm");
+            system("ppmspread $n $tmpdir/first.ppm >$tmpdir/junk3.ppm");
         } elsif ($i <= 20) {
             my $n;
             $n = $spline20[$i] * 100;
-            system("ppmspread $n $tmpdir/junk1.ppm >$tmpdir/junk1a.ppm");
+            system("ppmspread $n $tmpdir/first.ppm >$tmpdir/junk1a.ppm");
             $n = (1-$spline20[$i-10]) * 100;
-            system("ppmspread $n $tmpdir/junk2.ppm >$tmpdir/junk2a.ppm");
+            system("ppmspread $n $tmpdir/last.ppm >$tmpdir/junk2a.ppm");
             $n = $spline10[$i-10];
             system("ppmmix $n $tmpdir/junk1a.ppm $tmpdir/junk2a.ppm " .
                    ">$tmpdir/junk3.ppm");
         } else {
             my $n = (1-$spline20[$i-10])*100;
-            system("ppmspread $n $tmpdir/junk2.ppm >$tmpdir/junk3.ppm");
+            system("ppmspread $n $tmpdir/last.ppm >$tmpdir/junk3.ppm");
         }
     } elsif ($mode eq $SHIFT) {
         if ($i <= 10) {
             my $n = $spline20[$i] * 100;
-            system("ppmshift $n $tmpdir/junk1.ppm >$tmpdir/junk3.ppm");
+            system("ppmshift $n $tmpdir/first.ppm >$tmpdir/junk3.ppm");
         } elsif ($i <= 20) {
             my $n;
             $n = $spline20[$i] * 100;
-            system("ppmshift $n $tmpdir/junk1.ppm >$tmpdir/junk1a.ppm");
+            system("ppmshift $n $tmpdir/first.ppm >$tmpdir/junk1a.ppm");
             $n = (1-$spline20[$i-10])*100;
-            system("ppmshift $n junk2.ppm >junk2a.ppm");
+            system("ppmshift $n last.ppm >junk2a.ppm");
             $n = $spline10[$i-10];
             system("ppmmix $n junk1a.ppm junk2a.ppm >junk3.ppm");
         } else {
             my $n = (1-$spline20[$i-10]) * 100;
-            system("ppmshift $n junk2.ppm >junk3.ppm");
+            system("ppmshift $n last.ppm >junk3.ppm");
         }
     } elsif ($mode eq $RELIEF) {
         if ($i == 1) {
-            system("ppmrelief junk1.ppm >junk1r.ppm");
+            system("ppmrelief first.ppm >junk1r.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1.ppm junk1r.ppm >junk3.ppm");
+            system("ppmmix $n first.ppm junk1r.ppm >junk3.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
             system("ppmmix $n junk1r.ppm junk2r.ppm >junk3.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2r.ppm junk2.ppm >junk3.ppm");
+            system("ppmmix $n junk2r.ppm last.ppm >junk3.ppm");
         }
         if ($i == 10) {
-            system("ppmrelief junk2.ppm >junk2r.ppm");
+            system("ppmrelief last.ppm >junk2r.ppm");
         }
     } elsif ($mode eq $OIL) {
         if ($i == 1) {
-            system("ppmtopgm junk1.ppm | pgmoil >junko.ppm");
+            system("ppmtopgm first.ppm | pgmoil >junko.ppm");
             system("rgb3toppm junko.ppm junko.ppm junko.ppm " .
                    ">junk1o.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1.ppm junk1o.ppm >junk3.ppm");
+            system("ppmmix $n first.ppm junk1o.ppm >junk3.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
             system("ppmmix $n junk1o.ppm junk2o.ppm >junk3.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o.ppm junk2.ppm >junk3.ppm");
+            system("ppmmix $n junk2o.ppm last.ppm >junk3.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2.ppm | pgmoil >junko.ppm");
+            system("ppmtopgm last.ppm | pgmoil >junko.ppm");
             system("rgb3toppm junko.ppm junko.ppm junko.ppm " .
                    ">junk2o.ppm");
         }
     } elsif ($mode eq $EDGE) {
         if ($i == 1) {
-            system("ppmtopgm junk1.ppm | pgmedge >junko.ppm");
+            system("ppmtopgm first.ppm | pgmedge >junko.ppm");
             system("rgb3toppm junko.ppm junko.ppm junko.ppm " .
                    ">junk1o.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1.ppm junk1o.ppm >junk3.ppm");
+            system("ppmmix $n first.ppm junk1o.ppm >junk3.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
             system("ppmmix $n junk1o.ppm junk2o.ppm >junk3.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o.ppm junk2.ppm >junk3.ppm");
+            system("ppmmix $n junk2o.ppm last.ppm >junk3.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2.ppm | pgmedge >junko.ppm");
+            system("ppmtopgm last.ppm | pgmedge >junko.ppm");
             system("rgb3toppm junko.ppm junko.ppm junko.ppm " .
                    ">junk2o.ppm");
         }
     } elsif ($mode eq $BENTLEY) {
         if ($i == 1) {
-            system("ppmtopgm junk1.ppm | pgmbentley >junko.ppm");
+            system("ppmtopgm first.ppm | pgmbentley >junko.ppm");
             system("rgb3toppm junko.ppm junko.ppm junko.ppm " .
                    ">junk1o.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1.ppm junk1o.ppm >junk3.ppm");
+            system("ppmmix $n first.ppm junk1o.ppm >junk3.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
             system("ppmmix $n junk1o.ppm junk2o.ppm >junk3.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n $tmpdir/junk2o.ppm $tmpdir/junk2.ppm " .
+            system("ppmmix $n $tmpdir/junk2o.ppm $tmpdir/last.ppm " .
                    ">$tmpdir/junk3.ppm");
         }
         if ($i == 10) {
-               system("ppmtopgm $tmpdir/junk2.ppm | pgmbentley " .
+               system("ppmtopgm $tmpdir/last.ppm | pgmbentley " .
                       ">$tmpdir/junko.ppm");
             system("rgb3toppm $tmpdir/junko.ppm $tmpdir/junko.ppm " .
                    "$tmpdir/junko.ppm " .
@@ -339,12 +339,12 @@ for ($i = 1; $i <= $nFrame; $i++) {
     } elsif ($mode eq $BLOCK) {
         if ($i <= 10) {
             my $n = 1 - 1.9*$spline20[$i];
-            system("pamscale $n $tmpdir/junk1.ppm | " .
+            system("pamscale $n $tmpdir/first.ppm | " .
                    "pamscale -width $width -height $height " .
                    ">$tmpdir/junk3.ppm");
             if ($i == 10) {
                 system("cp", "$tmpdir/junk3.ppm", "$tmpdir/junk1a.ppm");
-                system("pamscale $n $tmpdir/junk2.ppm | " .
+                system("pamscale $n $tmpdir/last.ppm | " .
                        "pamscale -width $width -height $height " .
                        ">$tmpdir/junk2a.ppm");
             }
@@ -354,13 +354,13 @@ for ($i = 1; $i <= $nFrame; $i++) {
                    ">$tmpdir/junk3.ppm");
         } else {
             my $n = 1 - 1.9*$spline20[31-$i];
-            system("pamscale $n $tmpdir/junk2.ppm | " .
+            system("pamscale $n $tmpdir/last.ppm | " .
                    "pamscale -width $width -height $height " .
                    ">$tmpdir/junk3.ppm");
         }
     } elsif ($mode eq $MIX) {
         my $fadeFactor = sqrt(1/($nFrame-$i+1));
-        system("ppmmix $fadeFactor $tmpdir/junk1.ppm $tmpdir/junk2.ppm " .
+        system("ppmmix $fadeFactor $tmpdir/first.ppm $tmpdir/last.ppm " .
                ">$tmpdir/junk3.ppm");
     } else {
         print("Internal error: impossible mode value '$mode'\n");