From 61a2c907bd2ef3c2d71253c5c841095a0de9c42e Mon Sep 17 00:00:00 2001 From: Eugene Wang Date: Thu, 15 Nov 2018 21:27:59 -0500 Subject: [PATCH] Missed DataFlags rename. --- src/NTwain/Data/ITW_IDENTITY.cs | 2 +- src/NTwain/Data/TwainTypesExtended.cs | 2 +- src/NTwain/Triplets/Control/Parent.cs | 2 +- src/NTwain/TwainConfigBuilder.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/NTwain/Data/ITW_IDENTITY.cs b/src/NTwain/Data/ITW_IDENTITY.cs index 1566ab3..b208d8d 100644 --- a/src/NTwain/Data/ITW_IDENTITY.cs +++ b/src/NTwain/Data/ITW_IDENTITY.cs @@ -10,7 +10,7 @@ /// Gets the data functionalities for TWAIN 2 detection. /// /// The data functionalities. - DataFlags DataFunctionalities { get; } + DataFlags DataFlags { get; } /// /// Gets the supported data group. The application will normally set this field to specify which Data diff --git a/src/NTwain/Data/TwainTypesExtended.cs b/src/NTwain/Data/TwainTypesExtended.cs index 279c1c9..2dd7438 100644 --- a/src/NTwain/Data/TwainTypesExtended.cs +++ b/src/NTwain/Data/TwainTypesExtended.cs @@ -1680,7 +1680,7 @@ namespace NTwain.Data internal set { _version = value; } } - public DataFlags DataFunctionalities + public DataFlags DataFlags { get { return (DataFlags)(_supportedGroups & 0xffff0000); } internal set { _supportedGroups = ((uint)value & 0xffff0000) | (0x0000ffff & _supportedGroups); } diff --git a/src/NTwain/Triplets/Control/Parent.cs b/src/NTwain/Triplets/Control/Parent.cs index 1fd4feb..0354725 100644 --- a/src/NTwain/Triplets/Control/Parent.cs +++ b/src/NTwain/Triplets/Control/Parent.cs @@ -22,7 +22,7 @@ namespace NTwain.Triplets.Control DataGroups.Control, DataArgumentType.Parent, Message.OpenDSM, ref hWnd); isDsm2 = rc == ReturnCode.Success && - (Session.Config.App32.DataFunctionalities & DataFlags.DSM2) == DataFlags.DSM2; + (Session.Config.App32.DataFlags & DataFlags.DSM2) == DataFlags.DSM2; } if (rc == ReturnCode.Success) diff --git a/src/NTwain/TwainConfigBuilder.cs b/src/NTwain/TwainConfigBuilder.cs index 8c4009f..d13d318 100644 --- a/src/NTwain/TwainConfigBuilder.cs +++ b/src/NTwain/TwainConfigBuilder.cs @@ -118,7 +118,7 @@ namespace NTwain config.DefaultMemoryManager = new WinMemoryManager(); // initial default config.App32 = new TW_IDENTITY { - DataFunctionalities = DataFlags.App2, + DataFlags = DataFlags.App2, DataGroup = DataGroups.Control | _dg, Manufacturer = _companyName ?? "Unknown", ProductFamily = _appName ?? "Unknown",