Skip to content

Commit

Permalink
v1.7.0.3
Browse files Browse the repository at this point in the history
ImageFactory now respects colour profiles.
  • Loading branch information
JimBobSquarePants committed Sep 5, 2013
1 parent c1aa43d commit d82bdf2
Show file tree
Hide file tree
Showing 78 changed files with 87,542 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/ImageProcessor/ImageFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public class ImageFactory : IDisposable
public ImageFactory Load(MemoryStream memoryStream)
{
// Set our image as the memory stream value.
this.Image = Image.FromStream(memoryStream);
this.Image = Image.FromStream(memoryStream, true);

// Store the stream in the image Tag property so we can dispose of it later.
this.Image.Tag = memoryStream;
Expand Down Expand Up @@ -175,7 +175,7 @@ public ImageFactory Load(string imagePath)
fileStream.Position = memoryStream.Position = 0;

// Set our image as the memory stream value.
this.Image = Image.FromStream(memoryStream);
this.Image = Image.FromStream(memoryStream, true);

// Store the stream in the image Tag property so we can dispose of it later.
this.Image.Tag = memoryStream;
Expand Down Expand Up @@ -223,7 +223,7 @@ public ImageFactory Reset()
MemoryStream memoryStream = (MemoryStream)this.Image.Tag;

// Set our new image as the memory stream value.
Image newImage = Image.FromStream(memoryStream);
Image newImage = Image.FromStream(memoryStream, true);

// Store the stream in the image Tag property so we can dispose of it later.
newImage.Tag = memoryStream;
Expand Down
4 changes: 2 additions & 2 deletions src/ImageProcessor/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.7.0.2")]
[assembly: AssemblyFileVersion("1.7.0.2")]
[assembly: AssemblyVersion("1.7.0.3")]
[assembly: AssemblyFileVersion("1.7.0.3")]

Binary file added src/Nuget/ImageProcessor.1.7.0.3.nupkg
Binary file not shown.
Binary file added src/TestWebsites/NET4/Images/cmyk.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TestWebsites/NET4/Images/cmyk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TestWebsites/NET4/Images/srgb.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TestWebsites/NET4/Images/srgb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/TestWebsites/NET4/Test_Website.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@
<Content Include="Global.asax" />
<Content Include="Images\1182076_e8c402e938_z.jpg" />
<Content Include="Images\Chrysanthemum.jpg" />
<Content Include="Images\cmyk.jpg" />
<Content Include="Images\cmyk.png" />
<Content Include="Images\color-vision-test.gif" />
<Content Include="Images\Desert.jpg" />
<Content Include="Images\fid11246.jpg" />
Expand All @@ -108,6 +110,8 @@
<Content Include="Images\Penguins.jpg" />
<Content Include="Images\Penguins.png" />
<Content Include="Images\Penguins.tif" />
<Content Include="Images\srgb.jpg" />
<Content Include="Images\srgb.png" />
<Content Include="Images\Tulips.jpg" />
<Content Include="Images\udendørs.jpg" />
<Content Include="Images\war_horse_quad.jpg" />
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@
<Content Include="Global.asax" />
<Content Include="Images\1182076_e8c402e938_z.jpg" />
<Content Include="Images\Chrysanthemum.jpg" />
<Content Include="Images\cmyk.jpg" />
<Content Include="Images\cmyk.png" />
<Content Include="Images\color-vision-test.gif" />
<Content Include="Images\Desert.jpg" />
<Content Include="Images\fid11246.jpg" />
Expand All @@ -142,6 +144,8 @@
<Content Include="Images\Penguins.jpg" />
<Content Include="Images\Penguins.png" />
<Content Include="Images\Penguins.tif" />
<Content Include="Images\srgb.jpg" />
<Content Include="Images\srgb.png" />
<Content Include="Images\Tulips.jpg" />
<Content Include="Images\udendørs.jpg" />
<Content Include="Images\war_horse_quad.jpg" />
Expand Down
29 changes: 29 additions & 0 deletions src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -596,3 +596,32 @@
</div>
</section>
</article>
<article>
<h1>Color Profiles</h1>
<section>
<div class="row">
<div class="column-6">
<h2>CMYK original jpg</h2>
<img src="/images/cmyk.jpg?" width="400" />
</div>
<div class="column-6">
<h2>sRGB original jpg</h2>
<img src="/images/srgb.jpg?" width="400" />
</div>

</div>
</section>
<section>
<div class="row">
<div class="column-6">
<h2>CMYK resized jpg</h2>
<img src="/images/cmyk.jpg?width=400" />
</div>

<div class="column-6">
<h2>sRGB resized jpg</h2>
<img src="/images/srgb.jpg?width=400" />
</div>
</div>
</section>
</article>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Microsoft.AspNet.Mvc</id>
<version>4.0.20710.0</version>
<title>Microsoft ASP.NET MVC 4</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<licenseUrl>http://www.microsoft.com/web/webpi/eula/MVC_4_eula_ENU.htm</licenseUrl>
<projectUrl>http://www.asp.net/mvc</projectUrl>
<iconUrl>https://download-codeplex.sec.s-msft.com/Download?ProjectName=aspnetwebstack&amp;DownloadId=360555</iconUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>This package contains the runtime assemblies for ASP.NET MVC. ASP.NET MVC gives you a powerful, patterns-based way to build dynamic websites that enables a clean separation of concerns and that gives you full control over markup.</description>
<tags>Microsoft AspNet Mvc AspNetMvc</tags>
<dependencies>
<dependency id="Microsoft.AspNet.WebPages" version="[2.0.20710.0, 2.1)" />
<dependency id="Microsoft.AspNet.Razor" version="[2.0.20710.0, 2.1)" />
</dependencies>
</metadata>
</package>
Binary file not shown.
Loading

0 comments on commit d82bdf2

Please sign in to comment.