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

Added support for getting ext image info during data transfer event.

Browse Source
This commit is contained in:
soukoku
2014-10-31 18:20:13 -04:00
parent 57d7dbe0ef
commit e19c2ad490
12 changed files with 182 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
NTwain/Internals/TransferLogic.cs
View File

@@ -137,7 +137,7 @@ namespace NTwain.Internals
lockedPtr = PlatformInfo.Current.MemoryManager.Lock(dataPtr);
}
session.SafeSyncableRaiseEvent(new DataTransferredEventArgs(lockedPtr, null));
session.SafeSyncableRaiseEvent(new DataTransferredEventArgs(session.CurrentSource, lockedPtr, null));
}
else
{
@@ -177,7 +177,7 @@ namespace NTwain.Internals
var xrc = session.DGAudio.AudioFileXfer.Get();
if (xrc == ReturnCode.XferDone)
{
session.SafeSyncableRaiseEvent(new DataTransferredEventArgs(filePath, null));
session.SafeSyncableRaiseEvent(new DataTransferredEventArgs(session.CurrentSource, filePath, null));
}
else
{
@@ -420,32 +420,24 @@ namespace NTwain.Internals
{
DataTransferredEventArgs args = null;
TWImageInfo imgInfo;
//TWExtImageInfo extInfo = null;
//if (session.CurrentSource.SupportedCaps.Contains(CapabilityId.ICapExtImageInfo))
//{
// if (session.DGImage.ExtImageInfo.Get(out extInfo) != ReturnCode.Success)
// {
// extInfo = null;
// }
//}
if (session.DGImage.ImageInfo.Get(out imgInfo) != ReturnCode.Success)
{
imgInfo = null;
}
if (dataPtr != IntPtr.Zero)
{
args = new DataTransferredEventArgs(dataPtr, imgInfo);
args = new DataTransferredEventArgs(session.CurrentSource, dataPtr, imgInfo);
}
else if (dataArray != null)
{
args = new DataTransferredEventArgs(dataArray, imgInfo);
args = new DataTransferredEventArgs(session.CurrentSource, dataArray, imgInfo);
}
else
{
args = new DataTransferredEventArgs(filePath, imgInfo);
args = new DataTransferredEventArgs(session.CurrentSource, filePath, imgInfo);
}
session.SafeSyncableRaiseEvent(args);
//if (extInfo != null) { extInfo.Dispose(); }
}
#endregion