tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixes issue #19 

Former-commit-id: a627544e6419e442e168787675b38080441f1527
af/merge-core
James South 12 years ago
parent
dfbda5a818
commit
cb2ff33132
16 changed files with 630 additions and 530 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/ImageProcessor/Imaging/ImageUtils.cs
  2. 3
      src/TestWebsites/NET45/Test_Website_NET45/Content/responsive-legacy.min.css
  3. 3
      src/TestWebsites/NET45/Test_Website_NET45/Content/responsive.min.css
  4. 1
      src/TestWebsites/NET45/Test_Website_NET45/Content/responsive.min.css.REMOVED.git-id
  5. 29
      src/TestWebsites/NET45/Test_Website_NET45/Controllers/HomeController.cs
  6. 19
      src/TestWebsites/NET45/Test_Website_NET45/Test_Website_NET45.csproj
  7. 100
      src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Bmp.cshtml
  8. 14
      src/TestWebsites/NET45/Test_Website_NET45/Views/Home/External.cshtml
  9. 99
      src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Gif.cshtml
  10. 541
      src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml
  11. 100
      src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Png.cshtml
  12. 100
      src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Png8.cshtml
  13. 99
      src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Tiff.cshtml
  14. 41
      src/TestWebsites/NET45/Test_Website_NET45/Views/Shared/_Layout.cshtml
  15. 2
      src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/security.config
  16. 1
      src/TestWebsites/NET45/Test_Website_NET45/gifts/cmyk.png.REMOVED.git-id

8
src/ImageProcessor/Imaging/ImageUtils.cs
View File

@ -29,6 +29,11 @@ namespace ImageProcessor.Imaging
/// </summary>
private static readonly Regex FormatRegex = new Regex(@"(\.?)(j(pg|peg)|bmp|png|gif|ti(f|ff))", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.RightToLeft);
/// <summary>
/// The image format regex for matching the file format at the end of a string.
/// </summary>
private static readonly Regex EndFormatRegex = new Regex(@"(\.)(j(pg|peg)|bmp|png|gif|ti(f|ff))$", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.RightToLeft);
/// <summary>
/// Returns the correct response type based on the given request path.
/// </summary>
@ -210,7 +215,7 @@ namespace ImageProcessor.Imaging
/// <returns>True the value contains a valid image extension, otherwise false.</returns>
public static bool IsValidImageExtension(string fileName)
{
return FormatRegex.IsMatch(fileName);
return EndFormatRegex.IsMatch(fileName);
}
/// <summary>
@ -235,6 +240,7 @@ namespace ImageProcessor.Imaging
public static bool IsIndexed(Image image)
{
// Test value of flags using bitwise AND.
// ReSharper disable once BitwiseOperatorOnEnumWithoutFlags
return (image.PixelFormat & PixelFormat.Indexed) != 0;
}
}

3
src/TestWebsites/NET45/Test_Website_NET45/Content/responsive-legacy.min.css
View File

File diff suppressed because one or more lines are too long

3
src/TestWebsites/NET45/Test_Website_NET45/Content/responsive.min.css
View File

File diff suppressed because one or more lines are too long

1
src/TestWebsites/NET45/Test_Website_NET45/Content/responsive.min.css.REMOVED.git-id
View File

@ -0,0 +1 @@
e0fbb23ec0c6b4a6980ac29f0c71b82ff900eebc

29
src/TestWebsites/NET45/Test_Website_NET45/Controllers/HomeController.cs
View File

@ -12,9 +12,38 @@ namespace Test_Website_NET45.Controllers
// GET: /Home/
public ActionResult Index()
{
return this.View();
}
public ActionResult Png()
{
return this.View();
}
public ActionResult Png8()
{
return this.View();
}
public ActionResult Gif()
{
return this.View();
}
public ActionResult Bmp()
{
return View();
}
public ActionResult Tiff()
{
return View();
}
public ActionResult External()
{
return this.View();
}
}
}

19
src/TestWebsites/NET45/Test_Website_NET45/Test_Website_NET45.csproj
View File

@ -118,7 +118,6 @@
<Compile Include="App_Start\FilterConfig.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
<Content Include="Content\responsive-legacy.min.css" />
<Content Include="Content\responsive.min.css" />
<Content Include="Global.asax" />
<Content Include="Images\1182076_e8c402e938_z.jpg" />
@ -197,6 +196,24 @@
<ItemGroup>
<Content Include="config\imageprocessor\security.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Home\Png.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Home\Gif.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Home\Bmp.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Home\Png8.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Home\Tiff.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Home\External.cshtml" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

