Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace ImageProcessor with ImageSharp in Wyam.Images #671

Merged
merged 2 commits into from
Jun 6, 2018
Merged

Replace ImageProcessor with ImageSharp in Wyam.Images #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb480dd
Replace ImageProcessor with ImageSharp in Wyam.Images
MisinformedDNA May 30, 2018
7f2d4ca
Remove dead code
MisinformedDNA May 30, 2018
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
23 changes: 0 additions & 23 deletions src/extensions/Wyam.Images/AnchorPosition.cs
View file
Open in desktop

This file was deleted.

115 changes: 72 additions & 43 deletions src/extensions/Wyam.Images/Image.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
using ImageProcessor.Imaging;
using ImageProcessor.Imaging.Formats;
using System;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing;
using SixLabors.ImageSharp.Processing.Filters;
using SixLabors.ImageSharp.Processing.Transforms;
using Wyam.Common.Documents;
using Wyam.Common.Execution;
using Wyam.Common.IO;
using Wyam.Common.Meta;
using Wyam.Common.Modules;
using Wyam.Common.Tracing;
using Wyam.Common.Util;
using img = ImageProcessor;

namespace Wyam.Images
{
Expand Down Expand Up @@ -97,7 +99,7 @@ private void EnsureCurrentInstruction()
/// </list>
/// </param>
/// <returns>The current module instance.</returns>
public Image Resize(int? width, int? height, AnchorPosition anchor = AnchorPosition.Center)
public Image Resize(int? width, int? height, AnchorPositionMode anchor = AnchorPositionMode.Center)
{
EnsureCurrentInstruction();

Expand Down Expand Up @@ -227,8 +229,7 @@ public Image SetHue(short degrees, bool rotate = false)

_currentInstruction.Hue = new HueInstruction
{
Degrees = degrees,
Rotate = rotate
Degrees = degrees
};

return this;
Expand Down Expand Up @@ -379,21 +380,21 @@ public Image And
}
}

