Fix indentation and functions names

Author: davidchocholaty

CMakeLists.txt

@@ -32,7 +32,7 @@ add_subdirectory(TMOAubry14/)							#Tomas Hudziec
 add_subdirectory(TMOKou15/)							#Tomas Hudziec
 add_subdirectory(TMOMeylan06/)
 add_subdirectory(TMODrago03/)							# David Chocholaty
-add_subdirectory(TMOParis11/)                           # David Chocholaty 
+add_subdirectory(TMOParis11/)							# David Chocholaty
 #add_subdirectory(TMOYourOperatorNameLinux/)
 add_subdirectory(TMOJin14/)							#
 add_subdirectory(TMOLee10/)							#Martin Molek

TMODrago03/TMODrago03.cpp

@@ -55,16 +55,16 @@ TMODrago03::TMODrago03()
 	exposure.SetName(L"exposure");
 	exposure.SetDescription(L"Exposure scale factor: <0,100>");
 	exposure.SetDefault(0.0);
-	exposure=0.0;
-	exposure.SetRange(0,100);
+	exposure = 0.0;
+	exposure.SetRange(0, 100);
 	this->Register(exposure);
 
 	/* Gamma */
 	gamma.SetName(L"gamma");
 	gamma.SetDescription(L"Gamma correction value: <1.0e-3,1.0e+2>");
 	gamma.SetDefault(1.125);
-	gamma=1.125;
-	gamma.SetRange(1.0e-3,1.0e+2);
+	gamma = 1.125;
+	gamma.SetRange(1.0e-3, 1.0e+2);
 	this->Register(gamma);
 
 	/* Bias parameter b */
@@ -80,21 +80,21 @@ TMODrago03::~TMODrago03()
 {
 }
 
-double BiasFunc(double t, double bias)
+double biasFunc(double t, double bias)
 {
 	const double LOG05 = -0.693147;
 
 	return pow(t, log(bias) / LOG05);
 }
 
-void SetExp(double *exp_d)
+void setExp(double *exp_d)
 {
 	*exp_d = pow(2, *exp_d);
 }
 
 int TMODrago03::Transform()
 {
-	double X, Y, Z;	
+	double X, Y, Z;
 	double L_w, L_d, L_s;
 	double interpol, divider;
 	double exp_d;
@@ -107,7 +107,7 @@ int TMODrago03::Transform()
 	/* Set exposure */
 	exp_d = exposure.GetDouble();
 	setExp(&exp_d);
-	
+
 	pSrc->Convert(TMO_XYZ);
 	pDst->Convert(TMO_XYZ);
 
@@ -124,7 +124,7 @@ int TMODrago03::Transform()
 
 	/* Tone mapping */
 	L_max /= L_av;
-	divider = log10(L_max+1.0);
+	divider = log10(L_max + 1.0);
 
 	biasValue = bias.GetDouble();
 
@@ -145,14 +145,15 @@ int TMODrago03::Transform()
 			{
 				L_w *= exp_d;
 			}
-			interpol = log(2.0 + biasFunc(L_w / L_max, biasValue) * 8.0);			
-			L_d = (log(L_w+1.0)/interpol) / divider;
+
+			interpol = log(2.0 + biasFunc(L_w / L_max, biasValue) * 8.0);
+			L_d = (log(L_w + 1.0) / interpol) / divider;
 
 			L_s = L_d / Y;
 
-			*pDestinationData++ = X * L_s;			
-			*pDestinationData++ = L_d;			
-			*pDestinationData++ = Z * L_s;	
+			*pDestinationData++ = X * L_s;
+			*pDestinationData++ = L_d;
+			*pDestinationData++ = Z * L_s;
 		}
 	}
 

TMOParis11/TMOParis11.cpp

@@ -37,30 +37,30 @@ TMOParis11::TMOParis11()
 	                          "setting this parameter ON change processing to Inverse Tone Mapping "
 	                          "for LDR images. Otherwise is processing Tone Mapping for HDR images.");
 	invToneMp.SetDefault(false);
-	invToneMp=false;
+	invToneMp = false;
 	this->Register(invToneMp);
 
 	/* Detail manipulation */
 	detailMnpl.SetName(L"detailMnpl");
 	detailMnpl.SetDescription(L"Set Detail Manipulation -> color remapping: rgb, domain: lin. "
 	                           "Otherwise (inverse) tone mapping -> color remapping: lum, domain: log.");
 	detailMnpl.SetDefault(false);
