Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e1d39de
Addition of Breadley AdaptiveThreshold
SimantoR Oct 5, 2018
152b8e6
# Added Rect.Intersect
SimantoR Oct 5, 2018
7951548
Merge branch 'master' into master
SimantoR Oct 6, 2018
170a65d
Merge branch 'master' into master
SimantoR Oct 7, 2018
5d61a3f
Merge branch 'master' into master
SimantoR Oct 13, 2018
95a7b0d
Added parallelism to loops
SimantoR Oct 13, 2018
1e7dc83
Merge branch 'master' into master
SimantoR Oct 23, 2018
2b6d93a
Temporary fix to accomodate #744
SimantoR Oct 24, 2018
bb5cc29
Few general changes without effecting the algorithm implementation
SimantoR Oct 24, 2018
ba8929c
Merge branch 'master' into master
SimantoR Oct 24, 2018
a501113
Merge branch 'master' of https://github.com/SimantoR/ImageSharp
SimantoR Oct 24, 2018
d8f3b39
Fixed few breaking changes
SimantoR Oct 24, 2018
8978bc3
Missed an end of line by accident :p
SimantoR Oct 24, 2018
6805f6d
Used TempBuffer and fixed few logical errors
SimantoR Oct 25, 2018
b054102
Added contructor to control threshold limit
SimantoR Oct 25, 2018
319fc95
Fixed several bugs produced during parallelism implementations
SimantoR Oct 26, 2018
a239e60
Algorithm behaves abnormally when applied with ParallelHelpers
SimantoR Oct 30, 2018
1f52c9d
Fully working implementation
SimantoR Oct 30, 2018
31e5d8d
Changed naming convention for threshold limit param
SimantoR Oct 31, 2018
8610f5c
Fixed a minor bug
SimantoR Oct 31, 2018
be3718d
update to most recent version
SimantoR Apr 19, 2019
a5a0ecd
Re-add external test images
brianpopow Apr 2, 2020
019d973
Merge remote-tracking branch 'upstream/master'
brianpopow Apr 2, 2020
39d5a93
Adjustments to changes from the upstream
brianpopow Apr 2, 2020
6963945
Add tests for the AdaptiveThreshold processor
brianpopow Apr 2, 2020
75ac0ee
Remove not needed tmp buffer
brianpopow Apr 2, 2020
a468883
Changed startX and endX from ushort to int, Add test with rectangle
brianpopow Apr 2, 2020
1c92670
Using pixel row span to access the pixels
brianpopow Apr 2, 2020
50aa77e
Review changes
brianpopow Apr 2, 2020
ee016f6
Minor formatting change
brianpopow Apr 3, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions src/ImageSharp/Processing/AdaptiveThresholdExtensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing.Processors;
using SixLabors.Primitives;

