wismna/modernkeepass
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePass.git synced 2025-10-04 08:00:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

WIP Lib 2.37 - databases created by ModernKeepass work fine, but no interoperability...

Browse Source
This commit is contained in:
Geoffroy Bonneville
2017-10-23 18:48:46 +02:00
committed by BONNEVILLE Geoffroy
parent 2bbd931b1a
commit 5b31d3ff72
30 changed files with 250 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ModernKeePassLib/Utility/GfxUtil.PCL.cs Normal file
View File

@@ -0,0 +1,22 @@
using System.IO;
using System.Threading.Tasks;
using Splat;
namespace ModernKeePassLib.Utility
{
public class GfxUtil
{
public static async Task<IBitmap> LoadImage(byte[] pb)
{
return await ScaleImage(pb, null, null);
}
public static async Task<IBitmap> ScaleImage(byte[] pb, int? w, int? h)
{
using (var ms = new MemoryStream(pb, false))
{
return await BitmapLoader.Current.Load(ms, w, h);
}
}
}
}

34
ModernKeePassLib/Utility/GfxUtil.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2014 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2017 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,16 +19,15 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Diagnostics;
using System.IO;
#if ModernKeePassLib
using Splat;
#else
using System.Text;
#if !KeePassUAP
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
#endif
using System.Diagnostics;
using System.Threading.Tasks;
namespace ModernKeePassLib.Utility
{
@@ -68,19 +67,6 @@ namespace ModernKeePassLib.Utility
try { return Image.FromStream(ms); }
finally { ms.Close(); }
}
#elif ModernKeePassLib
public static async Task<IBitmap> LoadImage(byte[] pb)
{
return await ScaleImage(pb, null, null);
}
public static async Task<IBitmap> ScaleImage(byte[] pb, int? w, int? h)
{
using (var ms = new MemoryStream(pb, false))
{
return await BitmapLoader.Current.Load(ms, w, h);
}
}
#else
public static Image LoadImage(byte[] pb)
{
@@ -437,9 +423,8 @@ namespace ModernKeePassLib.Utility
#endif // DEBUG
#endif // !KeePassLibSD
#endif // KeePassUAP
#if ModernKeePassLib
#else
internal static string ImageToDataUri(Image img)
internal static string ImageToDataUri(Image img)
{
if(img == null) { Debug.Assert(false); return string.Empty; }
@@ -452,6 +437,5 @@ namespace ModernKeePassLib.Utility
return StrUtil.DataToDataUri(pb, "image/png");
}
#endif
}
}
}