Skip to content

Commit 335409d

Browse files
committed
Overload watermark method with location
1 parent 78d802a commit 335409d

File tree

7 files changed

+25
-27
lines changed

7 files changed

+25
-27
lines changed

src/ImageWizard.Client/Builder/BuilderExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ public static string ToUrlString(this double value)
1616

1717
public static string ToUrlString(this Enum value)
1818
{
19-
return value.ToString().ToLower();
19+
return value.ToString().ToLowerInvariant();
2020
}
2121
}

src/ImageWizard.Client/Builder/ImageFilterExtensions.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,13 @@ public static Image Watermark(this Image image)
168168
return image;
169169
}
170170

171+
public static Image Watermark(this Image image, WatermarkLocation location)
172+
{
173+
image.Filter($"watermark({location.ToUrlString()})");
174+
175+
return image;
176+
}
177+
171178
public static Image Saturate(this Image image, double value)
172179
{
173180
image.Filter($"saturate({value.ToUrlString()})");

src/ImageWizard.ImageSharp/Filters/WatermarkFilter.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// MIT License
44

55
using ImageWizard.Attributes;
6+
using ImageWizard.Utils;
67
using Microsoft.Extensions.Options;
78
using SixLabors.ImageSharp;
89
using SixLabors.ImageSharp.Processing;

src/ImageWizard.ImageSharp/Filters/WatermarkOptions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// https://github.com/usercode/ImageWizard
33
// MIT License
44

5+
using ImageWizard.Utils;
6+
57
namespace ImageWizard.ImageSharp.Filters;
68

79
public class WatermarkOptions

src/ImageWizard.TestApp/Pages/Index.cshtml

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -153,26 +153,6 @@
153153
</div>
154154
</div>
155155

156-
<h2>Watermark</h2>
157-
<p>@@Url.ImageWizard().FetchLocalFile("img/bat-eared-fox.jpg", 4).AsImage().Watermark().BuildUrl()</p>
158-
<p>@Url.ImageWizard().FetchLocalFile("img/bat-eared-fox.jpg", 4).AsImage().Watermark().BuildUrl()</p>
159-
160-
<img src="@Url.ImageWizard().FetchLocalFile("img/bat-eared-fox.jpg", 4).AsImage().Resize(400, 400).Watermark().BuildUrl()" />
161-
162-
<h2>Draw text</h2>
163-
<p>@@Url.ImageWizard().FetchLocalFile("img/bat-eared-fox.jpg", 4).AsImage().Resize(400, 400).DrawText("bat-eared-fox", 65, 0.3, 0.1, false).BuildUrl()</p>
164-
<p>@Url.ImageWizard().FetchLocalFile("img/bat-eared-fox.jpg", 4).AsImage().Resize(400, 400).DrawText("bat-eared-fox", 65, 0.3, 0.1, false).BuildUrl()</p>
165-
166-
<img src="@Url.ImageWizard().FetchLocalFile("img/bat-eared-fox.jpg").AsImage().Resize(400,400).DrawText("bat eared fox", 65, 0.3, 0.1, false).BuildUrl()" />
167-
168-
169-
@* <h2>Resize WebP image with SkiaSharp</h2>
170-
<div class="row">
171-
<div class="col-lg-4">
172-
<img src="@Url.ImageWizard().FetchLocalFile("/img/raccoon.webp").AsImage().Resize(400,400).BuildUrl()" />
173-
</div>
174-
</div>*@
175-
176156
<h2>Fetch local file (from wwwroot folder)</h2>
177157
<p>@@Url.ImageWizard().FetchLocalFile("img/meerkat.jpg").AsImage().Resize(400,400).BuildUrl()</p>
178158
<p>@Url.ImageWizard().FetchLocalFile("img/meerkat.jpg").AsImage().Resize(400, 400).BuildUrl()</p>
@@ -245,6 +225,18 @@
245225
</div>
246226
</div>
247227

228+
<h2>Watermark</h2>
229+
<p>@@Url.ImageWizard().FetchLocalFile("img/bat-eared-fox.jpg", 4).AsImage().Watermark().BuildUrl()</p>
230+
<p>@Url.ImageWizard().FetchLocalFile("img/bat-eared-fox.jpg", 4).AsImage().Watermark().BuildUrl()</p>
231+
232+
<img src="@Url.ImageWizard().FetchLocalFile("img/bat-eared-fox.jpg", 4).AsImage().Resize(400, 400).Watermark().BuildUrl()" />
233+
234+
<h2>Draw text</h2>
235+
<p>@@Url.ImageWizard().FetchLocalFile("img/bat-eared-fox.jpg", 4).AsImage().Resize(400, 400).DrawText("bat-eared-fox", 65, 0.3, 0.1, false).BuildUrl()</p>
236+
<p>@Url.ImageWizard().FetchLocalFile("img/bat-eared-fox.jpg", 4).AsImage().Resize(400, 400).DrawText("bat-eared-fox", 65, 0.3, 0.1, false).BuildUrl()</p>
237+
238+
<img src="@Url.ImageWizard().FetchLocalFile("img/bat-eared-fox.jpg").AsImage().Resize(400,400).DrawText("bat eared fox", 65, 0.3, 0.1, false).BuildUrl()" />
239+
248240
<h2>Fetch youtube thumbnail</h2>
249241

250242
<p>@@Url.ImageWizard().Youtube("lzyWFew_w8Y").Resize(400,400).BuildUrl()</p>

src/ImageWizard.TestApp/Pages/_ViewImports.cshtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@using ImageWizard.TestApp
22
@using ImageWizard.Client
3+
@using ImageWizard.Utils
34
@namespace ImageWizard.TestApp.Pages
45
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
56
@addTagHelper *, ImageWizard.Client

src/ImageWizard.ImageSharp/Filters/WatermarkLocation.cs renamed to src/ImageWizard.Utils/FilterTypes/WatermarkLocation.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
// https://github.com/usercode/ImageWizard
33
// MIT License
44

5-
using ImageWizard.Attributes;
6-
using Microsoft.Extensions.Options;
7-
using SixLabors.ImageSharp;
8-
using SixLabors.ImageSharp.Processing;
9-
10-
namespace ImageWizard.ImageSharp.Filters;
5+
namespace ImageWizard.Utils;
116

127
public enum WatermarkLocation
138
{

0 commit comments

Comments
 (0)