Browse Source

Revert "Somehow this was reverted!"

This reverts commit 0d365da5d4.
af/merge-core
James Jackson-South 10 years ago
parent
commit
fbb6a93c95
  1. 37
      src/ImageSharp/Formats/Gif/GifDecoderCore.cs

37
src/ImageSharp/Formats/Gif/GifDecoderCore.cs

@ -42,9 +42,9 @@ namespace ImageSharp.Formats
private int globalColorTableLength; private int globalColorTableLength;
/// <summary> /// <summary>
/// The next frame. /// The previous frame.
/// </summary> /// </summary>
private ImageFrame<TColor> nextFrame; private ImageFrame<TColor> previousFrame;
/// <summary> /// <summary>
/// The area to restore. /// The area to restore.
@ -319,7 +319,7 @@ namespace ImageSharp.Formats
ImageBase<TColor> image; ImageBase<TColor> image;
if (this.nextFrame == null) if (this.previousFrame == null)
{ {
image = this.decodedImage; image = this.decodedImage;
@ -333,10 +333,10 @@ namespace ImageSharp.Formats
if (this.graphicsControlExtension != null && if (this.graphicsControlExtension != null &&
this.graphicsControlExtension.DisposalMethod == DisposalMethod.RestoreToPrevious) this.graphicsControlExtension.DisposalMethod == DisposalMethod.RestoreToPrevious)
{ {
previousFrame = this.nextFrame; previousFrame = this.previousFrame;
} }
currentFrame = this.nextFrame.Clone(); currentFrame = this.previousFrame.Clone();
image = currentFrame; image = currentFrame;
@ -356,8 +356,6 @@ namespace ImageSharp.Formats
int interlaceY = 0; // The current interlaced line int interlaceY = 0; // The current interlaced line
using (PixelAccessor<TColor> pixelAccessor = image.Lock()) using (PixelAccessor<TColor> pixelAccessor = image.Lock())
{
using (PixelArea<TColor> pixelRow = new PixelArea<TColor>(imageWidth, ComponentOrder.XYZW))
{ {
for (int y = descriptor.Top; y < descriptor.Top + descriptor.Height; y++) for (int y = descriptor.Top; y < descriptor.Top + descriptor.Height; y++)
{ {
@ -396,10 +394,7 @@ namespace ImageSharp.Formats
writeY = y; writeY = y;
} }
pixelAccessor.CopyTo(pixelRow, writeY, descriptor.Left); for (int x = descriptor.Left; x < descriptor.Left + descriptor.Width; x++)
byte* pixelBase = pixelRow.PixelBase;
for (int x = 0; x < descriptor.Width; x++)
{ {
int index = indices[i]; int index = indices[i];
@ -408,34 +403,24 @@ namespace ImageSharp.Formats
this.graphicsControlExtension.TransparencyIndex != index) this.graphicsControlExtension.TransparencyIndex != index)
{ {
int indexOffset = index * 3; int indexOffset = index * 3;
*(pixelBase + 0) = colorTable[indexOffset];
*(pixelBase + 1) = colorTable[indexOffset + 1];
*(pixelBase + 2) = colorTable[indexOffset + 2];
*(pixelBase + 3) = 255;
// TODO: This is actually 200us faster in benchmarking. TColor pixel = default(TColor);
// int indexOffset = index * 3; pixel.PackFromBytes(colorTable[indexOffset], colorTable[indexOffset + 1], colorTable[indexOffset + 2], 255);
// TColor pixel = default(TColor); pixelAccessor[x, writeY] = pixel;
// pixel.PackFromBytes(colorTable[indexOffset], colorTable[indexOffset + 1], colorTable[indexOffset + 2], 255);
// currentPixels[x, writeY] = pixel;
} }
i++; i++;
pixelBase += 4;
}
pixelAccessor.CopyFrom(pixelRow, writeY, descriptor.Left);
} }
} }
} }
if (previousFrame != null) if (previousFrame != null)
{ {
this.nextFrame = previousFrame; this.previousFrame = previousFrame;
return; return;
} }
this.nextFrame = currentFrame == null ? this.decodedImage.ToFrame() : currentFrame.Clone(); this.previousFrame = currentFrame == null ? this.decodedImage.ToFrame() : currentFrame;
if (this.graphicsControlExtension != null && if (this.graphicsControlExtension != null &&
this.graphicsControlExtension.DisposalMethod == DisposalMethod.RestoreToBackground) this.graphicsControlExtension.DisposalMethod == DisposalMethod.RestoreToBackground)

Loading…
Cancel
Save