Sync with DEFAULT

2012-07-17 21:54:18 +02:00
parent b3f1403146
commit df76c5b6a8
19 changed files with 155 additions and 105 deletions
--- a/rtengine/improcfun.h
+++ b/rtengine/improcfun.h
@@ -36,7 +36,7 @@ namespace rtengine {
 	
 	using namespace procparams;
 	
-	class ImProcFunctions : public Color {
+class ImProcFunctions {
 		
 		static LUTf gamma2curve;