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

Merged in blackoverlord89/ntwain (pull request #8)

Browse Source 
Plustek OpticSlim 2680H fix

Approved-by: blackoverlord89 <blackoverlord89@gmail.com>
This commit is contained in:
blackoverlord89
2018-09-10 20:56:54 +00:00
committed by Eugene Wang
parent b2af80d985 64a81b4924
commit 5a43284553
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/NTwain/Internals/TransferLogic.cs
View File

@@ -29,7 +29,17 @@ namespace NTwain.Internals
if (session.DGControl.XferGroup.Get(ref xferGroup) == ReturnCode.Success) if (session.DGControl.XferGroup.Get(ref xferGroup) == ReturnCode.Success)
{ {
xferAudio = (xferGroup & DataGroups.Audio) == DataGroups.Audio; xferAudio = (xferGroup & DataGroups.Audio) == DataGroups.Audio;
xferImage = xferGroup == DataGroups.None || (xferGroup & DataGroups.Image) == DataGroups.Image; // check for Plustek OpticSlim 2680H, this scanner returns wrong xferGroup after first scanning
if (session.CurrentSource.Identity.ProductName.IndexOf("Plustek", StringComparison.OrdinalIgnoreCase) > -1 &&
session.CurrentSource.Identity.ProductName.IndexOf("OpticSlim", StringComparison.OrdinalIgnoreCase) > -1 &&
session.CurrentSource.Identity.ProductName.IndexOf("2680H", StringComparison.OrdinalIgnoreCase) > -1)
{
xferImage = true;
}
else
{
xferImage = xferGroup == DataGroups.None || (xferGroup & DataGroups.Image) == DataGroups.Image;
}
} }
// some DS end up getting none but we will assume it's image // some DS end up getting none but we will assume it's image
if (xferImage) if (xferImage)