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

Processed review comments and did similar refactoring to the PNG decoding.

pull/548/head
woutware 8 years ago
parent
3659d8690d
commit
12ec82b25f
4 changed files with 36 additions and 117 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. 53
      src/ImageSharp/Formats/Png/Filters/AverageFilter.cs
  2. 38
      src/ImageSharp/Formats/Png/Filters/PaethFilter.cs
  3. 47
      src/ImageSharp/Formats/Png/Filters/SubFilter.cs
  4. 15
      src/ImageSharp/Formats/Png/Filters/UpFilter.cs

53
src/ImageSharp/Formats/Png/Filters/AverageFilter.cs
View File

@ -29,21 +29,19 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
ref byte prevBaseRef = ref MemoryMarshal.GetReference(previousScanline); ref byte prevBaseRef = ref MemoryMarshal.GetReference(previousScanline);
// Average(x) + floor((Raw(x-bpp)+Prior(x))/2) // Average(x) + floor((Raw(x-bpp)+Prior(x))/2)
for (int x = 1; x < scanline.Length; x++) int x = 1;
for (; x <= bytesPerPixel /* Note the <= because x starts at 1 */; ++x) {
ref byte scan = ref Unsafe.Add(ref scanBaseRef, x);
byte above = Unsafe.Add(ref prevBaseRef, x);
scan = (byte)(scan + (above >> 1));
}
for (; x < scanline.Length; ++x)
{ {
if (x - bytesPerPixel < 1) ref byte scan = ref Unsafe.Add(ref scanBaseRef, x);
{ byte left = Unsafe.Add(ref scanBaseRef, x - bytesPerPixel);
ref byte scan = ref Unsafe.Add(ref scanBaseRef, x); byte above = Unsafe.Add(ref prevBaseRef, x);
byte above = Unsafe.Add(ref prevBaseRef, x); scan = (byte)(scan + Average(left, above));
scan = (byte)((scan + (above >> 1)) % 256);
}
else
{
ref byte scan = ref Unsafe.Add(ref scanBaseRef, x);
byte left = Unsafe.Add(ref scanBaseRef, x - bytesPerPixel);
byte above = Unsafe.Add(ref prevBaseRef, x);
scan = (byte)((scan + Average(left, above)) % 256);
}
} }
} }
@ -69,30 +67,8 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
// Average(x) = Raw(x) - floor((Raw(x-bpp)+Prior(x))/2) // Average(x) = Raw(x) - floor((Raw(x-bpp)+Prior(x))/2)
resultBaseRef = 3; resultBaseRef = 3;
#if OLD_AND_SLOW
for (int x = 0; x < scanline.Length; x++)
{
if (x - bytesPerPixel < 0)
{
byte scan = Unsafe.Add(ref scanBaseRef, x);
byte above = Unsafe.Add(ref prevBaseRef, x);
ref byte res = ref Unsafe.Add(ref resultBaseRef, x + 1);
res = (byte)((scan - (above >> 1)) % 256);
sum += res < 128 ? res : 256 - res;
}
else
{
byte scan = Unsafe.Add(ref scanBaseRef, x);
byte left = Unsafe.Add(ref scanBaseRef, x - bytesPerPixel);
byte above = Unsafe.Add(ref prevBaseRef, x);
ref byte res = ref Unsafe.Add(ref resultBaseRef, x + 1);
res = (byte)((scan - Average(left, above)) % 256);
sum += res < 128 ? res : 256 - res;
}
}
#else
int x = 0; int x = 0;
for (; x < bytesPerPixel;) { for (; x < bytesPerPixel; /* Note: ++x happens in the body to avoid one add operation */) {
byte scan = Unsafe.Add(ref scanBaseRef, x); byte scan = Unsafe.Add(ref scanBaseRef, x);
byte above = Unsafe.Add(ref prevBaseRef, x); byte above = Unsafe.Add(ref prevBaseRef, x);
++x; ++x;
@ -101,7 +77,7 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
sum += ImageMaths.FastAbs(unchecked((sbyte)res)); sum += ImageMaths.FastAbs(unchecked((sbyte)res));
} }
for (int xLeft = x - bytesPerPixel; x < scanline.Length; ++xLeft) { for (int xLeft = x - bytesPerPixel; x < scanline.Length; ++xLeft /* Note: ++x happens in the body to avoid one add operation */) {
byte scan = Unsafe.Add(ref scanBaseRef, x); byte scan = Unsafe.Add(ref scanBaseRef, x);
byte left = Unsafe.Add(ref scanBaseRef, xLeft); byte left = Unsafe.Add(ref scanBaseRef, xLeft);
byte above = Unsafe.Add(ref prevBaseRef, x); byte above = Unsafe.Add(ref prevBaseRef, x);
@ -110,7 +86,6 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
res = (byte)(scan - Average(left, above)); res = (byte)(scan - Average(left, above));
sum += ImageMaths.FastAbs(unchecked((sbyte)res)); sum += ImageMaths.FastAbs(unchecked((sbyte)res));
} }
#endif
sum -= 3; sum -= 3;
} }