100
src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Bmp.cshtml
View File

@ -0,0 +1,100 @@
@{
ViewBag.Title = "Bmp";
}
<article>
<h1>Bmp</h1>
<section>
<div class="row">
<div class="col-s-6">
<h2>Resized</h2>
<img src="/images/Penguins.bmp?width=300" />
</div>
<div class="col-s-6">
<h2>Cropped </h2>
<img src="/images/Penguins.bmp?crop=0-0-300-225" />
</div>
</div>
</section>
<section>
<h2>Filter</h2>
<div class="row">
<div class="col-s-6">
<h3>blackwhite</h3>
<img src="/images/Penguins.bmp?width=300&filter=blackwhite" />
</div>
<div class="col-s-6">
<h3>comic</h3>
<img src="/images/Penguins.bmp?width=300&filter=comic" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>lomograph</h3>
<img src="/images/Penguins.bmp?width=300&filter=lomograph" />
</div>
<div class="col-s-6">
<h3>greyscale</h3>
<img src="/images/Penguins.bmp?width=300&filter=greyscale" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>polaroid</h3>
<img src="/images/Penguins.bmp?width=300&filter=polaroid" />
</div>
<div class="col-s-6">
<h3>sepia</h3>
<img src="/images/Penguins.bmp?width=300&filter=sepia" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>gotham</h3>
<img src="/images/Penguins.bmp?width=300&filter=gotham" />
</div>
<div class="col-s-6">
<h3>hisatch</h3>
<img src="/images/Penguins.bmp?width=300&filter=hisatch" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>losatch</h3>
<img src="/images/Penguins.bmp?width=300&filter=losatch" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Watermark</h2>
<img src="/images/Penguins.bmp?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
</div>
<div class="col-s-6">
<h2>Format</h2>
<img src="/images/Penguins.bmp?width=300&format=jpg" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Rotate</h2>
<img src="/images/Penguins.bmp?width=300&rotate=angle-54|bgcolor-fff" />
</div>
<div class="col-s-6">
<h2>Quality</h2>
<img src="/images/Penguins.bmp?width=300&quality=5" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Alpha</h2>
<img src="/images/Penguins.bmp?width=300&alpha=50" />
</div>
</div>
</section>
</article>

14
src/TestWebsites/NET45/Test_Website_NET45/Views/Home/External.cshtml
View File

@ -0,0 +1,14 @@
@{
ViewBag.Title = "External";
}
<h1>External</h1>
<section>
<div class="row">
<div class="col-s-6">
<img src="/remote.axd?http://images.mymovies.net/images/film/cin/500x377/fid11707.jpg?width=400" />
</div>
<div class="col-s-6">
<img src="/remote.axd?http://maps.googleapis.com/maps/api/staticmap?center=Albany,+NY&zoom=13&scale=false&size=800x500&maptype=roadmap&sensor=false&format=png&visual_refresh=true?width=400" />
</div>
</div>
</section>

99
src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Gif.cshtml
View File

@ -0,0 +1,99 @@
@{
ViewBag.Title = "Gif";
}
<article>
<h1>Gif</h1>
<section>
<div class="row">
<div class="col-s-6">
<h2>Resized</h2>
<img src="/images/Penguins.gif?width=300" />
</div>
<div class="col-s-6">
<h2>Cropped </h2>
<img src="/images/Penguins.gif?crop=0-0-300-225" />
</div>
</div>
</section>
<section>
<h2>Filter</h2>
<div class="row">
<div class="col-s-6">
<h3>blackwhite</h3>
<img src="/images/Penguins.gif?width=300&filter=blackwhite" />
</div>
<div class="col-s-6">
<h3>comic</h3>
<img src="/images/Penguins.gif?width=300&filter=comic" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>lomograph</h3>
<img src="/images/Penguins.gif?width=300&filter=lomograph" />
</div>
<div class="col-s-6">
<h3>greyscale</h3>
<img src="/images/Penguins.gif?width=300&filter=greyscale" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>polaroid</h3>
<img src="/images/Penguins.gif?width=300&filter=polaroid" />
</div>
<div class="col-s-6">
<h3>sepia</h3>
<img src="/images/Penguins.gif?width=300&filter=sepia" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>gotham</h3>
<img src="/images/Penguins.gif?width=300&filter=gotham" />
</div>
<div class="col-s-6">
<h3>hisatch</h3>
<img src="/images/Penguins.gif?width=300&filter=hisatch" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>losatch</h3>
<img src="/images/Penguins.gif?width=300&filter=losatch" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Watermark</h2>
<img src="/images/Penguins.gif?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
</div>
<div class="col-s-6">
<h2>Format</h2>
<img src="/images/Penguins.gif?width=300&format=png" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Rotate</h2>
<img src="/images/Penguins.gif?width=300&rotate=angle-54|bgcolor-fff" />
</div>
<div class="col-s-6">
<h2>Quality</h2>
<img src="/images/Penguins.gif?width=300&quality=5" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Alpha</h2>
<img src="/images/Penguins.gif?width=300&alpha=50" />
</div>
</div>
</section>
</article>

