Merge from trunk to version ed52f4f469 "Updated make-app-bundle script to use new template for file name"

2010-10-01 10:36:31 -07:00
parent d6d6d6ae23
commit bcd42c3fc2
68 changed files with 2285 additions and 756 deletions
--- a/rtengine/amaze_interpolate_RT.cc
+++ b/rtengine/amaze_interpolate_RT.cc
@@ -51,7 +51,7 @@ void RawImageSource::amaze_demosaic_RT() {
 	}
 	
 	
-	static const float clip_pt = 1/ri->defgain; 
+	const float clip_pt = 1/ri->defgain; 

 #define TS 512	 // Tile size; the image is processed in square tiles to lower memory requirements and facilitate multi-threading