[Swift-commit] r4780 - SwiftApps/SwiftMontage/scripts

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-07-05 16:50:52 -0500 (Tue, 05 Jul 2011)
New Revision: 4780

Modified:
   SwiftApps/SwiftMontage/scripts/SwiftMontage_Batch.swift
Log:
o fixed compile errors


Modified: SwiftApps/SwiftMontage/scripts/SwiftMontage_Batch.swift
===================================================================
--- SwiftApps/SwiftMontage/scripts/SwiftMontage_Batch.swift	2011-07-05 21:46:12 UTC (rev 4779)
+++ SwiftApps/SwiftMontage/scripts/SwiftMontage_Batch.swift	2011-07-05 21:50:52 UTC (rev 4780)
@@ -25,10 +25,10 @@
 
     foreach d_entry, i in diffs
     {
-        Image img_1 <single_file_mapper; file = src + "/" + @d_entry.plus>; 
-        Image img_2 <single_file_mapper; file = src + "/" + @d_entry.minus>;
+        Image img_1 <single_file_mapper; file = @strcat( src, "/", @d_entry.plus )>; 
+        Image img_2 <single_file_mapper; file = @strcat( src, "/", @d_entry.minus )>;
 
-        Image diff_img <single_file_mapper; file = dest + "/" + @d_entry.diff>;
+        Image diff_img <single_file_mapper; file = @strcat( dest, "/", @d_entry.diff )>;
         diff_img = mDiff( img_1, img_2, hdr );
 
         diff_imgs[ i ] = diff_img;
@@ -45,11 +45,11 @@
     
     foreach d_entry, i in diffs
     {
-        Image img_1 <single_file_mapper; file = src + "/" + @d_entry.plus>; 
-        Image img_2 <single_file_mapper; file = src + "/" + @d_entry.minus>;
+        Image img_1 <single_file_mapper; file = @strcat( src, "/", @d_entry.plus )>; 
+        Image img_2 <single_file_mapper; file = @strcat( src, "/", @d_entry.minus )>;
 
-        Image diff_img <single_file_mapper; file = dest + "/" + @d_entry.diff>;
-	Status stat_file <single_file_mapper; file = stat + "/stat." + d_entry.diff>;
+        Image diff_img <single_file_mapper; file = @strcat( dest, "/", @d_entry.diff )>;
+	Status stat_file <single_file_mapper; file = @strcat( stat,"/stat.", @d_entry.diff )>;
         
         ( diff_img, stat_file ) = mDiffFit( img_1, img_2, hdr );