541
src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml
View File

@ -5,13 +5,13 @@
<h1>Jpg</h1>
<section>
<div class="row">
<div class="column-6">
<div class="col-s-6">
<h2>Resized</h2>
<img src="/images/Penguins.jpg?width=300" />
<h3>Foreign language test.</h3>
<img src="/images/udendørs.jpg?width=300" />
</div>
<div class="column-6">
<div class="col-s-6">
<h2>Cropped </h2>
<img src="/images/Penguins.jpg?crop=0-0-300-225" />
</div>
@ -20,10 +20,10 @@
<section>
<div class="row">
<h2>Reside Pad</h2>
<div class="column-4">
<div class="col-s-4">
<img src="/images/Penguins.jpg?width=300&height=500" />
</div>
<div class="column-8">
<div class="col-s-8">
<img src="/images/udendørs.jpg?width=600&height=250" />
</div>
</div>
@ -31,10 +31,10 @@
<section>
<div class="row">
<h2>Resize Crop</h2>
<div class="column-4">
<div class="col-s-4">
<img src="/images/Penguins.jpg?width=300&height=500&mode=crop" />
</div>
<div class="column-8">
<div class="col-s-8">
<img src="/images/udendørs.jpg?width=600&height=250&mode=crop" />
</div>
</div>
@ -42,47 +42,47 @@
<section>
<h2>Filter</h2>
<div class="row">
<div class="column-6">
<div class="col-s-6">
<h3>blackwhite</h3>
<img src="/images/Penguins.jpg?width=300&filter=blackwhite" />
</div>
<div class="column-6">
<div class="col-s-6">
<h3>comic</h3>
<img src="/images/Penguins.jpg?width=300&filter=comic" />
</div>
</div>
<div class="row">
<div class="column-6">
<div class="col-s-6">
<h3>lomograph</h3>
<img src="/images/Penguins.jpg?width=300&filter=lomograph" />
</div>
<div class="column-6">
<div class="col-s-6">
<h3>greyscale</h3>
<img src="/images/Penguins.jpg?width=300&filter=greyscale" />
</div>
</div>
<div class="row">
<div class="column-6">
<div class="col-s-6">
<h3>polaroid</h3>
<img src="/images/Penguins.jpg?width=300&filter=polaroid" />
</div>
<div class="column-6">
<div class="col-s-6">
<h3>sepia</h3>
<img src="/images/Penguins.jpg?width=300&filter=sepia" />
</div>
</div>
<div class="row">
<div class="column-6">
<div class="col-s-6">
<h3>gotham</h3>
<img src="/images/Penguins.jpg?width=300&filter=gotham" />
</div>
<div class="column-6">
<div class="col-s-6">
<h3>hisatch</h3>
<img src="/images/Penguins.jpg?width=300&filter=hisatch" />
</div>
</div>
<div class="row">
<div class="column-6">
<div class="col-s-6">
<h3>losatch</h3>
<img src="/images/Penguins.jpg?width=300&filter=losatch" />
</div>
@ -90,11 +90,11 @@
</section>
<section>
<div class="row">
<div class="column-6">
<div class="col-s-6">
<h2>Watermark</h2>
<img src="/images/Penguins.jpg?width=300&watermark=text-This+is+a+long+body+of+copy+that+should+wrap|color-fff|size-24|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
</div>
<div class="column-6">
<div class="col-s-6">
<h2>Format</h2>
<img src="/images/Penguins.jpg?width=300&format=gif" />
</div>
@ -102,11 +102,11 @@
</section>
<section>
<div class="row">
<div class="column-6">
<div class="col-s-6">
<h2>Rotate</h2>
<img src="/images/Penguins.jpg?width=300&rotate=angle-54|bgcolor-fff" />
</div>
<div class="column-6">
<div class="col-s-6">
<h2>Quality</h2>
<img src="/images/Penguins.jpg?width=300&quality=5" />
</div>
@ -114,520 +114,39 @@
</section>
<section>
<div class="row">
<div class="column-6">
<div class="col-s-6">
<h2>Alpha</h2>
<img src="/images/Penguins.jpg?width=300&format=png&alpha=50" />
</div>
<div class="column-6">
<div class="col-s-6">
<h2>Remote</h2>
<img src="/remote.axd?http://images.mymovies.net/images/film/cin/500x377/fid11707.jpg?width=300" />
@*<img src="/remote.axd?http://www.theworldeffect.com/images/6a00e54fa8abf78833011570697305970b-800wi.jpg?width=300" />*@
<img src="/remote.axd?http://maps.googleapis.com/maps/api/staticmap?center=Albany,+NY&zoom=13&scale=false&size=600x300&maptype=roadmap&sensor=false&format=png&visual_refresh=true?width=300" />
</div>
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<div class="col-s-6">
<h2>Flip - horizontal</h2>
<img src="/images/Penguins.jpg?width=300&flip=horizontal" />
</div>
<div class="column-6">
<div class="col-s-6">
<h2>Flip - vertical</h2>
<img src="/images/Penguins.jpg?width=300&flip=vertical" />
</div>
</div>
</section>
</article>
<article>
<h1>Gif</h1>
<section>
<div class="row">
<div class="column-6">
<h2>Resized</h2>
<img src="/images/Penguins.gif?width=300" />
</div>
<div class="column-6">
<h2>Cropped </h2>
<img src="/images/Penguins.gif?crop=0-0-300-225" />
</div>
</div>
</section>
<section>
<h2>Filter</h2>
<div class="row">
<div class="column-6">
<h3>blackwhite</h3>
<img src="/images/Penguins.gif?width=300&filter=blackwhite" />
</div>
<div class="column-6">
<h3>comic</h3>
<img src="/images/Penguins.gif?width=300&filter=comic" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>lomograph</h3>
<img src="/images/Penguins.gif?width=300&filter=lomograph" />
</div>
<div class="column-6">
<h3>greyscale</h3>
<img src="/images/Penguins.gif?width=300&filter=greyscale" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>polaroid</h3>
<img src="/images/Penguins.gif?width=300&filter=polaroid" />
</div>
<div class="column-6">
<h3>sepia</h3>
<img src="/images/Penguins.gif?width=300&filter=sepia" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>gotham</h3>
<img src="/images/Penguins.gif?width=300&filter=gotham" />
</div>
<div class="column-6">
<h3>hisatch</h3>
<img src="/images/Penguins.gif?width=300&filter=hisatch" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>losatch</h3>
<img src="/images/Penguins.gif?width=300&filter=losatch" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Watermark</h2>
<img src="/images/Penguins.gif?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
</div>
<div class="column-6">
<h2>Format</h2>
<img src="/images/Penguins.gif?width=300&format=png" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Rotate</h2>
<img src="/images/Penguins.gif?width=300&rotate=angle-54|bgcolor-fff" />
</div>
<div class="column-6">
<h2>Quality</h2>
<img src="/images/Penguins.gif?width=300&quality=5" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Alpha</h2>
<img src="/images/Penguins.gif?width=300&alpha=50" />
</div>
</div>
</section>
</article>
<article>
<h1>Png</h1>
<section>
<div class="row">
<div class="column-6">
<h2>Resized</h2>
<img src="/images/Penguins.png?width=300" />
</div>
<div class="column-6">
<h2>Cropped </h2>
<img src="/images/Penguins.png?crop=0-0-300-225" />
</div>
</div>
</section>
<section>
<h2>Filter</h2>
<div class="row">
<div class="column-6">
<h3>blackwhite</h3>
<img src="/images/Penguins.png?width=300&filter=blackwhite" />
</div>
<div class="column-6">
<h3>comic</h3>
<img src="/images/Penguins.png?width=300&filter=comic" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>lomograph</h3>
<img src="/images/Penguins.png?width=300&filter=lomograph" />
</div>
<div class="column-6">
<h3>greyscale</h3>
<img src="/images/Penguins.png?width=300&filter=greyscale" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>polaroid</h3>
<img src="/images/Penguins.png?width=300&filter=polaroid" />
</div>
<div class="column-6">
<h3>sepia</h3>
<img src="/images/Penguins.png?width=300&filter=sepia" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>gotham</h3>
<img src="/images/Penguins.png?width=300&filter=gotham" />
</div>
<div class="column-6">
<h3>hisatch</h3>
<img src="/images/Penguins.png?width=300&filter=hisatch" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>losatch</h3>
<img src="/images/Penguins.png?width=300&filter=losatch" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Watermark</h2>
<img src="/images/Penguins.png?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
</div>
<div class="column-6">
<h2>Format</h2>
<img src="/images/Penguins.png?width=300&format=bmp" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Rotate</h2>
<img src="/images/Penguins.png?width=300&rotate=angle-54|bgcolor-fff" />
</div>
<div class="column-6">
<h2>Quality</h2>
<img src="/images/Penguins.png?width=300&quality=5" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Alpha</h2>
<img src="/images/Penguins.png?width=300&alpha=50" />
</div>
</div>
</section>
</article>
<article>
<h1>Png8</h1>
<section>
<div class="row">
<div class="column-6">
<h2>Resized</h2>
<img src="/images/Penguins-8.png?width=300" />
</div>
<div class="column-6">
<h2>Cropped </h2>
<img src="/images/Penguins-8.png?crop=0-0-300-225" />
</div>
</div>
</section>
<section>
<h2>Filter</h2>
<div class="row">
<div class="column-6">
<h3>blackwhite</h3>
<img src="/images/Penguins-8.png?width=300&filter=blackwhite" />
</div>
<div class="column-6">
<h3>comic</h3>
<img src="/images/Penguins-8.png?width=300&filter=comic" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>lomograph</h3>
<img src="/images/Penguins-8.png?width=300&filter=lomograph" />
</div>
<div class="column-6">
<h3>greyscale</h3>
<img src="/images/Penguins-8.png?width=300&filter=greyscale" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>polaroid</h3>
<img src="/images/Penguins-8.png?width=300&filter=polaroid" />
</div>
<div class="column-6">
<h3>sepia</h3>
<img src="/images/Penguins-8.png?width=300&filter=sepia" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>gotham</h3>
<img src="/images/Penguins-8.png?width=300&filter=gotham" />
</div>
<div class="column-6">
<h3>hisatch</h3>
<img src="/images/Penguins-8.png?width=300&filter=hisatch" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>losatch</h3>
<img src="/images/Penguins-8.png?width=300&filter=losatch" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Watermark</h2>
<img src="/images/Penguins-8.png?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
</div>
<div class="column-6">
<h2>Format</h2>
<img src="/images/Penguins-8.png?width=300&format=bmp" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Rotate</h2>
<img src="/images/Penguins-8.png?width=300&rotate=angle-54|bgcolor-fff" />
</div>
<div class="column-6">
<h2>Quality</h2>
<img src="/images/Penguins-8.png?width=300&quality=5" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Alpha</h2>
<img src="/images/Penguins-8.png?width=300&alpha=50" />
</div>
</div>
</section>
</article>
<article>
<h1>Bmp</h1>
<section>
<div class="row">
<div class="column-6">
<h2>Resized</h2>
<img src="/images/Penguins.bmp?width=300" />
</div>
<div class="column-6">
<h2>Cropped </h2>
<img src="/images/Penguins.bmp?crop=0-0-300-225" />
</div>
</div>
</section>
<section>
<h2>Filter</h2>
<div class="row">
<div class="column-6">
<h3>blackwhite</h3>
<img src="/images/Penguins.bmp?width=300&filter=blackwhite" />
</div>
<div class="column-6">
<h3>comic</h3>
<img src="/images/Penguins.bmp?width=300&filter=comic" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>lomograph</h3>
<img src="/images/Penguins.bmp?width=300&filter=lomograph" />
</div>
<div class="column-6">
<h3>greyscale</h3>
<img src="/images/Penguins.bmp?width=300&filter=greyscale" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>polaroid</h3>
<img src="/images/Penguins.bmp?width=300&filter=polaroid" />
</div>
<div class="column-6">
<h3>sepia</h3>
<img src="/images/Penguins.bmp?width=300&filter=sepia" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>gotham</h3>
<img src="/images/Penguins.bmp?width=300&filter=gotham" />
</div>
<div class="column-6">
<h3>hisatch</h3>
<img src="/images/Penguins.bmp?width=300&filter=hisatch" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>losatch</h3>
<img src="/images/Penguins.bmp?width=300&filter=losatch" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Watermark</h2>
<img src="/images/Penguins.bmp?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
</div>
<div class="column-6">
<h2>Format</h2>
<img src="/images/Penguins.bmp?width=300&format=jpg" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Rotate</h2>
<img src="/images/Penguins.bmp?width=300&rotate=angle-54|bgcolor-fff" />
</div>
<div class="column-6">
<h2>Quality</h2>
<img src="/images/Penguins.bmp?width=300&quality=5" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Alpha</h2>
<img src="/images/Penguins.bmp?width=300&alpha=50" />
</div>
</div>
</section>
</article>
<article>
<h1>Tiff</h1>
<section>
<div class="row">
<div class="column-6">
<h2>Resized</h2>
<img src="/images/Penguins.tif?width=300" />
</div>
<div class="column-6">
<h2>Cropped </h2>
<img src="/images/Penguins.tif?crop=0-0-300-225" />
</div>
</div>
</section>
<section>
<h2>Filter</h2>
<div class="row">
<div class="column-6">
<h3>blackwhite</h3>
<img src="/images/Penguins.tif?width=300&filter=blackwhite" />
</div>
<div class="column-6">
<h3>comic</h3>
<img src="/images/Penguins.tif?width=300&filter=comic" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>lomograph</h3>
<img src="/images/Penguins.tif?width=300&filter=lomograph" />
</div>
<div class="column-6">
<h3>greyscale</h3>
<img src="/images/Penguins.tif?width=300&filter=greyscale" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>polaroid</h3>
<img src="/images/Penguins.tif?width=300&filter=polaroid" />
</div>
<div class="column-6">
<h3>sepia</h3>
<img src="/images/Penguins.tif?width=300&filter=sepia" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>gotham</h3>
<img src="/images/Penguins.tif?width=300&filter=gotham" />
</div>
<div class="column-6">
<h3>hisatch</h3>
<img src="/images/Penguins.tif?width=300&filter=hisatch" />
</div>
</div>
<div class="row">
<div class="column-6">
<h3>losatch</h3>
<img src="/images/Penguins.tif?width=300&filter=losatch" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Watermark</h2>
<img src="/images/Penguins.tif?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
</div>
<div class="column-6">
<h2>Format</h2>
<img src="/images/Penguins.tif?width=300&format=bmp" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Rotate</h2>
<img src="/images/Penguins.tif?width=300&rotate=angle-54|bgcolor-fff" />
</div>
<div class="column-6">
<h2>Quality</h2>
<img src="/images/Penguins.tif?width=300&quality=5" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>Alpha</h2>
<img src="/images/Penguins.tif?width=300&alpha=50" />
</div>
</div>
</section>
</article>
<article>
<h1>Color Profiles</h1>
<section>
<div class="row">
<div class="column-6">
<div class="col-s-6">
<h2>CMYK original jpg</h2>
<img src="/images/cmyk.jpg?" width="400" />
</div>
<div class="column-6">
<div class="col-s-6">
<h2>sRGB original jpg</h2>
<img src="/images/srgb.jpg?" width="400" />
</div>
@ -636,12 +155,12 @@
</section>
<section>
<div class="row">
<div class="column-6">
<div class="col-s-6">
<h2>CMYK resized jpg</h2>
<img src="/images/cmyk.jpg?width=400" />
</div>
<div class="column-6">
<div class="col-s-6">
<h2>sRGB resized jpg</h2>
<img src="/images/srgb.jpg?width=400" />
</div>

