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

A naive and lazy implementation of mem xfer for #1.

Browse Source
This commit is contained in:
soukoku
2014-04-11 19:25:48 -04:00
parent d3a50099a4
commit efe9b469ba
6 changed files with 74 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
NTwain/DataTransferredEventArgs.cs
View File

@@ -3,9 +3,9 @@ using System;
namespace NTwain
{
/// <summary>
/// Contains event data after whatever data from the source has been transferred.
/// </summary>
/// <summary>
/// Contains event data after whatever data from the source has been transferred.
/// </summary>
public class DataTransferredEventArgs : EventArgs
{
/// <summary>
@@ -17,16 +17,18 @@ namespace NTwain
/// <value>The data pointer.</value>
public IntPtr NativeData { get; internal set; }
/// <summary>
/// Gets the file path to the complete data if the transfer was file or memory-file.
/// </summary>
/// <value>
/// The file.
/// </value>
public string FilePath { get; internal set; }
/// <summary>
/// Gets the file path to the complete data if the transfer was file or memory-file.
/// </summary>
/// <value>
/// The file path.
/// </value>
public string FileDataPath { get; internal set; }
/// <summary>
/// Gets the memory data if the transfer was memory.
/// Gets the raw memory data if the transfer was memory.
/// Consumer application will need to do the parsing based on the values
/// from <see cref="ImageInfo"/>.
/// </summary>
/// <value>
/// The memory data.
@@ -39,6 +41,6 @@ namespace NTwain
/// <value>
/// The final image information.
/// </value>
public TWImageInfo FinalImageInfo { get; internal set; }
public TWImageInfo ImageInfo { get; internal set; }
}
}

2
NTwain/Properties/VersionInfo.cs
View File

@@ -14,6 +14,6 @@ namespace NTwain
// keep this same in majors releases
public const string Release = "0.10.0.0";
// change this for each nuget release
public const string Build = "0.10.0";
public const string Build = "0.10.1";
}
}

99
NTwain/TwainSession.cs
View File

