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

Also added GetValuesRaw() to capabilities class.

Browse Source
This commit is contained in:
Eugene Wang 2015-08-27 05:34:21 -04:00
parent f66f48b4e3
commit 86bf6efe34
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/NTwain/CapWrapper.cs
View File

@ -308,15 +308,7 @@ namespace NTwain
/// <returns></returns>
public CapabilityReader GetValuesRaw()
{
using (TWCapability cap = new TWCapability(Capability))
{
var rc = _source.DGControl.Capability.Get(cap);
if (rc == ReturnCode.Success)
{
return CapabilityReader.ReadValue(cap);
}
}
return null;
return _source.Capabilities.GetValuesRaw(Capability);
}
/// <summary>

20
src/NTwain/Capabilities.cs
View File

@ -147,6 +147,26 @@ namespace NTwain
return Enumerable.Empty<object>();
}
/// <summary>
/// Gets all the possible values of this capability without expanding.
/// This may be required to work with large range values that cannot be safely enumerated
/// with <see cref="GetValues"/>.
/// </summary>
/// <param name="capabilityId">The capability id.</param>
/// <returns></returns>
public CapabilityReader GetValuesRaw(CapabilityId capabilityId)
{
using (TWCapability cap = new TWCapability(capabilityId))
{
var rc = _source.DGControl.Capability.Get(cap);
if (rc == ReturnCode.Success)
{
return CapabilityReader.ReadValue(cap);
}
}
return new CapabilityReader();
}
/// <summary>
/// Resets all values and constraint to power-on defaults.
/// </summary>

6
src/NTwain/CapabilityReader.cs
View File

@ -123,7 +123,7 @@ namespace NTwain
public ItemType ItemType { get; private set; }
/// <summary>
/// Gets the one value if container is <see cref="NTwain.Data.ContainerType.Array"/>.
/// Gets the one value if container is <see cref="NTwain.Data.ContainerType.OneValue"/>.
/// </summary>
/// <value>
/// The one value.
@ -280,7 +280,7 @@ namespace NTwain
}
}
break;
// these should never happen since TW_ENUM fields are 4 bytes but you never know
// these should never happen since TW_RANGE fields are 4 bytes but you never know
case Data.ItemType.UInt16:
{
var min = (ushort)RangeMinValue;
@ -439,7 +439,7 @@ namespace NTwain
RangeCount = ((max - min) / step) + 1;
}
break;
// these should never happen since TW_ENUM fields are 4 bytes but you never know
// these should never happen since TW_RANGE fields are 4 bytes but you never know
case Data.ItemType.UInt16:
{
var min = (ushort)RangeMinValue;

2
src/NTwain/Properties/VersionInfo.cs
View File

@ -23,7 +23,7 @@ namespace NTwain
/// <summary>
/// The build release version number.
/// </summary>
public const string Build = "3.3.6"; // change this for each nuget release
public const string Build = "3.3.7"; // change this for each nuget release
}