diff --git a/src/ImageProcessor/Processors/Watermark.cs b/src/ImageProcessor/Processors/Watermark.cs index 25b449987..25abe65e3 100644 --- a/src/ImageProcessor/Processors/Watermark.cs +++ b/src/ImageProcessor/Processors/Watermark.cs @@ -37,7 +37,7 @@ namespace ImageProcessor.Processors /// /// The regular expression to search strings for the position attribute. /// - private static readonly Regex PositionRegex = new Regex(@"position-\d+-\d+", RegexOptions.Compiled); + private static readonly Regex PositionRegex = new Regex(@"position-\d+[-,]\d+", RegexOptions.Compiled); /// /// The regular expression to search strings for the color attribute. diff --git a/src/Nuget/ImageProcessor.1.8.0.0.nupkg b/src/Nuget/ImageProcessor.1.8.0.0.nupkg new file mode 100644 index 000000000..00ab82b0c Binary files /dev/null and b/src/Nuget/ImageProcessor.1.8.0.0.nupkg differ diff --git a/src/Nuget/ImageProcessor.Web.3.0.0.0.nupkg b/src/Nuget/ImageProcessor.Web.3.0.0.0.nupkg new file mode 100644 index 000000000..6821b7676 Binary files /dev/null and b/src/Nuget/ImageProcessor.Web.3.0.0.0.nupkg differ diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml b/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml index adde1b4a6..25593e8ff 100644 --- a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml +++ b/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml @@ -10,7 +10,7 @@

Foreign language test.

- +

Cropped

@@ -127,7 +127,7 @@

Rotate

- +

Quality

diff --git a/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config b/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config index c1efcd9dd..21e2d0b46 100644 --- a/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config +++ b/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config @@ -9,7 +9,7 @@ - + diff --git a/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/security.config b/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/security.config index cc735ce2f..8a5716290 100644 --- a/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/security.config +++ b/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/security.config @@ -2,7 +2,6 @@ -