38
src/ImageSharp/Formats/Png/Filters/PaethFilter.cs
View File

@ -30,15 +30,16 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
ref byte prevBaseRef = ref MemoryMarshal.GetReference(previousScanline); ref byte prevBaseRef = ref MemoryMarshal.GetReference(previousScanline);
// Paeth(x) + PaethPredictor(Raw(x-bpp), Prior(x), Prior(x-bpp)) // Paeth(x) + PaethPredictor(Raw(x-bpp), Prior(x), Prior(x-bpp))
int offset = bytesPerPixel + 1; int offset = bytesPerPixel + 1; // Add one bcause x starts at one.
for (int x = 1; x < offset; x++) int x = 1;
for (; x < offset; x++)
{ {
ref byte scan = ref Unsafe.Add(ref scanBaseRef, x); ref byte scan = ref Unsafe.Add(ref scanBaseRef, x);
byte above = Unsafe.Add(ref prevBaseRef, x); byte above = Unsafe.Add(ref prevBaseRef, x);
scan = (byte)(scan + above); scan = (byte)(scan + above);
} }
for (int x = offset; x < scanline.Length; x++) for (; x < scanline.Length; x++)
{ {
ref byte scan = ref Unsafe.Add(ref scanBaseRef, x); ref byte scan = ref Unsafe.Add(ref scanBaseRef, x);
byte left = Unsafe.Add(ref scanBaseRef, x - bytesPerPixel); byte left = Unsafe.Add(ref scanBaseRef, x - bytesPerPixel);
@ -70,39 +71,17 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
// Paeth(x) = Raw(x) - PaethPredictor(Raw(x-bpp), Prior(x), Prior(x - bpp)) // Paeth(x) = Raw(x) - PaethPredictor(Raw(x-bpp), Prior(x), Prior(x - bpp))
resultBaseRef = 4; resultBaseRef = 4;
#if OLD_AND_SLOW
for (int x = 0; x < scanline.Length; x++)
{
if (x - bytesPerPixel < 0)
{
byte scan = Unsafe.Add(ref scanBaseRef, x);
byte above = Unsafe.Add(ref prevBaseRef, x);
ref byte res = ref Unsafe.Add(ref resultBaseRef, x + 1);
res = (byte)((scan - PaethPredicator(0, above, 0)) % 256);
sum += res < 128 ? res : 256 - res;
}
else
{
byte scan = Unsafe.Add(ref scanBaseRef, x);
byte left = Unsafe.Add(ref scanBaseRef, x - bytesPerPixel);
byte above = Unsafe.Add(ref prevBaseRef, x);
byte upperLeft = Unsafe.Add(ref prevBaseRef, x - bytesPerPixel);
ref byte res = ref Unsafe.Add(ref resultBaseRef, x + 1);
res = (byte)((scan - PaethPredicator(left, above, upperLeft)) % 256);
sum += res < 128 ? res : 256 - res;
}
}
#else
int x = 0; int x = 0;
for (; x < bytesPerPixel; ++x) { for (; x < bytesPerPixel; /* Note: ++x happens in the body to avoid one add operation */) {
byte scan = Unsafe.Add(ref scanBaseRef, x); byte scan = Unsafe.Add(ref scanBaseRef, x);
byte above = Unsafe.Add(ref prevBaseRef, x); byte above = Unsafe.Add(ref prevBaseRef, x);
ref byte res = ref Unsafe.Add(ref resultBaseRef, x + 1); ++x;
ref byte res = ref Unsafe.Add(ref resultBaseRef, x);
res = (byte)(scan - PaethPredictor(0, above, 0)); res = (byte)(scan - PaethPredictor(0, above, 0));
sum += ImageMaths.FastAbs(unchecked((sbyte)res)); sum += ImageMaths.FastAbs(unchecked((sbyte)res));
} }
for (int xLeft = x - bytesPerPixel; x < scanline.Length; ++xLeft) { for (int xLeft = x - bytesPerPixel; x < scanline.Length; ++xLeft /* Note: ++x happens in the body to avoid one add operation */) {
byte scan = Unsafe.Add(ref scanBaseRef, x); byte scan = Unsafe.Add(ref scanBaseRef, x);
byte left = Unsafe.Add(ref scanBaseRef, xLeft); byte left = Unsafe.Add(ref scanBaseRef, xLeft);
byte above = Unsafe.Add(ref prevBaseRef, x); byte above = Unsafe.Add(ref prevBaseRef, x);
@ -112,7 +91,6 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
res = (byte)(scan - PaethPredictor(left, above, upperLeft)); res = (byte)(scan - PaethPredictor(left, above, upperLeft));
sum += ImageMaths.FastAbs(unchecked((sbyte)res)); sum += ImageMaths.FastAbs(unchecked((sbyte)res));
} }
#endif
sum -= 4; sum -= 4;
} }