100
src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Png.cshtml
View File

@ -0,0 +1,100 @@
@{
ViewBag.Title = "Png";
}
<article>
<h1>Png</h1>
<section>
<div class="row">
<div class="col-s-6">
<h2>Resized</h2>
<img src="/images/Penguins.png?width=300" />
<img src="/gifts/cmyk.png?x=300" />
</div>
<div class="col-s-6">
<h2>Cropped </h2>
<img src="/images/Penguins.png?crop=0-0-300-225" />
</div>
</div>
</section>
<section>
<h2>Filter</h2>
<div class="row">
<div class="col-s-6">
<h3>blackwhite</h3>
<img src="/images/Penguins.png?width=300&filter=blackwhite" />
</div>
<div class="col-s-6">
<h3>comic</h3>
<img src="/images/Penguins.png?width=300&filter=comic" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>lomograph</h3>
<img src="/images/Penguins.png?width=300&filter=lomograph" />
</div>
<div class="col-s-6">
<h3>greyscale</h3>
<img src="/images/Penguins.png?width=300&filter=greyscale" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>polaroid</h3>
<img src="/images/Penguins.png?width=300&filter=polaroid" />
</div>
<div class="col-s-6">
<h3>sepia</h3>
<img src="/images/Penguins.png?width=300&filter=sepia" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>gotham</h3>
<img src="/images/Penguins.png?width=300&filter=gotham" />
</div>
<div class="col-s-6">
<h3>hisatch</h3>
<img src="/images/Penguins.png?width=300&filter=hisatch" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>losatch</h3>
<img src="/images/Penguins.png?width=300&filter=losatch" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Watermark</h2>
<img src="/images/Penguins.png?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
</div>
<div class="col-s-6">
<h2>Format</h2>
<img src="/images/Penguins.png?width=300&format=bmp" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Rotate</h2>
<img src="/images/Penguins.png?width=300&rotate=angle-54|bgcolor-fff" />
</div>
<div class="col-s-6">
<h2>Quality</h2>
<img src="/images/Penguins.png?width=300&quality=5" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Alpha</h2>
<img src="/images/Penguins.png?width=300&alpha=50" />
</div>
</div>
</section>
</article>

