lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2025-10-24 10:11:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update image parse code.

Browse Source
This commit is contained in:
soukoku
2015-02-19 22:30:13 -05:00
parent eef0b9db92
commit 9ba2b0d0e0
10 changed files with 284 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Tests/Tester.WPF/ViewModels/TwainVM.cs
View File

@@ -289,22 +289,28 @@ namespace Tester.WPF
BitmapSource img = null;
if (e.NativeData != IntPtr.Zero)
{
img = e.GetNativeImage().ConvertToWpfBitmap();
using (var stream = e.GetNativeImageStream())
{
if (stream != null)
{
img = stream.ConvertToWpfBitmap(300, 0);
}
}
}
else if (!string.IsNullOrEmpty(e.FileDataPath))
{
img = new BitmapImage(new Uri(e.FileDataPath));
}
if (img != null)
{
// from http://stackoverflow.com/questions/18189501/create-thumbnail-image-directly-from-header-less-image-byte-array
var scale = MaxThumbnailSize / img.PixelWidth;
var transform = new ScaleTransform(scale, scale);
var thumbnail = new TransformedBitmap(img, transform);
img = new WriteableBitmap(new TransformedBitmap(img, transform));
img.Freeze();
}
//if (img != null)
//{
// // from http://stackoverflow.com/questions/18189501/create-thumbnail-image-directly-from-header-less-image-byte-array
// var scale = MaxThumbnailSize / img.PixelWidth;
// var transform = new ScaleTransform(scale, scale);
// var thumbnail = new TransformedBitmap(img, transform);
// img = new WriteableBitmap(new TransformedBitmap(img, transform));
// img.Freeze();
//}
return img;
}

6
Tests/Tester.Winform/TestForm.cs
View File

@@ -90,7 +90,11 @@ namespace Tester.Winform
Image img = null;
if (e.NativeData != IntPtr.Zero)
{
img = e.GetNativeImage();
var stream = e.GetNativeImageStream();
if (stream != null)
{
img = Image.FromStream(stream);
}
}
else if (!string.IsNullOrEmpty(e.FileDataPath))
{