diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-05-03 18:11:31 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-05-03 18:11:31 -0400 |
| commit | 5d3d919d490fd414fe9647e566e92c71d7f64509 (patch) | |
| tree | e1eab3352287ef04b5de4cdc28b550e255d58c3f /src/SMAPI/Framework/Content/AssetDataForImage.cs | |
| parent | c48f6d78cc412c5f2e40a8b460b7b3c1c993c51a (diff) | |
| parent | 3447e2f575c2c83af729777e4d37e93f4c2a6467 (diff) | |
| download | SMAPI-5d3d919d490fd414fe9647e566e92c71d7f64509.tar.gz SMAPI-5d3d919d490fd414fe9647e566e92c71d7f64509.tar.bz2 SMAPI-5d3d919d490fd414fe9647e566e92c71d7f64509.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Framework/Content/AssetDataForImage.cs')
| -rw-r--r-- | src/SMAPI/Framework/Content/AssetDataForImage.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/SMAPI/Framework/Content/AssetDataForImage.cs b/src/SMAPI/Framework/Content/AssetDataForImage.cs index 5f91610e..529fb93a 100644 --- a/src/SMAPI/Framework/Content/AssetDataForImage.cs +++ b/src/SMAPI/Framework/Content/AssetDataForImage.cs @@ -12,7 +12,7 @@ namespace StardewModdingAPI.Framework.Content ** Fields *********/ /// <summary>The minimum value to consider non-transparent.</summary> - /// <remarks>On Linux/Mac, fully transparent pixels may have an alpha up to 4 for some reason.</remarks> + /// <remarks>On Linux/macOS, fully transparent pixels may have an alpha up to 4 for some reason.</remarks> private const byte MinOpacity = 5; @@ -82,7 +82,7 @@ namespace StardewModdingAPI.Framework.Content // premultiplied by the content pipeline. The formula is derived from // https://blogs.msdn.microsoft.com/shawnhar/2009/11/06/premultiplied-alpha/. // Note: don't use named arguments here since they're different between - // Linux/Mac and Windows. + // Linux/macOS and Windows. float alphaBelow = 1 - (above.A / 255f); newData[i] = new Color( (int)(above.R + (below.R * alphaBelow)), // r |