Browse Source
Fix NRE bug in TextShaperImpl.ShapeText on netstandard2.0 (#20369)
* Fix NRE bug in TextShaperImpl.ShapeText on netstandard2.0 (#20364)
* Revert whitespace changes
release/11.3.11
adams85
9 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
5 additions and
1 deletions
-
src/Skia/Avalonia.Skia/TextShaperImpl.cs
|
|
@ -44,7 +44,11 @@ namespace Avalonia.Skia |
|
|
var usedCulture = culture ?? CultureInfo.CurrentCulture; |
|
|
var usedCulture = culture ?? CultureInfo.CurrentCulture; |
|
|
|
|
|
|
|
|
#if NETSTANDARD2_0
|
|
|
#if NETSTANDARD2_0
|
|
|
buffer.Language = s_cachedLanguage.GetOrAdd(usedCulture.LCID, _ => new Language(culture)); |
|
|
if (!s_cachedLanguage.TryGetValue(usedCulture.LCID, out var language)) |
|
|
|
|
|
{ |
|
|
|
|
|
language = s_cachedLanguage.GetOrAdd(usedCulture.LCID, new Language(usedCulture)); |
|
|
|
|
|
} |
|
|
|
|
|
buffer.Language = language; |
|
|
#else
|
|
|
#else
|
|
|
buffer.Language = s_cachedLanguage.GetOrAdd( |
|
|
buffer.Language = s_cachedLanguage.GetOrAdd( |
|
|
usedCulture.LCID, |
|
|
usedCulture.LCID, |
|
|
|
