lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2025-09-18 17:47:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed lang encoding error in non frameworks.

Browse Source
This commit is contained in:
Eugene Wang
2021-04-21 13:05:25 -04:00
parent e2f709add0
commit 66b5270d37
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
NTwain/NTwain.csproj
View File

@@ -33,13 +33,25 @@
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <!--<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Drawing.Common"> <PackageReference Include="System.Drawing.Common">
<Version>5.0.2</Version> <Version>5.0.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.Security.Permissions"> <PackageReference Include="System.Security.Permissions">
<Version>5.0.0</Version> <Version>5.0.0</Version>
</PackageReference> </PackageReference>
</ItemGroup>-->
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="System.Text.Encoding.CodePages">
<Version>5.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
<PackageReference Include="System.Text.Encoding.CodePages">
<Version>5.0.0</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

11
NTwain/TWAINWorkingGroup/Language.cs
View File

@@ -40,6 +40,7 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////
using System;
using System.Text; using System.Text;
namespace TWAINWorkingGroup namespace TWAINWorkingGroup
@@ -241,6 +242,14 @@ namespace TWAINWorkingGroup
} }
} }
private static Encoding m_encoding = Encoding.GetEncoding(1252); private static Encoding m_encoding = MakeDefault();
private static Encoding MakeDefault()
{
#if !NETFRAMEWORK
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
#endif
return Encoding.GetEncoding(1252);
}
} }
} }