private ISupportedImageFormat GetFormat(string extension, ImageInstruction ins)
private IImageFormat GetFormat(string extension, ImageInstruction ins)
{
ISupportedImageFormat format = null;
IImageFormat format = null;

if (extension.Equals(".jpg", StringComparison.OrdinalIgnoreCase) || extension.Equals(".jpeg", StringComparison.OrdinalIgnoreCase))
{
format = new JpegFormat { Quality = ins.JpegQuality };
format = ImageFormats.Jpeg;
}
else if (extension.Equals(".gif", StringComparison.OrdinalIgnoreCase))
{
format = new GifFormat { };
format = ImageFormats.Gif;
}
else if (extension.Equals(".png", StringComparison.OrdinalIgnoreCase))
{
format = new PngFormat { };
format = ImageFormats.Png;
}

return format;
Expand All @@ -413,7 +414,7 @@ public IEnumerable<IDocument> Execute(IReadOnlyList<IDocument> inputs, IExecutio

return _instructions.Select(instruction =>
{
ISupportedImageFormat format = GetFormat(relativePath.Extension, instruction);
IImageFormat format = GetFormat(relativePath.Extension, instruction);
if (format == null)
{
return null;
Expand Down Expand Up @@ -452,84 +453,112 @@ public IEnumerable<IDocument> Execute(IReadOnlyList<IDocument> inputs, IExecutio
});
}

private Stream ProcessImage(IDocument input, ISupportedImageFormat format, ImageInstruction ins)
private Stream ProcessImage(IDocument input, IImageFormat format, ImageInstruction ins)
{
using (img.ImageFactory imageFactory = new img.ImageFactory(preserveExifData: true))
// Load, resize, set the format and quality and save an image.
Image<Rgba32> image;
using (Stream stream = input.GetStream())
{
// Load, resize, set the format and quality and save an image.
img.ImageFactory fac;
using (Stream stream = input.GetStream())
{
fac = imageFactory.Load(stream).Format(format);
}
image = SixLabors.ImageSharp.Image.Load(stream);
}

image.Mutate(fac =>
{
if (ins.IsNeedResize)
{
if (ins.IsCropRequired)
{
var layer = new ResizeLayer(
size: ins.GetCropSize().Value,
anchorPosition: ins.GetAnchorPosition(),
resizeMode: ResizeMode.Crop
);

fac.Resize(layer);
fac = fac.Resize(new ResizeOptions
{
Size = ins.GetCropSize().Value,
Position = ins.GetAnchorPosition(),
Mode = ResizeMode.Crop
});
}
else
{
fac.Resize(ins.GetCropSize().Value);
fac = fac.Resize(ins.GetCropSize().Value);
}
}

foreach (var f in ins.Filters)
{
fac.Filter(ins.GetMatrixFilter(f));
fac = ApplyFilter(fac, f);
}

if (ins.Brightness.HasValue)
{
fac.Brightness(ins.Brightness.Value);
fac = fac.Brightness(ins.Brightness.Value);
}

if (ins.Constraint.HasValue)
{
fac.Constrain(ins.Constraint.Value);
var options = new ResizeOptions { Mode = ResizeMode.Max, Size = ins.GetCropSize().Value };
fac = fac.Resize(options);
}

if (ins.Opacity.HasValue)
{
fac.Alpha(ins.Opacity.Value);
fac = fac.Opacity(ins.Opacity.Value);
}

if (ins.Hue != null)
{
fac.Hue(ins.Hue.Degrees, ins.Hue.Rotate);
fac = fac.Hue(ins.Hue.Degrees);
}

if (ins.Tint != null)
{
fac.Tint(ins.Tint.Value);
//fac = fac.Tint(ins.Tint.Value);
}

if (ins.Vignette != null)
{
fac.Vignette(ins.Vignette.Value);
//fac = fac.Vignette(ins.Vignette.Value);
}

if (ins.Saturation.HasValue)
{
fac.Saturation(ins.Saturation.Value);
fac = fac.Saturate(ins.Saturation.Value);
}

if (ins.Contrast.HasValue)
{
fac.Contrast(ins.Contrast.Value);
fac = fac.Contrast(ins.Contrast.Value);
}
});

var outputStream = new MemoryStream();
image.Save(outputStream, format);
outputStream.Seek(0, SeekOrigin.Begin);
return outputStream;
}

var outputStream = new MemoryStream();
fac.Save(outputStream);
outputStream.Seek(0, SeekOrigin.Begin);
return outputStream;
private static IImageProcessingContext<Rgba32> ApplyFilter(IImageProcessingContext<Rgba32> fac, ImageFilter filter)
{
switch (filter)
{
case ImageFilter.BlackAndWhite:
return fac.BlackWhite();
case ImageFilter.GreyScale:
return fac.Grayscale();
case ImageFilter.HiSatch:
return fac.Saturate(0.7f);
case ImageFilter.Invert:
return fac.Invert();
case ImageFilter.Lomograph:
return fac.Lomograph();
case ImageFilter.LoSatch:
return fac.Saturate(0.3f);
case ImageFilter.Polariod:
return fac.Polaroid();
case ImageFilter.Sepia:
return fac.Sepia();
case ImageFilter.Comic:
case ImageFilter.Gotham:
throw new NotSupportedException();
default:
return fac;
}
}
}
Expand Down
51 changes: 12 additions & 39 deletions src/extensions/Wyam.Images/ImageInstruction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
using ImageProcessor.Imaging.Filters.Photo;
using System;
using System.Collections.Generic;
using System.Drawing;
using img = ImageProcessor.Imaging;
using SixLabors.ImageSharp.Processing.Transforms;

namespace Wyam.Images
{

public class HueInstruction
{
public int Degrees { get; set; }

public bool Rotate { get; set; } = false;
}

public class ImageInstruction
Expand All @@ -21,7 +19,7 @@ public class ImageInstruction

public Size? Constraint { get; set; }

public AnchorPosition AnchorPosition { get; set; }
public AnchorPositionMode AnchorPosition { get; set; }

public int? Brightness { get; set; }

Expand All @@ -47,19 +45,19 @@ public class ImageInstruction

public List<ImageFilter> Filters { get; set; } = new List<ImageFilter>();

public Size? GetCropSize()
public SixLabors.Primitives.Size? GetCropSize()
{
if (Width.HasValue && Height.HasValue)
{
return new Size(Width.Value, Height.Value);
return new SixLabors.Primitives.Size(Width.Value, Height.Value);
}
else if (Width.HasValue)
{
return new Size(Width.Value, 0);
return new SixLabors.Primitives.Size(Width.Value, 0);
}
else if (Height.HasValue)
{
return new Size(0, Height.Value);
return new SixLabors.Primitives.Size(0, Height.Value);
}

return null;
Expand Down Expand Up @@ -146,39 +144,14 @@ public string GetSuffix()
return suffix;
}

public IMatrixFilter GetMatrixFilter(ImageFilter filter)
public AnchorPositionMode GetAnchorPosition()
{
switch (filter)
{
case ImageFilter.BlackAndWhite: return MatrixFilters.BlackWhite;
case ImageFilter.Comic: return MatrixFilters.Comic;
case ImageFilter.Gotham: return MatrixFilters.Gotham;
case ImageFilter.GreyScale: return MatrixFilters.GreyScale;
case ImageFilter.HiSatch: return MatrixFilters.HiSatch;
case ImageFilter.Invert: return MatrixFilters.Invert;
case ImageFilter.Lomograph: return MatrixFilters.Lomograph;
case ImageFilter.LoSatch: return MatrixFilters.LoSatch;
case ImageFilter.Polariod: return MatrixFilters.Polaroid;
case ImageFilter.Sepia: return MatrixFilters.Sepia;
default: return MatrixFilters.Comic;
if (!Enum.IsDefined(typeof(AnchorPositionMode), AnchorPosition))
{
return AnchorPositionMode.Center;
}
}

public img.AnchorPosition GetAnchorPosition()
{
switch (AnchorPosition)
{
case AnchorPosition.Bottom: return img.AnchorPosition.Bottom;
case AnchorPosition.BottomLeft: return img.AnchorPosition.BottomLeft;
case AnchorPosition.BottomRight: return img.AnchorPosition.BottomRight;
case AnchorPosition.Center: return img.AnchorPosition.Center;
case AnchorPosition.Left: return img.AnchorPosition.Left;
case AnchorPosition.Right: return img.AnchorPosition.Right;
case AnchorPosition.Top: return img.AnchorPosition.Top;
case AnchorPosition.TopLeft: return img.AnchorPosition.TopLeft;
case AnchorPosition.TopRight: return img.AnchorPosition.TopRight;
default: return img.AnchorPosition.Center;
}
return AnchorPosition;
}
}
}
4 changes: 2 additions & 2 deletions src/extensions/Wyam.Images/Wyam.Images.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net462</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Wyam is a simple to use, highly modular, and extremely configurable static content generator. This library provides support for manipulating images.</Description>
<PackageTags>Wyam Static StaticContent StaticSite Blog BlogEngine Images ImageProcessor</PackageTags>
</PropertyGroup>
Expand All @@ -10,7 +10,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ImageProcessor" Version="2.5.2" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0004" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
Expand Down