github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug fix QRCodeHelper

pull/5865/head
2dust 2024-10-19 14:29:53 +08:00
parent 055cd62dd8
commit fe3836be14
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
v2rayN/v2rayN/Common/QRCodeHelper.cs
View File

@ -1,4 +1,5 @@
using System.Drawing; using System.Collections;
using System.Drawing;
using System.IO; using System.IO;
using System.Windows; using System.Windows;
using System.Windows.Interop; using System.Windows.Interop;
@ -7,9 +8,6 @@ using System.Windows.Media.Imaging;
namespace v2rayN namespace v2rayN
{ {
/// <summary>
/// 含有QR码的描述类和包装编码和渲染
/// </summary>
public class QRCodeHelper public class QRCodeHelper
{ {
public static ImageSource? GetQRCode(string? strContent) public static ImageSource? GetQRCode(string? strContent)
@ -62,21 +60,14 @@ namespace v2rayN
y = 96 / g.DpiY; y = 96 / g.DpiY;
} }
private static ImageSource ByteToImage(byte[] imageData) private static ImageSource? ByteToImage(IEnumerable imageData)
{ {
BitmapImage biImg = new(); return new ImageSourceConverter().ConvertFrom(imageData) as BitmapSource;
using MemoryStream ms = new(imageData);
biImg.BeginInit();
biImg.StreamSource = ms;
biImg.EndInit();
return biImg as ImageSource;
} }
private static byte[]? ImageToByte(Image img) private static byte[]? ImageToByte(Image img)
{ {
var converter = new ImageConverter(); return new ImageConverter().ConvertTo(img, typeof(byte[])) as byte[];
return converter.ConvertTo(img, typeof(byte[])) as byte[];
} }
} }
} }