Merge from default branch

2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions
--- a/rtengine/CA_correct_RT.cc
+++ b/rtengine/CA_correct_RT.cc
@@ -102,9 +102,8 @@ void RawImageSource::CA_correct_RT() {
 	
 	#define PIX_SORT(a,b) { if ((a)>(b)) {temp=(a);(a)=(b);(b)=temp;} }
 	#define SQR(x) ((x)*(x))
-	
-		
-	static const float clip_pt = ri->defgain; 
+
+	const float clip_pt = ri->defgain; 
 		
 	// local variables
 	int width=W, height=H;