-	detailMnpl=false;
+	detailMnpl = false;
 	this->Register(detailMnpl);
 
 	/* Gamma */
 	gamma.SetName(L"gamma");
 	gamma.SetDescription(L"Gamma correction value: <1.0e-3,1.0e+2>");
 	gamma.SetDefault(2.2);
-	gamma=2.2;
-	gamma.SetRange(1.0e-3,1.0e+2);
+	gamma = 2.2;
+	gamma.SetRange(1.0e-3, 1.0e+2);
 	this->Register(gamma);
 
 	/* Sigma_r parameter */
 	sigma_r.SetName(L"sigma_r");
 	sigma_r.SetDescription(L"Sigma_r parameter: <0.0, 5.0>.");
 	sigma_r.SetDefault(2.5);
-	sigma_r=2.5;
+	sigma_r = 2.5;
 	sigma_r.SetRange(0.0, 5.0);
 	this->Register(sigma_r);
 
@@ -69,7 +69,7 @@ TMOParis11::TMOParis11()
 	beta.SetDescription(L"Beta parameter: <0.0, 5.0>. Tone mapping: 0.0 <= beta < 1.0. "
 	                     "Detail enhancement: beta = 1.0. Inverse tone mapping: beta > 1.0");
 	beta.SetDefault(0.0);
-	beta=0.0;
+	beta = 0.0;
 	beta.SetRange(0.0, 5.0);
 	this->Register(beta);
 
@@ -78,7 +78,7 @@ TMOParis11::TMOParis11()
 	alpha.SetDescription(L"Alpha parameter: <0.0, 5.0>. Detail smoothing: alpha > 1.0. "
 	                      "Detail enhancement: 0.0 < alpha < 1.0");
 	alpha.SetDefault(0.25);
-	alpha=0.25;
+	alpha = 0.25;
 	alpha.SetRange(0.0, 5.0);
 	this->Register(alpha);
 }

tmolib/TMOImage.cpp

@@ -2980,7 +2980,7 @@ int TMOImage::CenterWeight (int centerX, int centerY, double kernel, double *ave
 	int x, y, i, j, index;
 	int kernel_size, khalf;
 	int xstart, ystart;
-	double r, rclip, pixnb;	
+	double r, rclip, pixnb;
 	double **mask;
 	double m, sum;
 
@@ -3046,7 +3046,7 @@ int TMOImage::CenterWeight (int centerX, int centerY, double kernel, double *ave
 	}
 
 	/* Build the Gaussian kernel */
-	rclip = khalf*sqrt(-log(0.1)/log(2.0));
+	rclip = khalf * sqrt(-log(0.1) / log(2.0));
 
 	for (x = -khalf; x <= khalf; x++)
 	{
@@ -3368,8 +3368,8 @@ void TMOImage::CalculateLuminance(double &maximum, double &average)
 
 	for (int i = 0; i < size; i++)
 	{
-		average += log (GetOffset(i)[1] + 1e-4);
-		maximum = (GetOffset(i)[1] > maximum) ? GetOffset(i)[1] : maximum;		
+		average += log(GetOffset(i)[1] + 1e-4);
+		maximum = (GetOffset(i)[1] > maximum) ? GetOffset(i)[1] : maximum;
 	}
 
 	average = exp(average / size);

tmolib/TMOImage.h

@@ -175,9 +175,10 @@ class TMOLIB_API TMOImage
 	virtual void GetStatisticsSquareRange(int x, int y, int size = 0);
 	virtual double GetLuminanceYxy(int x, int y, int r = 0);
 	virtual double SetLuminance(int x, int y, double L);
-	virtual void CalculateLuminance(double &maximum, double &average);	
+	virtual void CalculateLuminance(double &maximum, double &average);
 	virtual int GetMinMaxAvg(double *minimum, double *maximum, double *average);
 	virtual int GetMinMaxAvgLog10(double *minimum, double *maximum, double *average);
+
 	virtual int GetDimensions(int *x, int *y);
 	virtual int SetDimensions(int x, int y)
 	{
@@ -186,10 +187,11 @@ class TMOLIB_API TMOImage
 		return 0;
 	}
 	virtual const char *GetFilename() { return (pName); };
+
 	virtual int SetFilename(const char *filename);
 	virtual int CorrectGamma(double gamma);
 	virtual int CorrectGammaYxy(double gamma); //just for testing, not reasonable
-	virtual int CenterWeight(int centerX, int centerY, float kernel, double *average);
+	virtual int CenterWeight(int centerX, int centerY, double kernel, double *average);
 	virtual int SetData(double *&newData);
 
 	struct TMOStatistics