100
src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Png8.cshtml
View File

@ -0,0 +1,100 @@
@{
ViewBag.Title = "Png8";
}
<article>
<h1>Png8</h1>
<section>
<div class="row">
<div class="col-s-6">
<h2>Resized</h2>
<img src="/images/Penguins-8.png?width=300" />
</div>
<div class="col-s-6">
<h2>Cropped </h2>
<img src="/images/Penguins-8.png?crop=0-0-300-225" />
</div>
</div>
</section>
<section>
<h2>Filter</h2>
<div class="row">
<div class="col-s-6">
<h3>blackwhite</h3>
<img src="/images/Penguins-8.png?width=300&filter=blackwhite" />
</div>
<div class="col-s-6">
<h3>comic</h3>
<img src="/images/Penguins-8.png?width=300&filter=comic" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>lomograph</h3>
<img src="/images/Penguins-8.png?width=300&filter=lomograph" />
</div>
<div class="col-s-6">
<h3>greyscale</h3>
<img src="/images/Penguins-8.png?width=300&filter=greyscale" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>polaroid</h3>
<img src="/images/Penguins-8.png?width=300&filter=polaroid" />
</div>
<div class="col-s-6">
<h3>sepia</h3>
<img src="/images/Penguins-8.png?width=300&filter=sepia" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>gotham</h3>
<img src="/images/Penguins-8.png?width=300&filter=gotham" />
</div>
<div class="col-s-6">
<h3>hisatch</h3>
<img src="/images/Penguins-8.png?width=300&filter=hisatch" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>losatch</h3>
<img src="/images/Penguins-8.png?width=300&filter=losatch" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Watermark</h2>
<img src="/images/Penguins-8.png?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
</div>
<div class="col-s-6">
<h2>Format</h2>
<img src="/images/Penguins-8.png?width=300&format=bmp" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Rotate</h2>
<img src="/images/Penguins-8.png?width=300&rotate=angle-54|bgcolor-fff" />
</div>
<div class="col-s-6">
<h2>Quality</h2>
<img src="/images/Penguins-8.png?width=300&quality=5" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Alpha</h2>
<img src="/images/Penguins-8.png?width=300&alpha=50" />
</div>
</div>
</section>
</article>