namespace SixLabors.ImageSharp.Processing
{
/// <summary>
/// Extensions to perform AdaptiveThreshold through Mutator
/// </summary>
public static class AdaptiveThresholdExtensions
{
/// <summary>
/// Applies Bradley Adaptive Threshold to the image.
/// </summary>
/// <param name="source">The image this method extends.</param>
/// <typeparam name="TPixel">The pixel format.</typeparam>
/// <returns>The <see cref="Image{TPixel}"/>.</returns>
public static IImageProcessingContext<TPixel> AdaptiveThreshold<TPixel>(this IImageProcessingContext<TPixel> source)
where TPixel : struct, IPixel<TPixel>
=> source.ApplyProcessor(new AdaptiveThresholdProcessor<TPixel>());

/// <summary>
/// Applies Bradley Adaptive Threshold to the image.
/// </summary>
/// <param name="source">The image this method extends.</param>
/// <param name="upper">Upper (white) color for thresholding.</param>
/// <param name="lower">Lower (black) color for thresholding</param>
/// /// <typeparam name="TPixel">The pixel format.</typeparam>
/// <returns>The <see cref="Image{TPixel}"/>.</returns>
public static IImageProcessingContext<TPixel> AdaptiveThreshold<TPixel>(this IImageProcessingContext<TPixel> source, TPixel upper, TPixel lower)
where TPixel : struct, IPixel<TPixel>
=> source.ApplyProcessor(new AdaptiveThresholdProcessor<TPixel>(upper, lower));

/// <summary>
/// Applies Bradley Adaptive Threshold to the image.
/// </summary>
/// <param name="source">The image this method extends.</param>
/// <param name="upper">Upper (white) color for thresholding.</param>
/// <param name="lower">Lower (black) color for thresholding</param>
/// <param name="rectangle">Rectangle region to apply the processor on.</param>
/// <typeparam name="TPixel">The pixel format.</typeparam>
/// <returns>The <see cref="Image{TPixel}"/>.</returns>
public static IImageProcessingContext<TPixel> AdaptiveThreshold<TPixel>(this IImageProcessingContext<TPixel> source, TPixel upper, TPixel lower, Rectangle rectangle)
where TPixel : struct, IPixel<TPixel>
=> source.ApplyProcessor(new AdaptiveThresholdProcessor<TPixel>(upper, lower), rectangle);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
using System;
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.Primitives;

namespace SixLabors.ImageSharp.Processing.Processors
{
/// <summary>
/// Performs Bradley Adaptive Threshold filter against an image
/// </summary>
/// <typeparam name="TPixel">The pixel format of the image</typeparam>
internal class AdaptiveThresholdProcessor<TPixel> : IImageProcessor<TPixel>
where TPixel : struct, IPixel<TPixel>
{
/// <summary>
/// Initializes a new instance of the <see cref="AdaptiveThresholdProcessor{TPixel}"/> class.
/// </summary>
public AdaptiveThresholdProcessor()
: this(NamedColors<TPixel>.White, NamedColors<TPixel>.Black)
{
}

/// <summary>
/// Initializes a new instance of the <see cref="AdaptiveThresholdProcessor{TPixel}"/> class.
/// </summary>
/// <param name="upper">Color for upper threshold</param>
/// <param name="lower">Color for lower threshold</param>
public AdaptiveThresholdProcessor(TPixel upper, TPixel lower)
{
this.Upper = upper;
this.Lower = lower;
}

/// <summary>
/// Gets or sets upper color limit for thresholding
/// </summary>
public TPixel Upper { get; set; }

/// <summary>
/// Gets or sets lower color limit for threshold
/// </summary>
public TPixel Lower { get; set; }

public unsafe void Apply(Image<TPixel> source, Rectangle sourceRectangle)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why unsafe?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh! forgot to remove that, was doing some experimenting but since there are 2DArray pool I didn't implement it. Will remove it asap.

{
ushort xStart = (ushort)Math.Max(0, sourceRectangle.X);
ushort yStart = (ushort)Math.Max(0, sourceRectangle.Y);
ushort xEnd = (ushort)Math.Min(xStart + sourceRectangle.Width, source.Width);
ushort yEnd = (ushort)Math.Min(yStart + sourceRectangle.Height, source.Height);

// Algorithm variables
uint sum, count;
ushort s = (ushort)Math.Truncate((xEnd / 16f) - 1);
uint[,] intImage = new uint[yEnd, xEnd];

// Trying to figure out how to do this
// Using (Buffer2D<ulong> intImg = source.GetConfiguration().MemoryAllocator.Allocate2D<ulong>)
Rgb24 rgb = default;

for (ushort i = yStart; i < yEnd; i++)
{
Span<TPixel> span = source.GetPixelRowSpan(i);

sum = 0;

for (ushort j = xStart; j < xEnd; j++)
{
span[j].ToRgb24(ref rgb);

sum += (uint)(rgb.R + rgb.G + rgb.B);

if (i != 0)
{
intImage[i, j] = intImage[i - 1, j] + sum;
}
else
{
intImage[i, j] = sum;
}
}
}

// How can I parallelize this?
ushort x1, x2, y1, y2;

for (ushort i = yStart; i < yEnd; i++)
{
Span<TPixel> span = source.GetPixelRowSpan(i);

for (ushort j = xStart; j < xEnd; j++)
{
x1 = (ushort)Math.Max(i - s + 1, 0);
x2 = (ushort)Math.Min(i + s + 1, yEnd - 1);
y1 = (ushort)Math.Max(j - s + 1, 0);
y2 = (ushort)Math.Min(j + s + 1, xEnd - 1);

count = (ushort)((x2 - x1) * (y2 - y1));

sum = intImage[x2, y2] - intImage[x1, y2] - intImage[x2, y1] + intImage[x1, y1];

span[j].ToRgb24(ref rgb);

if ((rgb.R + rgb.G + rgb.B) * count < sum * (1.0 - 0.15))
{
span[j] = this.Lower;
}
else
{
span[j] = this.Upper;
}
}
}
}
}
}