tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed several bugs produced during parallelism implementations

pull/1574/head
Simanto Rahman 8 years ago
parent
3c64102940
commit
4b801a414c
1 changed files with 33 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 74
      src/ImageSharp/Processing/Processors/Binarization/AdaptiveThresholdProcessor.cs

74
src/ImageSharp/Processing/Processors/Binarization/AdaptiveThresholdProcessor.cs
View File

@ -55,7 +55,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Binarization
this.Upper = upper; this.Upper = upper;
this.Lower = lower; this.Lower = lower;
this.Threshold = threshold; this.ThresholdLimit = threshold;
} }
/// <summary> /// <summary>
@ -71,7 +71,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Binarization
/// <summary> /// <summary>
/// Gets or sets the value for threshold limit /// Gets or sets the value for threshold limit
/// </summary> /// </summary>
public float Threshold { get; set; } public float ThresholdLimit { get; set; }
/// <inheritdoc/> /// <inheritdoc/>
protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration) protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
@ -90,81 +90,73 @@ namespace SixLabors.ImageSharp.Processing.Processors.Binarization
// Using pooled 2d buffer for integer image table // Using pooled 2d buffer for integer image table
using (Buffer2D<ulong> intImage = configuration.MemoryAllocator.Allocate2D<ulong>(width, height)) using (Buffer2D<ulong> intImage = configuration.MemoryAllocator.Allocate2D<ulong>(width, height))
using (IMemoryOwner<Rgb24> tmpBuffer = configuration.MemoryAllocator.Allocate<Rgb24>(width * height))
{ {
var workingRectangle = Rectangle.FromLTRB(startX, startY, endX, endY); Rectangle workingRectangle = Rectangle.FromLTRB(startX, startY, endX, endY);
ParallelHelper.IterateRowsWithTempBuffer<Rgb24>( this.pixelOpInstance.ToRgb24(source.GetPixelSpan(), tmpBuffer.GetSpan());
ParallelHelper.IterateRows(
workingRectangle, workingRectangle,
configuration, configuration,
(rows, memory) => rows =>
{ {
ulong sum = 0; Span<Rgb24> rgbSpan = tmpBuffer.GetSpan();
uint sum;
Span<Rgb24> tmpSpan = memory.Span; for (int x = startX; x < endX; x++)
for (int i = rows.Min; i < rows.Max; i++)
{ {
this.pixelOpInstance.ToRgb24(source.GetPixelRowSpan(i), tmpSpan);
sum = 0; sum = 0;
for (int y = rows.Min; y < rows.Max; y++)
for (int j = startX; j < endX; j++)
{ {
ref Rgb24 rgb = ref tmpSpan[j]; ref Rgb24 rgb = ref rgbSpan[(width * y) + x];
sum += (uint)(rgb.R + rgb.G + rgb.B);
sum += (ulong)(rgb.R + rgb.G + rgb.B);
if (i != 0) if (x > 0)
{ {
intImage[i, j] = intImage[i - 1, j] + sum; intImage[x - startX, y - startY] = intImage[x - 1 - startX, y - startY] + sum;
} }
else else
{ {
intImage[i, j] = sum; intImage[x - startX, y - startY] = sum;
} }
} }
} }
}); });
ParallelHelper.IterateRowsWithTempBuffer<Rgb24>( ParallelHelper.IterateRows(
workingRectangle, workingRectangle,
configuration, configuration,
(rows, memory) => rows =>
{ {
ushort x1, x2, y1, y2; ushort x1, x2, y1, y2;
uint count = 0; Span<Rgb24> rgbSpan = tmpBuffer.GetSpan();
long sum = 0; long sum = 0;
uint count = 0;
Span<Rgb24> tmpSpan = memory.Span; for (int x = startX; x < endX; x++)
for (int i = rows.Min; i < rows.Max; i++)
{ {
Span<TPixel> originalSpan = source.GetPixelRowSpan(i); for (int y = rows.Min; y < rows.Max; y++)
this.pixelOpInstance.ToRgb24(originalSpan, tmpSpan);
for (int j = startX; j < endX; j++)
{ {
ref Rgb24 rgb = ref tmpSpan[j]; ref Rgb24 rgb = ref rgbSpan[(width * y) + x];
x1 = (ushort)Math.Max(x - clusterSize + 1 - startX, 0);
x1 = (ushort)Math.Max(i - clusterSize + 1, 0); x2 = (ushort)Math.Min(x + clusterSize + 1 - startX, endX - startX - 1);
x2 = (ushort)Math.Min(i + clusterSize + 1, endY - 1); y1 = (ushort)Math.Max(y - clusterSize + 1 - startY, 0);
y1 = (ushort)Math.Max(j - clusterSize + 1, 0); y2 = (ushort)Math.Min(y + clusterSize + 1 - startY, endY - startY - 1);
y2 = (ushort)Math.Min(j + clusterSize + 1, endX - 1);
count = (uint)((x2 - x1) * (y2 - y1)); count = (uint)((x2 - x1) * (y2 - y1));
sum = (long)(intImage[x2, y2] - intImage[x1, y2] - intImage[x2, y1] + intImage[x1, y1]); sum = (long)(intImage[x2, y2] - intImage[x2, y1] - intImage[x1, y2] + intImage[x1, y1]);
if ((rgb.R + rgb.G + rgb.B) * count < sum * this.Threshold) if ((rgb.R + rgb.G + rgb.B) * count <= sum * this.ThresholdLimit)
{ {
originalSpan[j] = this.Lower; source[x, y] = this.Lower;
} }
else else
{ {
originalSpan[j] = this.Upper; source[x, y] = this.Upper;
} }
} }
} }
}); });
} }
} }

Write Preview
Loading…
Cancel
Save