47
src/ImageSharp/Formats/Png/Filters/SubFilter.cs
View File

@ -25,19 +25,17 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
ref byte scanBaseRef = ref MemoryMarshal.GetReference(scanline); ref byte scanBaseRef = ref MemoryMarshal.GetReference(scanline);
// Sub(x) + Raw(x-bpp) // Sub(x) + Raw(x-bpp)
for (int x = 1; x < scanline.Length; x++) int x = 1;
for (; x <= bytesPerPixel /* Note the <= because x starts at 1 */; ++x)
{ {
if (x - bytesPerPixel < 1) ref byte scan = ref Unsafe.Add(ref scanBaseRef, x);
{ }
ref byte scan = ref Unsafe.Add(ref scanBaseRef, x);
scan = (byte)(scan % 256); for (; x < scanline.Length; ++x)
} {
else ref byte scan = ref Unsafe.Add(ref scanBaseRef, x);
{ byte prev = Unsafe.Add(ref scanBaseRef, x - bytesPerPixel);
ref byte scan = ref Unsafe.Add(ref scanBaseRef, x); scan = (byte)(scan + prev);
byte prev = Unsafe.Add(ref scanBaseRef, x - bytesPerPixel);
scan = (byte)((scan + prev) % 256);
}
} }
} }
@ -60,28 +58,8 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
// Sub(x) = Raw(x) - Raw(x-bpp) // Sub(x) = Raw(x) - Raw(x-bpp)
resultBaseRef = 1; resultBaseRef = 1;
#if OLD_AND_SLOW
for (int x = 0; x < scanline.Length; x++)
{
if (x - bytesPerPixel < 0)
{
byte scan = Unsafe.Add(ref scanBaseRef, x);
ref byte res = ref Unsafe.Add(ref resultBaseRef, x + 1);
res = (byte)(scan % 256);
sum += res < 128 ? res : 256 - res;
}
else
{
byte scan = Unsafe.Add(ref scanBaseRef, x);
byte prev = Unsafe.Add(ref scanBaseRef, x - bytesPerPixel);
ref byte res = ref Unsafe.Add(ref resultBaseRef, x + 1);
res = (byte)((scan - prev) % 256);
sum += res < 128 ? res : 256 - res;
}
}
#else
int x = 0; int x = 0;
for (; x < bytesPerPixel;) { for (; x < bytesPerPixel; /* Note: ++x happens in the body to avoid one add operation */) {
byte scan = Unsafe.Add(ref scanBaseRef, x); byte scan = Unsafe.Add(ref scanBaseRef, x);
++x; ++x;
ref byte res = ref Unsafe.Add(ref resultBaseRef, x); ref byte res = ref Unsafe.Add(ref resultBaseRef, x);
@ -89,7 +67,7 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
sum += ImageMaths.FastAbs(unchecked((sbyte)res)); sum += ImageMaths.FastAbs(unchecked((sbyte)res));
} }
for (int xLeft = x - bytesPerPixel; x < scanline.Length; ++xLeft) { for (int xLeft = x - bytesPerPixel; x < scanline.Length; ++xLeft /* Note: ++x happens in the body to avoid one add operation */) {
byte scan = Unsafe.Add(ref scanBaseRef, x); byte scan = Unsafe.Add(ref scanBaseRef, x);
byte prev = Unsafe.Add(ref scanBaseRef, xLeft); byte prev = Unsafe.Add(ref scanBaseRef, xLeft);
++x; ++x;
@ -97,7 +75,6 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
res = (byte)(scan - prev); res = (byte)(scan - prev);
sum += ImageMaths.FastAbs(unchecked((sbyte)res)); sum += ImageMaths.FastAbs(unchecked((sbyte)res));
} }
#endif
sum -= 1; sum -= 1;
} }

