v3.0.0 & v1.8.0

Former-commit-id: 28d0bf8bafbc8b8581852e62cebfa0121c14d85b

src/ImageProcessor/Processors/Watermark.cs

@@ -37,7 +37,7 @@ namespace ImageProcessor.Processors
         /// <summary>
         /// The regular expression to search strings for the position attribute.
         /// </summary>
-        private static readonly Regex PositionRegex = new Regex(@"position-\d+-\d+", RegexOptions.Compiled);
+        private static readonly Regex PositionRegex = new Regex(@"position-\d+[-,]\d+", RegexOptions.Compiled);
 
         /// <summary>
         /// The regular expression to search strings for the color attribute.

src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml

@@ -10,7 +10,7 @@
                 <img src="/images/Penguins.jpg?width=300" />
                 <h3>Foreign language test.</h3>
                 <img src="/images/udendørs.jpg?width=300" />
-                <img src="/images/udendørs.jpg?preset=a&filter=comic" />
+                <img src="/images/udendørs.jpg?preset=demo&filter=comic" />
             </div>
             <div class="col-s-6">
                 <h2>Cropped </h2>
@@ -127,7 +127,7 @@
         <div class="row">
             <div class="col-s-6">
                 <h2>Rotate</h2>
-                <img src="/images/Penguins.jpg?width=300&rotate=angle-54|bgcolor-fff" />
+                <img src="/images/Penguins.jpg?width=300&rotate=angle-54,bgcolor-fff" />
             </div>
             <div class="col-s-6">
                 <h2>Quality</h2>

src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config

@@ -9,7 +9,7 @@
       </plugin>
       <plugin name="Preset">
         <settings>
-          <setting key="a" value="width=300&#038;height=150"/>
+          <!--<setting key="demo" value="width=300&#038;height=150"/>-->
         </settings>
       </plugin>
     </plugins>

src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/security.config

@@ -2,7 +2,6 @@
   <security allowRemoteDownloads="true" timeout="300000" maxBytes="524288" remotePrefix="/remote.axd">
     <whiteList>
       <add url="http://images.mymovies.net"/>
-      <add url="http://www.theworldeffect.com" />
       <add url="http://maps.googleapis.com" extensionLess="true" imageFormat=".png"/>
     </whiteList>
   </security>