|
@@ -129,21 +129,27 @@ namespace MediaBrowser.Server.Implementations.UserViews
|
|
|
wandList.CurrentImage.TrimImage(1);
|
|
|
using (var mwr = wandList.CloneMagickWand())
|
|
|
{
|
|
|
- mwr.CurrentImage.ResizeImage(wandList.CurrentImage.Width, (wandList.CurrentImage.Height / 2), FilterTypes.LanczosFilter, 1);
|
|
|
- mwr.CurrentImage.FlipImage();
|
|
|
-
|
|
|
- mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel;
|
|
|
- mwr.CurrentImage.ColorizeImage(ColorName.Black, ColorName.Grey70);
|
|
|
-
|
|
|
- using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans))
|
|
|
+ using (var blackPixelWand = new PixelWand(ColorName.Black))
|
|
|
{
|
|
|
- mwg.OpenImage("gradient:black-none");
|
|
|
- var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111);
|
|
|
- mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.DstInCompositeOp, 0, verticalSpacing);
|
|
|
-
|
|
|
- wandList.AddImage(mwr);
|
|
|
- int ex = (int)(wand.CurrentImage.Width - mwg.CurrentImage.Width) / 2;
|
|
|
- wand.CurrentImage.CompositeImage(wandList.AppendImages(true), CompositeOperator.AtopCompositeOp, ex, Convert.ToInt32(height * 0.26851851851851851851851851851852));
|
|
|
+ using (var greyPixelWand = new PixelWand(ColorName.Grey70))
|
|
|
+ {
|
|
|
+ mwr.CurrentImage.ResizeImage(wandList.CurrentImage.Width, (wandList.CurrentImage.Height / 2), FilterTypes.LanczosFilter, 1);
|
|
|
+ mwr.CurrentImage.FlipImage();
|
|
|
+
|
|
|
+ mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel;
|
|
|
+ mwr.CurrentImage.ColorizeImage(blackPixelWand, greyPixelWand);
|
|
|
+
|
|
|
+ using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans))
|
|
|
+ {
|
|
|
+ mwg.OpenImage("gradient:black-none");
|
|
|
+ var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111);
|
|
|
+ mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.DstInCompositeOp, 0, verticalSpacing);
|
|
|
+
|
|
|
+ wandList.AddImage(mwr);
|
|
|
+ int ex = (int)(wand.CurrentImage.Width - mwg.CurrentImage.Width) / 2;
|
|
|
+ wand.CurrentImage.CompositeImage(wandList.AppendImages(true), CompositeOperator.AtopCompositeOp, ex, Convert.ToInt32(height * 0.26851851851851851851851851851852));
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -169,14 +175,17 @@ namespace MediaBrowser.Server.Implementations.UserViews
|
|
|
|
|
|
foreach (var element in wandImages.ImageList)
|
|
|
{
|
|
|
- int iWidth = (int)Math.Abs(iHeight * element.Width / element.Height);
|
|
|
- element.Gravity = GravityType.CenterGravity;
|
|
|
- element.BackgroundColor = ColorName.Black;
|
|
|
- element.ResizeImage(iWidth, iHeight, FilterTypes.LanczosFilter);
|
|
|
- int ix = (int)Math.Abs((iWidth - iSlice) / 2);
|
|
|
- element.CropImage(iSlice, iHeight, ix, 0);
|
|
|
-
|
|
|
- element.ExtentImage(iSlice, iHeight, 0 - horizontalImagePadding, 0);
|
|
|
+ using (var blackPixelWand = new PixelWand(ColorName.Black))
|
|
|
+ {
|
|
|
+ int iWidth = (int)Math.Abs(iHeight * element.Width / element.Height);
|
|
|
+ element.Gravity = GravityType.CenterGravity;
|
|
|
+ element.BackgroundColor = blackPixelWand;
|
|
|
+ element.ResizeImage(iWidth, iHeight, FilterTypes.LanczosFilter);
|
|
|
+ int ix = (int)Math.Abs((iWidth - iSlice) / 2);
|
|
|
+ element.CropImage(iSlice, iHeight, ix, 0);
|
|
|
+
|
|
|
+ element.ExtentImage(iSlice, iHeight, 0 - horizontalImagePadding, 0);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
wandImages.SetFirstIterator();
|
|
@@ -185,21 +194,27 @@ namespace MediaBrowser.Server.Implementations.UserViews
|
|
|
wandList.CurrentImage.TrimImage(1);
|
|
|
using (var mwr = wandList.CloneMagickWand())
|
|
|
{
|
|
|
- mwr.CurrentImage.ResizeImage(wandList.CurrentImage.Width, (wandList.CurrentImage.Height / 2), FilterTypes.LanczosFilter, 1);
|
|
|
- mwr.CurrentImage.FlipImage();
|
|
|
-
|
|
|
- mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel;
|
|
|
- mwr.CurrentImage.ColorizeImage(ColorName.Black, ColorName.Grey70);
|
|
|
-
|
|
|
- using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans))
|
|
|
+ using (var blackPixelWand = new PixelWand(ColorName.Black))
|
|
|
{
|
|
|
- mwg.OpenImage("gradient:black-none");
|
|
|
- var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111);
|
|
|
- mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.CopyOpacityCompositeOp, 0, verticalSpacing);
|
|
|
-
|
|
|
- wandList.AddImage(mwr);
|
|
|
- int ex = (int)(wand.CurrentImage.Width - mwg.CurrentImage.Width) / 2;
|
|
|
- wand.CurrentImage.CompositeImage(wandList.AppendImages(true), CompositeOperator.AtopCompositeOp, ex, Convert.ToInt32(height * .05));
|
|
|
+ using (var greyPixelWand = new PixelWand(ColorName.Grey70))
|
|
|
+ {
|
|
|
+ mwr.CurrentImage.ResizeImage(wandList.CurrentImage.Width, (wandList.CurrentImage.Height / 2), FilterTypes.LanczosFilter, 1);
|
|
|
+ mwr.CurrentImage.FlipImage();
|
|
|
+
|
|
|
+ mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel;
|
|
|
+ mwr.CurrentImage.ColorizeImage(blackPixelWand, greyPixelWand);
|
|
|
+
|
|
|
+ using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans))
|
|
|
+ {
|
|
|
+ mwg.OpenImage("gradient:black-none");
|
|
|
+ var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111);
|
|
|
+ mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.CopyOpacityCompositeOp, 0, verticalSpacing);
|
|
|
+
|
|
|
+ wandList.AddImage(mwr);
|
|
|
+ int ex = (int)(wand.CurrentImage.Width - mwg.CurrentImage.Width) / 2;
|
|
|
+ wand.CurrentImage.CompositeImage(wandList.AppendImages(true), CompositeOperator.AtopCompositeOp, ex, Convert.ToInt32(height * .05));
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -254,21 +269,27 @@ namespace MediaBrowser.Server.Implementations.UserViews
|
|
|
wandList.CurrentImage.TrimImage(1);
|
|
|
using (var mwr = wandList.CloneMagickWand())
|
|
|
{
|
|
|
- mwr.CurrentImage.ResizeImage(wandList.CurrentImage.Width, (wandList.CurrentImage.Height / 2), FilterTypes.LanczosFilter, 1);
|
|
|
- mwr.CurrentImage.FlipImage();
|
|
|
-
|
|
|
- mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel;
|
|
|
- mwr.CurrentImage.ColorizeImage(ColorName.Black, ColorName.Grey60);
|
|
|
-
|
|
|
- using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans))
|
|
|
+ using (var blackPixelWand = new PixelWand(ColorName.Black))
|
|
|
{
|
|
|
- mwg.OpenImage("gradient:black-none");
|
|
|
- var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111);
|
|
|
- mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.DstInCompositeOp, 0, verticalSpacing);
|
|
|
-
|
|
|
- wandList.AddImage(mwr);
|
|
|
- int ex = (int)(wand.CurrentImage.Width - mwg.CurrentImage.Width) / 2;
|
|
|
- wand.CurrentImage.CompositeImage(wandList.AppendImages(true), CompositeOperator.AtopCompositeOp, ex, Convert.ToInt32(height * 0.26851851851851851851851851851852));
|
|
|
+ using (var greyPixelWand = new PixelWand(ColorName.Grey70))
|
|
|
+ {
|
|
|
+ mwr.CurrentImage.ResizeImage(wandList.CurrentImage.Width, (wandList.CurrentImage.Height / 2), FilterTypes.LanczosFilter, 1);
|
|
|
+ mwr.CurrentImage.FlipImage();
|
|
|
+
|
|
|
+ mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel;
|
|
|
+ mwr.CurrentImage.ColorizeImage(blackPixelWand, greyPixelWand);
|
|
|
+
|
|
|
+ using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans))
|
|
|
+ {
|
|
|
+ mwg.OpenImage("gradient:black-none");
|
|
|
+ var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111);
|
|
|
+ mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.DstInCompositeOp, 0, verticalSpacing);
|
|
|
+
|
|
|
+ wandList.AddImage(mwr);
|
|
|
+ int ex = (int)(wand.CurrentImage.Width - mwg.CurrentImage.Width) / 2;
|
|
|
+ wand.CurrentImage.CompositeImage(wandList.AppendImages(true), CompositeOperator.AtopCompositeOp, ex, Convert.ToInt32(height * 0.26851851851851851851851851851852));
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -294,14 +315,17 @@ namespace MediaBrowser.Server.Implementations.UserViews
|
|
|
|
|
|
foreach (var element in wandImages.ImageList)
|
|
|
{
|
|
|
- int iWidth = (int)Math.Abs(iHeight * element.Width / element.Height);
|
|
|
- element.Gravity = GravityType.CenterGravity;
|
|
|
- element.BackgroundColor = ColorName.Black;
|
|
|
- element.ResizeImage(iWidth, iHeight, FilterTypes.LanczosFilter);
|
|
|
- int ix = (int)Math.Abs((iWidth - iSlice) / 2);
|
|
|
- element.CropImage(iSlice, iHeight, ix, 0);
|
|
|
-
|
|
|
- element.ExtentImage(iSlice, iHeight, 0 - horizontalImagePadding, 0);
|
|
|
+ using (var blackPixelWand = new PixelWand(ColorName.Black))
|
|
|
+ {
|
|
|
+ int iWidth = (int)Math.Abs(iHeight * element.Width / element.Height);
|
|
|
+ element.Gravity = GravityType.CenterGravity;
|
|
|
+ element.BackgroundColor = blackPixelWand;
|
|
|
+ element.ResizeImage(iWidth, iHeight, FilterTypes.LanczosFilter);
|
|
|
+ int ix = (int)Math.Abs((iWidth - iSlice) / 2);
|
|
|
+ element.CropImage(iSlice, iHeight, ix, 0);
|
|
|
+
|
|
|
+ element.ExtentImage(iSlice, iHeight, 0 - horizontalImagePadding, 0);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
wandImages.SetFirstIterator();
|
|
@@ -310,21 +334,27 @@ namespace MediaBrowser.Server.Implementations.UserViews
|
|
|
wandList.CurrentImage.TrimImage(1);
|
|
|
using (var mwr = wandList.CloneMagickWand())
|
|
|
{
|
|
|
- mwr.CurrentImage.ResizeImage(wandList.CurrentImage.Width, (wandList.CurrentImage.Height / 2), FilterTypes.LanczosFilter, 1);
|
|
|
- mwr.CurrentImage.FlipImage();
|
|
|
-
|
|
|
- mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel;
|
|
|
- mwr.CurrentImage.ColorizeImage(ColorName.Black, ColorName.Grey60);
|
|
|
-
|
|
|
- using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans))
|
|
|
+ using (var blackPixelWand = new PixelWand(ColorName.Black))
|
|
|
{
|
|
|
- mwg.OpenImage("gradient:black-none");
|
|
|
- var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111);
|
|
|
- mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.CopyOpacityCompositeOp, 0, verticalSpacing);
|
|
|
-
|
|
|
- wandList.AddImage(mwr);
|
|
|
- int ex = (int)(wand.CurrentImage.Width - mwg.CurrentImage.Width) / 2;
|
|
|
- wand.CurrentImage.CompositeImage(wandList.AppendImages(true), CompositeOperator.AtopCompositeOp, ex, Convert.ToInt32(height * .085));
|
|
|
+ using (var greyPixelWand = new PixelWand(ColorName.Grey70))
|
|
|
+ {
|
|
|
+ mwr.CurrentImage.ResizeImage(wandList.CurrentImage.Width, (wandList.CurrentImage.Height / 2), FilterTypes.LanczosFilter, 1);
|
|
|
+ mwr.CurrentImage.FlipImage();
|
|
|
+
|
|
|
+ mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel;
|
|
|
+ mwr.CurrentImage.ColorizeImage(blackPixelWand, greyPixelWand);
|
|
|
+
|
|
|
+ using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans))
|
|
|
+ {
|
|
|
+ mwg.OpenImage("gradient:black-none");
|
|
|
+ var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111);
|
|
|
+ mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.CopyOpacityCompositeOp, 0, verticalSpacing);
|
|
|
+
|
|
|
+ wandList.AddImage(mwr);
|
|
|
+ int ex = (int)(wand.CurrentImage.Width - mwg.CurrentImage.Width) / 2;
|
|
|
+ wand.CurrentImage.CompositeImage(wandList.AppendImages(true), CompositeOperator.AtopCompositeOp, ex, Convert.ToInt32(height * .085));
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -350,14 +380,17 @@ namespace MediaBrowser.Server.Implementations.UserViews
|
|
|
|
|
|
foreach (var element in wandImages.ImageList)
|
|
|
{
|
|
|
- int iWidth = (int)Math.Abs(iHeight * element.Width / element.Height);
|
|
|
- element.Gravity = GravityType.CenterGravity;
|
|
|
- element.BackgroundColor = ColorName.Black;
|
|
|
- element.ResizeImage(iWidth, iHeight, FilterTypes.LanczosFilter);
|
|
|
- int ix = (int)Math.Abs((iWidth - iSlice) / 2);
|
|
|
- element.CropImage(iSlice, iHeight, ix, 0);
|
|
|
-
|
|
|
- element.ExtentImage(iSlice, iHeight, 0 - horizontalImagePadding, 0);
|
|
|
+ using (var blackPixelWand = new PixelWand(ColorName.Black))
|
|
|
+ {
|
|
|
+ int iWidth = (int)Math.Abs(iHeight * element.Width / element.Height);
|
|
|
+ element.Gravity = GravityType.CenterGravity;
|
|
|
+ element.BackgroundColor = blackPixelWand;
|
|
|
+ element.ResizeImage(iWidth, iHeight, FilterTypes.LanczosFilter);
|
|
|
+ int ix = (int)Math.Abs((iWidth - iSlice) / 2);
|
|
|
+ element.CropImage(iSlice, iHeight, ix, 0);
|
|
|
+
|
|
|
+ element.ExtentImage(iSlice, iHeight, 0 - horizontalImagePadding, 0);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
wandImages.SetFirstIterator();
|
|
@@ -366,21 +399,27 @@ namespace MediaBrowser.Server.Implementations.UserViews
|
|
|
wandList.CurrentImage.TrimImage(1);
|
|
|
using (var mwr = wandList.CloneMagickWand())
|
|
|
{
|
|
|
- mwr.CurrentImage.ResizeImage(wandList.CurrentImage.Width, (wandList.CurrentImage.Height / 2), FilterTypes.LanczosFilter, 1);
|
|
|
- mwr.CurrentImage.FlipImage();
|
|
|
-
|
|
|
- mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel;
|
|
|
- mwr.CurrentImage.ColorizeImage(ColorName.Black, ColorName.Grey70);
|
|
|
-
|
|
|
- using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans))
|
|
|
+ using (var blackPixelWand = new PixelWand(ColorName.Black))
|
|
|
{
|
|
|
- mwg.OpenImage("gradient:black-none");
|
|
|
- var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111);
|
|
|
- mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.CopyOpacityCompositeOp, 0, verticalSpacing);
|
|
|
-
|
|
|
- wandList.AddImage(mwr);
|
|
|
- int ex = (int)(wand.CurrentImage.Width - mwg.CurrentImage.Width) / 2;
|
|
|
- wand.CurrentImage.CompositeImage(wandList.AppendImages(true), CompositeOperator.AtopCompositeOp, ex, Convert.ToInt32(height * .07));
|
|
|
+ using (var greyPixelWand = new PixelWand(ColorName.Grey70))
|
|
|
+ {
|
|
|
+ mwr.CurrentImage.ResizeImage(wandList.CurrentImage.Width, (wandList.CurrentImage.Height / 2), FilterTypes.LanczosFilter, 1);
|
|
|
+ mwr.CurrentImage.FlipImage();
|
|
|
+
|
|
|
+ mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel;
|
|
|
+ mwr.CurrentImage.ColorizeImage(blackPixelWand, greyPixelWand);
|
|
|
+
|
|
|
+ using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans))
|
|
|
+ {
|
|
|
+ mwg.OpenImage("gradient:black-none");
|
|
|
+ var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111);
|
|
|
+ mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.CopyOpacityCompositeOp, 0, verticalSpacing);
|
|
|
+
|
|
|
+ wandList.AddImage(mwr);
|
|
|
+ int ex = (int)(wand.CurrentImage.Width - mwg.CurrentImage.Width) / 2;
|
|
|
+ wand.CurrentImage.CompositeImage(wandList.AppendImages(true), CompositeOperator.AtopCompositeOp, ex, Convert.ToInt32(height * .07));
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -435,21 +474,27 @@ namespace MediaBrowser.Server.Implementations.UserViews
|
|
|
wandList.CurrentImage.TrimImage(1);
|
|
|
using (var mwr = wandList.CloneMagickWand())
|
|
|
{
|
|
|
- mwr.CurrentImage.ResizeImage(wandList.CurrentImage.Width, (wandList.CurrentImage.Height / 2), FilterTypes.LanczosFilter, 1);
|
|
|
- mwr.CurrentImage.FlipImage();
|
|
|
-
|
|
|
- mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel;
|
|
|
- mwr.CurrentImage.ColorizeImage(ColorName.Black, ColorName.Grey60);
|
|
|
-
|
|
|
- using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans))
|
|
|
+ using (var blackPixelWand = new PixelWand(ColorName.Black))
|
|
|
{
|
|
|
- mwg.OpenImage("gradient:black-none");
|
|
|
- var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111);
|
|
|
- mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.DstInCompositeOp, 0, verticalSpacing);
|
|
|
-
|
|
|
- wandList.AddImage(mwr);
|
|
|
- int ex = (int)(wand.CurrentImage.Width - mwg.CurrentImage.Width) / 2;
|
|
|
- wand.CurrentImage.CompositeImage(wandList.AppendImages(true), CompositeOperator.AtopCompositeOp, ex, Convert.ToInt32(height * 0.26851851851851851851851851851852));
|
|
|
+ using (var greyPixelWand = new PixelWand(ColorName.Grey70))
|
|
|
+ {
|
|
|
+ mwr.CurrentImage.ResizeImage(wandList.CurrentImage.Width, (wandList.CurrentImage.Height / 2), FilterTypes.LanczosFilter, 1);
|
|
|
+ mwr.CurrentImage.FlipImage();
|
|
|
+
|
|
|
+ mwr.CurrentImage.AlphaChannel = AlphaChannelType.DeactivateAlphaChannel;
|
|
|
+ mwr.CurrentImage.ColorizeImage(blackPixelWand, greyPixelWand);
|
|
|
+
|
|
|
+ using (var mwg = new MagickWand(wandList.CurrentImage.Width, iTrans))
|
|
|
+ {
|
|
|
+ mwg.OpenImage("gradient:black-none");
|
|
|
+ var verticalSpacing = Convert.ToInt32(height * 0.01111111111111111111111111111111);
|
|
|
+ mwr.CurrentImage.CompositeImage(mwg, CompositeOperator.DstInCompositeOp, 0, verticalSpacing);
|
|
|
+
|
|
|
+ wandList.AddImage(mwr);
|
|
|
+ int ex = (int)(wand.CurrentImage.Width - mwg.CurrentImage.Width) / 2;
|
|
|
+ wand.CurrentImage.CompositeImage(wandList.AppendImages(true), CompositeOperator.AtopCompositeOp, ex, Convert.ToInt32(height * 0.26851851851851851851851851851852));
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|