Merge from default. Hope I did it right...

2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions
--- a/rtengine/cfa_linedn_RT.cc
+++ b/rtengine/cfa_linedn_RT.cc
@@ -59,7 +59,6 @@ void RawImageSource::CLASS cfa_linedn(float noise)
 {  
 	// local variables
 	int height=H, width=W;
-	int verbose=1;
 	
 	const float clip_pt = 0.8*initialGain* 65535.0;