github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-24 07:06:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use WrapMemory for Bitmap too

Browse source
This commit is contained in:
Julien Richard 2022-01-25 20:54:03 +01:00
commit 2bc74554ea
2 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/Greenshot.Editor/Drawing/EmojiRenderer.cs
View file

@ -1,5 +1,6 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Windows.Media; using System.Windows.Media;
@ -13,6 +14,7 @@ using Font = SixLabors.Fonts.Font;
using FontFamily = SixLabors.Fonts.FontFamily; using FontFamily = SixLabors.Fonts.FontFamily;
using FontStyle = SixLabors.Fonts.FontStyle; using FontStyle = SixLabors.Fonts.FontStyle;
using Image = System.Drawing.Image; using Image = System.Drawing.Image;
using PixelFormat = System.Drawing.Imaging.PixelFormat;
using TextOptions = SixLabors.Fonts.TextOptions; using TextOptions = SixLabors.Fonts.TextOptions;
namespace Greenshot.Editor.Drawing namespace Greenshot.Editor.Drawing
@ -44,7 +46,8 @@ namespace Greenshot.Editor.Drawing
var textOptions = new TextOptions(font) var textOptions = new TextOptions(font)
{ {
Origin = new SixLabors.ImageSharp.PointF(font.Size / 2.0f, font.Size / 2.0f - verticalOffset), Origin = new SixLabors.ImageSharp.PointF(font.Size / 2.0f, font.Size / 2.0f - verticalOffset),
HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Center
}; };
image.Mutate(x => x.DrawText(textOptions, emoji, SixLabors.ImageSharp.Color.Black)); image.Mutate(x => x.DrawText(textOptions, emoji, SixLabors.ImageSharp.Color.Black));
@ -52,8 +55,23 @@ namespace Greenshot.Editor.Drawing
public static Image GetBitmap(string emoji, int iconSize) public static Image GetBitmap(string emoji, int iconSize)
{ {
using var image = GetImage(emoji, iconSize); int width = iconSize;
return image.ToBitmap(); int height = iconSize;
var font = _fontFamily.Value.CreateFont(iconSize, FontStyle.Regular);
var bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
BitmapData bitmapData = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, width, height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
unsafe
{
var image = SixLabors.ImageSharp.Image.WrapMemory<Bgra32>((void*)bitmapData.Scan0, width: width, height: height);
RenderEmoji(emoji, font, image);
}
bitmap.UnlockBits(bitmapData);
return bitmap;
} }
public static BitmapSource GetBitmapSource(string emoji, int iconSize) public static BitmapSource GetBitmapSource(string emoji, int iconSize)
@ -74,16 +92,5 @@ namespace Greenshot.Editor.Drawing
return source; return source;
} }
public static Bitmap ToBitmap(this Image<Rgba32> image)
{
using var memoryStream = new MemoryStream();
image.SaveAsPng(memoryStream);
memoryStream.Seek(0, SeekOrigin.Begin);
return new Bitmap(memoryStream);
}
} }
} }

3
src/Greenshot.Editor/Greenshot.Editor.csproj
View file

@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<None Include="Languages\language*.xml"> <None Include="Languages\language*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>