15
src/ImageSharp/Formats/Png/Filters/UpFilter.cs
View File

@ -32,7 +32,7 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
{ {
ref byte scan = ref Unsafe.Add(ref scanBaseRef, x); ref byte scan = ref Unsafe.Add(ref scanBaseRef, x);
byte above = Unsafe.Add(ref prevBaseRef, x); byte above = Unsafe.Add(ref prevBaseRef, x);
scan = (byte)((scan + above) % 256); scan = (byte)(scan + above);
} }
} }
@ -57,17 +57,7 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
// Up(x) = Raw(x) - Prior(x) // Up(x) = Raw(x) - Prior(x)
resultBaseRef = 2; resultBaseRef = 2;
#if OLD_AND_SLOW for (int x = 0; x < scanline.Length; /* Note: ++x happens in the body to avoid one add operation */) {
for (int x = 0; x < scanline.Length; x++)
{
byte scan = Unsafe.Add(ref scanBaseRef, x);
byte above = Unsafe.Add(ref prevBaseRef, x);
ref byte res = ref Unsafe.Add(ref resultBaseRef, x + 1);
res = (byte)((scan - above) % 256);
sum += res < 128 ? res : 256 - res;
}
#else
for (int x = 0; x < scanline.Length;) {
byte scan = Unsafe.Add(ref scanBaseRef, x); byte scan = Unsafe.Add(ref scanBaseRef, x);
byte above = Unsafe.Add(ref prevBaseRef, x); byte above = Unsafe.Add(ref prevBaseRef, x);
++x; ++x;
@ -75,7 +65,6 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
res = (byte)(scan - above); res = (byte)(scan - above);
sum += ImageMaths.FastAbs(unchecked((sbyte)res)); sum += ImageMaths.FastAbs(unchecked((sbyte)res));
} }
#endif
sum -= 2; sum -= 2;
} }

Write Preview
Loading…
Cancel
Save