From ae7b24058cd454e626fc81ece07bd458d65c3cd2 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Tue, 6 Oct 2015 17:09:07 +1100 Subject: [PATCH] Ensure properties are copied across. Former-commit-id: ebf56f15f37cd5ae647107a59a3f733fe10d58e3 Former-commit-id: f01ade25fd315b240d1e9c606f5e252b55efef83 Former-commit-id: 77f3a78dd2e7a2ad351500620994e6b8858d8467 --- src/ImageProcessor/ImageBase.cs | 2 ++ src/ImageProcessor/ImageExtensions.cs | 4 ++++ src/ImageProcessor/ImageProcessor.csproj | 1 - tests/ImageProcessor.Tests/Filters/FilterTests.cs | 8 ++++---- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ImageProcessor/ImageBase.cs b/src/ImageProcessor/ImageBase.cs index 7996cebc0..bd91fc5e1 100644 --- a/src/ImageProcessor/ImageBase.cs +++ b/src/ImageProcessor/ImageBase.cs @@ -60,6 +60,8 @@ namespace ImageProcessor this.Width = other.Width; this.Height = other.Height; + this.Quality = other.Quality; + this.FrameDelay = other.FrameDelay; this.Pixels = new byte[pixels.Length]; Array.Copy(pixels, this.Pixels, pixels.Length); } diff --git a/src/ImageProcessor/ImageExtensions.cs b/src/ImageProcessor/ImageExtensions.cs index 2298f8785..3f6b80b2e 100644 --- a/src/ImageProcessor/ImageExtensions.cs +++ b/src/ImageProcessor/ImageExtensions.cs @@ -86,7 +86,11 @@ namespace ImageProcessor private static Image PerformAction(Image source, bool clone, Action action) { Image transformedImage = clone ? new Image(source) : new Image(); + + // Only on clone? transformedImage.CurrentImageFormat = source.CurrentImageFormat; + transformedImage.RepeatCount = source.RepeatCount; + action(source, transformedImage); for (int i = 0; i < source.Frames.Count; i++) diff --git a/src/ImageProcessor/ImageProcessor.csproj b/src/ImageProcessor/ImageProcessor.csproj index 8e779c1c2..ce952a451 100644 --- a/src/ImageProcessor/ImageProcessor.csproj +++ b/src/ImageProcessor/ImageProcessor.csproj @@ -190,7 +190,6 @@ - diff --git a/tests/ImageProcessor.Tests/Filters/FilterTests.cs b/tests/ImageProcessor.Tests/Filters/FilterTests.cs index a6452d37a..b21c582a4 100644 --- a/tests/ImageProcessor.Tests/Filters/FilterTests.cs +++ b/tests/ImageProcessor.Tests/Filters/FilterTests.cs @@ -13,12 +13,12 @@ namespace ImageProcessor.Tests.Filters { public static readonly List Files = new List { - { "../../TestImages/Formats/Jpg/Backdrop.jpg"}, - { "../../TestImages/Formats/Bmp/Car.bmp" }, - { "../../TestImages/Formats/Png/cmyk.png" }, + //{ "../../TestImages/Formats/Jpg/Backdrop.jpg"}, + //{ "../../TestImages/Formats/Bmp/Car.bmp" }, + //{ "../../TestImages/Formats/Png/cmyk.png" }, //{ "../../TestImages/Formats/Gif/a.gif" }, //{ "../../TestImages/Formats/Gif/leaf.gif" }, - //{ "../../TestImages/Formats/Gif/ani.gif" }, + { "../../TestImages/Formats/Gif/ani.gif" }, //{ "../../TestImages/Formats/Gif/ani2.gif" }, //{ "../../TestImages/Formats/Gif/giphy.gif" }, };