yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with 6.0.4

Browse Source
This commit is contained in:
Shannon Deminick
2013-04-23 21:52:07 -10:00
parent f8652d98fe 4bfb8569c8
commit 710c8aa6ea
45 changed files with 1913 additions and 1333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/umbraco.editorControls/imagecropper/ImageManipulation.cs
View File

@@ -19,7 +19,7 @@ namespace umbraco.editorControls.imagecropper
byte[] buffer = null;
using(FileStream fs = new FileStream(sourceFile, FileMode.Open, FileAccess.Read))
using (FileStream fs = new FileStream(sourceFile, FileMode.Open, FileAccess.Read))
{
buffer = new byte[fs.Length];
fs.Read(buffer, 0, (int)fs.Length);
@@ -31,9 +31,9 @@ namespace umbraco.editorControls.imagecropper
DirectoryInfo di = new DirectoryInfo(path);
if (!di.Exists) di.Create();
using(Image croppedImage = CropImage(image, new Rectangle(cropX, cropY, cropWidth, cropHeight)))
using (Image croppedImage = CropImage(image, new Rectangle(cropX, cropY, cropWidth, cropHeight)))
{
using(Image resizedImage = ResizeImage(croppedImage, new Size(sizeWidth, sizeHeight)))
using (Image resizedImage = ResizeImage(croppedImage, new Size(sizeWidth, sizeHeight)))
{
using (Bitmap b = new Bitmap(resizedImage))
{
@@ -76,11 +76,11 @@ namespace umbraco.editorControls.imagecropper
{
var bmpImage = new Bitmap(img);
if (cropArea.Right > img.Width)
cropArea.Width -= (cropArea.Right - img.Width);
if (cropArea.Right > img.Width)
cropArea.Width -= (cropArea.Right - img.Width);
if (cropArea.Bottom > img.Height)
cropArea.Height -= (cropArea.Bottom - img.Height);
if (cropArea.Bottom > img.Height)
cropArea.Height -= (cropArea.Bottom - img.Height);
var bmpCrop = bmpImage.Clone(cropArea, bmpImage.PixelFormat);
return bmpCrop;
@@ -104,7 +104,7 @@ namespace umbraco.editorControls.imagecropper
g.SmoothingMode = SmoothingMode.HighQuality;
g.DrawImage(imgToResize, new Rectangle(0, 0, destWidth, destHeight), 0, 0, imgToResize.Width,
imgToResize.Height, GraphicsUnit.Pixel, ia);
ia.Dispose();
g.Dispose();