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

Renamed incorrectly named DF_ enum name.

Browse Source
This commit is contained in:
Eugene Wang
2018-11-15 21:26:34 -05:00
parent dba834a513
commit 5dbb1502f9
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NTwain/Data/ITW_IDENTITY.cs
View File

@@ -10,7 +10,7 @@
/// Gets the data functionalities for TWAIN 2 detection.
/// </summary>
/// <value>The data functionalities.</value>
DataFunctionalities DataFunctionalities { get; }
DataFlags DataFunctionalities { get; }
/// <summary>
/// Gets the supported data group. The application will normally set this field to specify which Data

4
src/NTwain/Data/TwainTypesExtended.cs
View File

@@ -1680,9 +1680,9 @@ namespace NTwain.Data
internal set { _version = value; }
}
public DataFunctionalities DataFunctionalities
public DataFlags DataFunctionalities
{
get { return (DataFunctionalities)(_supportedGroups & 0xffff0000); }
get { return (DataFlags)(_supportedGroups & 0xffff0000); }
internal set { _supportedGroups = ((uint)value & 0xffff0000) | (0x0000ffff & _supportedGroups); }
}

6
src/NTwain/Data/TwainValues.cs
View File

@@ -1759,12 +1759,12 @@ namespace NTwain.Data
/// Corresponds to DF_*.
/// </summary>
[Flags]
public enum DataFunctionalities : uint
public enum DataFlags : uint
{
None = 0,
Dsm2 = 0x10000000,
DSM2 = 0x10000000,
App2 = 0x20000000,
Ds2 = 0x40000000,
DS2 = 0x40000000,
}
/// <summary>

2
src/NTwain/Triplets/Control/Parent.cs
View File

@@ -22,7 +22,7 @@ namespace NTwain.Triplets.Control
DataGroups.Control, DataArgumentType.Parent, Message.OpenDSM, ref hWnd);
isDsm2 = rc == ReturnCode.Success &&
(Session.Config.App32.DataFunctionalities & DataFunctionalities.Dsm2) == DataFunctionalities.Dsm2;
(Session.Config.App32.DataFunctionalities & DataFlags.DSM2) == DataFlags.DSM2;
}
if (rc == ReturnCode.Success)

2
src/NTwain/TwainConfigBuilder.cs
View File

@@ -118,7 +118,7 @@ namespace NTwain
config.DefaultMemoryManager = new WinMemoryManager(); // initial default
config.App32 = new TW_IDENTITY
{
DataFunctionalities = DataFunctionalities.App2,
DataFunctionalities = DataFlags.App2,
DataGroup = DataGroups.Control | _dg,
Manufacturer = _companyName ?? "Unknown",
ProductFamily = _appName ?? "Unknown",