Aggiornate librerie, non funziona

This commit is contained in:
Maddo 2017-06-18 16:23:12 +02:00
commit da6b7abf8b
5 changed files with 39 additions and 17 deletions

View file

@ -8,8 +8,8 @@ using System.Numerics;
using System.Text;
using System.Threading.Tasks;
using ImageSharp;
using ImageSharp.PixelFormats;
using SixLabors.Fonts;
using Color = ImageSharp.Color;
using Font = SixLabors.Fonts.Font;
using FontFamily = SixLabors.Fonts.FontFamily;
using FontStyle = SixLabors.Fonts.FontStyle;
@ -27,7 +27,7 @@ namespace CatalogLib
using (Image image = Image.Load(workFile.FullName)/* new Image(workFile.FullName)*/)
using (Image<Rgba32> image = Image.Load(workFile.FullName)/* new Image(workFile.FullName)*/)
{
if (PicSettings.Instance.UsaRotazioneAutomatica)
{
@ -102,7 +102,7 @@ namespace CatalogLib
}
private void SetExtraText(Image image)
private void SetExtraText(Image<Rgba32> image)
{
if (string.IsNullOrWhiteSpace(PicSettings.Instance.TestoApplicareOrizzontale))
{
@ -116,16 +116,18 @@ namespace CatalogLib
//var font = new Font(fff, 8f, FontStyle.Regular);
Color c = Color.FromHex(FlipRgbString(PicSettings.Instance.ColoreTestoRGB));
//Color c = Color.FromHex(FlipRgbString(PicSettings.Instance.ColoreTestoRGB));
Rgba32 g = Rgba32.FromHex(FlipRgbString(PicSettings.Instance.ColoreTestoRGB));
TextMeasurer measurer = new TextMeasurer();
var size = measurer.MeasureText(PicSettings.Instance.TestoApplicareOrizzontale, font, 72);
float scalingFactor = Math.Min(image.Width / size.Width, image.Height / size.Height);
Font scaledFont = new Font(font, scalingFactor * font.Size);
image.DrawText("aaa", scaledFont, g, new Vector2(0, 0));
//image.DrawText(PicSettings.Instance.TestoApplicareOrizzontale, font, Color.Black, )
image.DrawText(PicSettings.Instance.TestoApplicareOrizzontale, scaledFont, c, new Vector2(0, 0));
//image.DrawText(PicSettings.Instance.TestoApplicareOrizzontale, scaledFont, c, new Vector2(0, 0));
//image.DrawText("sssssssssssssssssssssssssssssssssssssssssssssss", font, Color.Black, new Vector2(200, 200));
//ahjsdfhjklasj