Browse Source

Merge remote-tracking branch 'origin/dev'

Former-commit-id: 86f92d49129f2d58dbef141e556a9380281964e0
af/merge-core
James South 12 years ago
parent
commit
30bb5d6022
  1. 2
      build/Build.bat
  2. 15
      src/ImageProcessor.Web/NET45/Caching/DiskCache.cs
  3. 4
      src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs

2
build/Build.bat

@ -1,6 +1,6 @@
@ECHO OFF
SET version=1.9.3.0
SET webversion=3.2.7.0
SET webversion=3.2.8.0
SET webconfigversion=1.1.2.0
ECHO Building ImageProcessor %version%, ImageProcess.Web %webversion% and ImageProcess.Web.Config %webconfigversion%

15
src/ImageProcessor.Web/NET45/Caching/DiskCache.cs

@ -14,9 +14,9 @@ namespace ImageProcessor.Web.Caching
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Security.Cryptography;
using System.Threading.Tasks;
using System.Web;
using System.Web.Hosting;
@ -286,14 +286,11 @@ namespace ImageProcessor.Web.Caching
{
// Pull the latest info.
imageFileInfo.Refresh();
using (MD5 md5 = MD5.Create())
{
using (FileStream stream = File.OpenRead(imageFileInfo.FullName))
{
byte[] hash = md5.ComputeHash(stream);
streamHash = BitConverter.ToString(hash);
}
}
// Checking the stream itself is far too processor intensive so we make a best guess.
string creation = imageFileInfo.CreationTimeUtc.ToString(CultureInfo.InvariantCulture);
string length = imageFileInfo.Length.ToString(CultureInfo.InvariantCulture);
streamHash = string.Format("{0}{1}", creation, length);
}
}
}

4
src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs

@ -35,5 +35,5 @@ using ImageProcessor.Web.HttpModules;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("3.2.7.0")]
[assembly: AssemblyFileVersion("3.2.7.0")]
[assembly: AssemblyVersion("3.2.8.0")]
[assembly: AssemblyFileVersion("3.2.8.0")]
Loading…
Cancel
Save