99
src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Tiff.cshtml
View File

@ -0,0 +1,99 @@
@{
ViewBag.Title = "Tiff";
}
<article>
<h1>Tiff</h1>
<section>
<div class="row">
<div class="col-s-6">
<h2>Resized</h2>
<img src="/images/Penguins.tif?width=300" />
</div>
<div class="col-s-6">
<h2>Cropped </h2>
<img src="/images/Penguins.tif?crop=0-0-300-225" />
</div>
</div>
</section>
<section>
<h2>Filter</h2>
<div class="row">
<div class="col-s-6">
<h3>blackwhite</h3>
<img src="/images/Penguins.tif?width=300&filter=blackwhite" />
</div>
<div class="col-s-6">
<h3>comic</h3>
<img src="/images/Penguins.tif?width=300&filter=comic" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>lomograph</h3>
<img src="/images/Penguins.tif?width=300&filter=lomograph" />
</div>
<div class="col-s-6">
<h3>greyscale</h3>
<img src="/images/Penguins.tif?width=300&filter=greyscale" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>polaroid</h3>
<img src="/images/Penguins.tif?width=300&filter=polaroid" />
</div>
<div class="col-s-6">
<h3>sepia</h3>
<img src="/images/Penguins.tif?width=300&filter=sepia" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>gotham</h3>
<img src="/images/Penguins.tif?width=300&filter=gotham" />
</div>
<div class="col-s-6">
<h3>hisatch</h3>
<img src="/images/Penguins.tif?width=300&filter=hisatch" />
</div>
</div>
<div class="row">
<div class="col-s-6">
<h3>losatch</h3>
<img src="/images/Penguins.tif?width=300&filter=losatch" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Watermark</h2>
<img src="/images/Penguins.tif?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
</div>
<div class="col-s-6">
<h2>Format</h2>
<img src="/images/Penguins.tif?width=300&format=bmp" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Rotate</h2>
<img src="/images/Penguins.tif?width=300&rotate=angle-54|bgcolor-fff" />
</div>
<div class="col-s-6">
<h2>Quality</h2>
<img src="/images/Penguins.tif?width=300&quality=5" />
</div>
</div>
</section>
<section>
<div class="row">
<div class="col-s-6">
<h2>Alpha</h2>
<img src="/images/Penguins.tif?width=300&alpha=50" />
</div>
</div>
</section>
</article>

