From fb8b0f85755cd3ea985e97dd1de5fcbead1ad12c Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Thu, 7 Jan 2016 20:24:35 +1100 Subject: [PATCH] Inline methods for perf Former-commit-id: 74f419b4df37488676902624f09ba160c1974f7f Former-commit-id: bdf812eb8dd5746ba204ba70ba938cce33dcae7f Former-commit-id: ccd1ba3f85cf3b4fb101e1ea78f61b836fda3fe1 --- src/ImageProcessor/Filters/Brightness.cs | 25 +++-------- src/ImageProcessor/Filters/Contrast.cs | 43 +++++++------------ src/ImageProcessor/Samplers/EntropyCrop.cs | 3 ++ .../Processors/Filters/FilterTests.cs | 1 - 4 files changed, 24 insertions(+), 48 deletions(-) diff --git a/src/ImageProcessor/Filters/Brightness.cs b/src/ImageProcessor/Filters/Brightness.cs index 8a6b935e9..6a5ae3985 100644 --- a/src/ImageProcessor/Filters/Brightness.cs +++ b/src/ImageProcessor/Filters/Brightness.cs @@ -50,28 +50,15 @@ namespace ImageProcessor.Filters { for (int x = startX; x < endX; x++) { - target[x, y] = AdjustBrightness(source[x, y], brightness); + Color color = Color.Expand(source[x, y]); + + Vector3 vector3 = color.ToVector3(); + vector3 += new Vector3(brightness); + + target[x, y] = Color.Compress(new Color(vector3, color.A)); } } }); } - - /// - /// Returns a with the brightness adjusted. - /// - /// The source color. - /// The brightness adjustment factor. - /// - /// The . - /// - private static Color AdjustBrightness(Color color, float brightness) - { - color = Color.Expand(color); - - Vector3 vector3 = color.ToVector3(); - vector3 += new Vector3(brightness, brightness, brightness); - - return Color.Compress(new Color(vector3, color.A)); - } } } diff --git a/src/ImageProcessor/Filters/Contrast.cs b/src/ImageProcessor/Filters/Contrast.cs index 72dd0b8f0..4a45e2c48 100644 --- a/src/ImageProcessor/Filters/Contrast.cs +++ b/src/ImageProcessor/Filters/Contrast.cs @@ -49,38 +49,25 @@ namespace ImageProcessor.Filters { for (int x = startX; x < endX; x++) { - target[x, y] = AdjustContrast(source[x, y], contrast); - } - } - }); - } + Color color = Color.Expand(source[x, y]); - /// - /// Returns a with the contrast adjusted. - /// - /// The source color. - /// The contrast adjustment factor. - /// - /// The . - /// - private static Color AdjustContrast(Color color, float contrast) - { - color = Color.Expand(color); - - // Seems to be faster than Vector3. - color.R -= 0.5f; - color.R *= contrast; - color.R += 0.5f; + // Seems to be faster than Vector3. + color.R -= 0.5f; + color.R *= contrast; + color.R += 0.5f; - color.G -= 0.5f; - color.G *= contrast; - color.G += 0.5f; + color.G -= 0.5f; + color.G *= contrast; + color.G += 0.5f; - color.B -= 0.5f; - color.B *= contrast; - color.B += 0.5f; + color.B -= 0.5f; + color.B *= contrast; + color.B += 0.5f; - return Color.Compress(color); + target[x, y] = Color.Compress(color); + } + } + }); } } } diff --git a/src/ImageProcessor/Samplers/EntropyCrop.cs b/src/ImageProcessor/Samplers/EntropyCrop.cs index 0f1ce9067..3ef7f0453 100644 --- a/src/ImageProcessor/Samplers/EntropyCrop.cs +++ b/src/ImageProcessor/Samplers/EntropyCrop.cs @@ -16,6 +16,9 @@ namespace ImageProcessor.Samplers /// public class EntropyCrop : ParallelImageProcessor { + /// + /// The rectangle for cropping + /// private Rectangle cropRectangle; /// diff --git a/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs b/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs index a448f2051..c3b26590c 100644 --- a/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs +++ b/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs @@ -3,7 +3,6 @@ namespace ImageProcessor.Tests { using System.Diagnostics; using System.IO; - using System.Numerics; using ImageProcessor.Filters;