Merge pull request #5483 from Beep6581/whitespace

Whitespace cleanup

rtengine/CMakeLists.txt

@@ -98,16 +98,6 @@ set(RTENGINESOURCEFILES
     ipwavelet.cc
     jdatasrc.cc
     jpeg_ijg/jpeg_memsrc.cc
-    klt/convolve.cc
-    klt/error.cc
-    klt/klt_util.cc
-    klt/klt.cc
-    klt/pnmio.cc
-    klt/pyramid.cc
-    klt/selectGoodFeatures.cc
-    klt/storeFeatures.cc
-    klt/trackFeatures.cc
-    klt/writeFeatures.cc
     labimage.cc
     lcp.cc
     lj92.c

rtengine/color.h

@@ -1075,7 +1075,6 @@ public:
         //very small differences between the 2
         return x <= 0.003040 ? x * 12.92310 : 1.055 * exp(log(x) / sRGBGammaCurve) - 0.055;//continuous
         //  return x <= 0.003041 ? x * 12.92310 : 1.055011 * exp(log(x) / sRGBGammaCurve) - 0.055011;//continuous
-
     }
 
 
@@ -1092,7 +1091,6 @@ public:
         //very small differences between the 4
         return x <= 0.039286 ? x / 12.92310 : exp(log((x + 0.055) / 1.055) * sRGBGammaCurve);//continuous
         //  return x <= 0.039293 ? x / 12.92310 : exp(log((x + 0.055011) / 1.055011) * sRGBGammaCurve);//continuous
-
     }
 
 

rtengine/sleefsseavx.c

@@ -907,24 +907,24 @@ static INLINE vfloat vabsf(vfloat f) { return (vfloat)vandnotm((vmask)vcast_vf_f
 static INLINE vfloat vnegf(vfloat f) { return (vfloat)vxorm((vmask)f, (vmask)vcast_vf_f(-0.0f)); }
 
 #ifdef __SSE4_1__
-	// only one instruction when using SSE4.1
+// only one instruction when using SSE4.1
-	static INLINE vfloat vself(vmask mask, vfloat x, vfloat y) {
+static INLINE vfloat vself(vmask mask, vfloat x, vfloat y) {
     return _mm_blendv_ps(y,x,(vfloat)mask);
-	}
+}
 
-	static INLINE vint vselc(vmask mask, vint x, vint y) {
+static INLINE vint vselc(vmask mask, vint x, vint y) {
     return _mm_blendv_epi8(y,x,mask);
-	}
+}
 
 #else
-	// three instructions when using SSE2
+// three instructions when using SSE2
-	static INLINE vfloat vself(vmask mask, vfloat x, vfloat y) {
+static INLINE vfloat vself(vmask mask, vfloat x, vfloat y) {
     return (vfloat)vorm(vandm(mask, (vmask)x), vandnotm(mask, (vmask)y));
-	}
+}
 
-	static INLINE vint vselc(vmask mask, vint x, vint y) {
+static INLINE vint vselc(vmask mask, vint x, vint y) {
     return vorm(vandm(mask, (vmask)x), vandnotm(mask, (vmask)y));
-	}
+}
 #endif
 
 static INLINE vfloat vselfzero(vmask mask, vfloat x) {

tools/RTProfileBuilderSample.cs

@@ -141,7 +141,7 @@ namespace RTProfilerBuilder {
             return value;
         }
 
-		#region * Main and Helpers
+#region * Main and Helpers
         static string ToBool(bool condition) { return condition ? "true" : "false"; }
         static string ToFloat(float f) { return f.ToString(CultureInfo.InvariantCulture); }
 
@@ -152,7 +152,7 @@ namespace RTProfilerBuilder {
             int exitCode = 0;
 
             try {
-				#region Parse input parameters
+#region Parse input parameters
                 int argNo = 0;
 
                 // Name of raw/JPG to process
@@ -178,7 +178,7 @@ namespace RTProfilerBuilder {
                 string cameraMake  = args[argNo++];
                 string cameraModel = args[argNo++];
                 string camera = cameraMake + " " + cameraModel;
-				#endregion
+#endregion
 
                 // Read default file as basis
                 string[] lines = File.ReadAllLines(defaultProfileFilePath);
@@ -249,10 +249,10 @@ namespace RTProfilerBuilder {
             return nv;
         }
 
-		#endregion
+#endregion
     }
 
-	#region DistortionCorrectProf
+#region DistortionCorrectProf
     /// <summary>Holds a distortion correction profile for one lens. Uses sample points (focal length vs. dist. correction) as input.</summary>
     class DistortionCorrectProf {
         double[] adFocLen, adCorrect;
@@ -289,5 +289,5 @@ namespace RTProfilerBuilder {
             return "";  // should never happen
         }
     }
-	#endregion
+#endregion
 }

tools/osx/Info.plist-bin.in

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+    <dict>
         <key>CFBundleName</key>
         <string>RawTherapee-bin</string>
         <key>CFBundleIdentifier</key>
         <string>com.rawtherapee.rawtherapee</string>
-</dict>
+    </dict>
 </plist>

tools/osx/Info.plist.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+    <dict>
         <key>CFBundleDevelopmentRegion</key>
         <string>English</string>
         <key>CFBundleDisplayName</key>
@@ -163,5 +163,5 @@
                 </dict>
             </dict>
         </array>
-</dict>
+    </dict>
 </plist>

tools/osx/rt.entitlements

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+    <dict>
         <key>application-identifier</key>
         <string>com.rawtherapee.rawtherapee</string>
         <key>com.apple.security.temporary-exception.files.absolute-path.read-write</key>
@@ -16,5 +16,5 @@
         <true/>
         <key>com.apple.security.files.downloads.read-write</key>
         <true/>
-</dict>
+    </dict>
 </plist>