41
src/TestWebsites/NET45/Test_Website_NET45/Views/Shared/_Layout.cshtml
View File

@ -3,17 +3,38 @@
<head>
<meta charset="utf-8" />
<title>@ViewBag.Title</title>
<link href="@Url.Content("~/Content/responsive.min.css")" rel="stylesheet" type="text/css" media="all and (min-width: 1em)" />
<!--[if lt IE 9 &!(IEMobile)]>
<link href="@Url.Content("~/Content/responsive-legacy.min.css")" rel="stylesheet" type="text/css" />
<![endif]-->
<link href="@Url.Content("~/Content/responsive.min.css")" rel="stylesheet" type="text/css" />
<style type="text/css">
nav[role="navigation"] ul {
padding: 0;
}
nav[role="navigation"] li {
display: inline-block;
font-size: 2em;
margin-right: 1em;
}
</style>
</head>
<body>
<header class="container">
<h1>ImageProcessor NET4.5</h1>
</header>
<section class="container">
@RenderBody()
</section>
<div class="container">
<header>
<h1>ImageProcessor NET4.5</h1>
</header>
<nav role="navigation">
<ul>
<li>@Html.ActionLink("Jpeg", "Index")</li>
<li>@Html.ActionLink("Gif", "Gif")</li>
<li>@Html.ActionLink("Png", "Png")</li>
<li>@Html.ActionLink("Png8", "Png8")</li>
<li>@Html.ActionLink("Bmp", "Bmp")</li>
<li>@Html.ActionLink("Tiff", "Tiff")</li>
<li>@Html.ActionLink("External", "External")</li>
</ul>
</nav>
<section>
@RenderBody()
</section>
</div>
</body>
</html>

2
src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/security.config
View File

@ -3,6 +3,6 @@
<whiteList>
<add url="http://images.mymovies.net"/>
<add url="http://www.theworldeffect.com" />
<add url="http://maps.googleapis.com" extensionLess="true" imageFormat="png"/>
<add url="http://maps.googleapis.com" extensionLess="true" imageFormat=".png"/>
</whiteList>
</security>

1
src/TestWebsites/NET45/Test_Website_NET45/gifts/cmyk.png.REMOVED.git-id
View File

@ -0,0 +1 @@
db4d55a332254cd6b41336c06f207682bf5a966f
Write Preview
Loading…
Cancel
Save