@@ -810,7 +810,7 @@ namespace NTwain
var xrc = DGAudio.AudioFileXfer.Get();
if (xrc == ReturnCode.XferDone)
{
OnDataTransferred(new DataTransferredEventArgs { FilePath = filePath });
OnDataTransferred(new DataTransferredEventArgs { FileDataPath = filePath });
}
}
@@ -837,7 +837,7 @@ namespace NTwain
{
lockedPtr = MemoryManager.Instance.Lock(dataPtr);
}
OnDataTransferred(new DataTransferredEventArgs { NativeData = lockedPtr, FinalImageInfo = imgInfo });
OnDataTransferred(new DataTransferredEventArgs { NativeData = lockedPtr, ImageInfo = imgInfo });
}
}
finally
@@ -874,14 +874,12 @@ namespace NTwain
{
imgInfo = null;
}
OnDataTransferred(new DataTransferredEventArgs { FilePath = filePath, FinalImageInfo = imgInfo });
OnDataTransferred(new DataTransferredEventArgs { FileDataPath = filePath, ImageInfo = imgInfo });
}
}
private void DoImageMemoryXfer()
{
throw new NotImplementedException();
TWSetupMemXfer memInfo;
if (DGControl.SetupMemXfer.Get(out memInfo) == ReturnCode.Success)
{
@@ -890,7 +888,7 @@ namespace NTwain
{
// how to tell if going to xfer in strip vs tile?
// if tile don't allocate memory in app?
xferInfo.Memory = new TWMemory
{
Flags = MemoryFlags.AppOwns | MemoryFlags.Pointer,
@@ -898,54 +896,65 @@ namespace NTwain
TheMem = MemoryManager.Instance.Allocate(memInfo.Preferred)
};
var xrc = ReturnCode.Success;
do
// do the unthinkable and keep all xferred batches in memory,
// possibly defeating the purpose of mem xfer
// unless compression is used.
// todo: use array instead of memory stream?
using (MemoryStream xferredData = new MemoryStream())
{
xrc = DGImage.ImageMemFileXfer.Get(xferInfo);
if (xrc == ReturnCode.Success ||
xrc == ReturnCode.XferDone)
var xrc = ReturnCode.Success;
do
{
State = 7;
byte[] buffer = new byte[(int)xferInfo.BytesWritten];
// todo: need lock before use?
IntPtr lockPtr = IntPtr.Zero;
try
xrc = DGImage.ImageMemFileXfer.Get(xferInfo);
if (xrc == ReturnCode.Success ||
xrc == ReturnCode.XferDone)
{
lockPtr = MemoryManager.Instance.Lock(xferInfo.Memory.TheMem);
Marshal.Copy(lockPtr, buffer, 0, buffer.Length);
}
finally
{
if (lockPtr != IntPtr.Zero)
State = 7;
// optimize and allocate buffer only once instead of inside the loop?
byte[] buffer = new byte[(int)xferInfo.BytesWritten];
IntPtr lockPtr = IntPtr.Zero;
try
{
MemoryManager.Instance.Unlock(lockPtr);
lockPtr = MemoryManager.Instance.Lock(xferInfo.Memory.TheMem);
Marshal.Copy(lockPtr, buffer, 0, buffer.Length);
xferredData.Write(buffer, 0, buffer.Length);
}
finally
{
if (lockPtr != IntPtr.Zero)
{
MemoryManager.Instance.Unlock(lockPtr);
}
}
}
// now what?
} while (xrc == ReturnCode.Success);
}
} while (xrc == ReturnCode.Success);
if (xrc == ReturnCode.XferDone)
{
TWImageInfo imgInfo;
//TWExtImageInfo extInfo;
//if (SupportedCaps.Contains(CapabilityId.ICapExtImageInfo))
//{
// if (DGImage.ExtImageInfo.Get(out extInfo) != ReturnCode.Success)
// {
// extInfo = null;
// }
//}
if (DGImage.ImageInfo.Get(out imgInfo) == ReturnCode.Success)
if (xrc == ReturnCode.XferDone)
{
//OnDataTransferred(new DataTransferredEventArgs(IntPtr.Zero, null));
TWImageInfo imgInfo;
//TWExtImageInfo extInfo;
//if (SupportedCaps.Contains(CapabilityId.ICapExtImageInfo))
//{
// if (DGImage.ExtImageInfo.Get(out extInfo) != ReturnCode.Success)
// {
// extInfo = null;
// }
//}
if (DGImage.ImageInfo.Get(out imgInfo) == ReturnCode.Success)
{
OnDataTransferred(new DataTransferredEventArgs { MemData = xferredData.ToArray(), ImageInfo = imgInfo });
}
else
{
throw new TwainException("Failed to get image info after ImageMemXfer.");
}
}
else
{
Trace.TraceError("Failed to get image info after ImageMemXfer.");
imgInfo = null;
// todo: provide better mechanism for failed xfer, like event handler
throw new TwainException("Failed to transfer data.");
}
}
}
@@ -994,7 +1003,7 @@ namespace NTwain
{
State = 7;
byte[] buffer = new byte[(int)xferInfo.BytesWritten];
// todo: need lock before use?
IntPtr lockPtr = IntPtr.Zero;
try
{
@@ -1086,7 +1095,7 @@ namespace NTwain
{
imgInfo = null;
}
OnDataTransferred(new DataTransferredEventArgs { FilePath = finalFile, FinalImageInfo = imgInfo });
OnDataTransferred(new DataTransferredEventArgs { FileDataPath = finalFile, ImageInfo = imgInfo });
}
}
}

2
NTwain/TwainSessionOld.cs
View File

@@ -120,7 +120,7 @@ namespace NTwain
{
lockedPtr = MemoryManager.Instance.Lock(dataPtr);
}
OnDataTransferred(new DataTransferredEventArgs { NativeData = lockedPtr, FilePath = file });
OnDataTransferred(new DataTransferredEventArgs { NativeData = lockedPtr, FileDataPath = file });
}
//}
//else if (group == DataGroups.Audio)