*** empty log message ***
authorgc <gc>
Mon, 16 May 2005 21:28:29 +0000 (21:28 +0000)
committergc <gc>
Mon, 16 May 2005 21:28:29 +0000 (21:28 +0000)
lib/booh/booh-lib.rb

index f5b72fd28c7886743dc5f5cffc04d31176392bf4..f03beedb366d8207df0c1b7c51924a573f977e96 100644 (file)
@@ -285,9 +285,9 @@ module Booh
                     convert_options += ($config['convert-enhance'] || $convert_enhance) + " "
                 end
             end
-            orig = "#{dest_dir}/screenshot.jpg000000.jpg"
+            orig_image = "#{dest_dir}/screenshot.jpg000000.jpg"
             for dest in dests
-                if !File.exists?(orig)
+                if !File.exists?(orig_image)
                     transcode_options = ''
                     if felem
                         if felem.attributes["#{attributes_prefix}color-swap"]
@@ -327,16 +327,16 @@ module Booh
                     if felem && whitebalance = felem.attributes["#{attributes_prefix}white-balance"]
                         if whitebalance.to_f != 0
                             neworig = "#{dest_dir}/#{File.basename(orig)}-whitebalance#{whitebalance}.jpg"
-                            cmd = "booh-fix-whitebalance '#{orig}' '#{neworig}' #{whitebalance}"
+                            cmd = "booh-fix-whitebalance '#{orig_image}' '#{neworig}' #{whitebalance}"
                             sys(cmd)
                             if File.exists?(neworig)
-                                orig = neworig
+                                orig_image = neworig
                             end
                         end
                     end
                 end
                 if !File.exists?(dest['filename'])
-                    sys("#{$convert} #{convert_options}-size #{dest['size']} -resize #{dest['size']} '#{orig}' '#{dest['filename']}'")
+                    sys("#{$convert} #{convert_options}-size #{dest['size']} -resize #{dest['size']} '#{orig_image}' '#{dest['filename']}'")
                 end
             end
             if neworig