зеркало из https://github.com/mono/SkiaSharp.git
Reduce the usage of SKMatrix44
This commit is contained in:
Родитель
5e10849c89
Коммит
2a2452a065
|
@ -128,12 +128,12 @@ namespace SkiaSharp
|
|||
new[] { fRX, fRY, fGX, fGY, fBX, fBY, fWX, fWY };
|
||||
|
||||
[EditorBrowsable (EditorBrowsableState.Never)]
|
||||
[Obsolete ("Use ToMatrix44() instead.")]
|
||||
[Obsolete ("Use ToColorSpaceXyz() instead.")]
|
||||
public readonly SKMatrix44 ToXyzD50 () =>
|
||||
ToMatrix44 ();
|
||||
|
||||
[EditorBrowsable (EditorBrowsableState.Never)]
|
||||
[Obsolete ("Use ToMatrix44(SKMatrix44) instead.")]
|
||||
[Obsolete ("Use ToColorSpaceXyz(SKMatrix44) instead.")]
|
||||
public readonly bool ToXyzD50 (SKMatrix44 toXyzD50)
|
||||
{
|
||||
if (toXyzD50 == null)
|
||||
|
@ -145,10 +145,10 @@ namespace SkiaSharp
|
|||
return xyz != null;
|
||||
}
|
||||
|
||||
public readonly SKMatrix44 ToMatrix44 () =>
|
||||
internal readonly SKMatrix44 ToMatrix44 () =>
|
||||
ToMatrix44 (out var toXYZ) ? toXYZ : null;
|
||||
|
||||
public readonly bool ToMatrix44 (out SKMatrix44 toXyzD50)
|
||||
internal readonly bool ToMatrix44 (out SKMatrix44 toXyzD50)
|
||||
{
|
||||
if (!ToColorSpaceXyz (out var xyz)) {
|
||||
toXyzD50 = null;
|
||||
|
@ -431,7 +431,7 @@ namespace SkiaSharp
|
|||
return result;
|
||||
}
|
||||
|
||||
public readonly SKMatrix44 ToMatrix44 ()
|
||||
internal readonly SKMatrix44 ToMatrix44 ()
|
||||
{
|
||||
var matrix = new SKMatrix44 ();
|
||||
matrix.Set3x3RowMajor (Values);
|
||||
|
|
|
@ -259,9 +259,9 @@ public SKColorSpace ToSrgbGamma ();
|
|||
Obsoleted methods:
|
||||
|
||||
```diff
|
||||
[Obsolete ("Use ToMatrix44() instead.")]
|
||||
[Obsolete ("Use ToColorSpaceXyz() instead.")]
|
||||
public SKMatrix44 ToXyzD50 ();
|
||||
[Obsolete ("Use ToMatrix44(SKMatrix44) instead.")]
|
||||
[Obsolete ("Use ToColorSpaceXyz(SKMatrix44) instead.")]
|
||||
public bool ToXyzD50 (SKMatrix44 toXyzD50);
|
||||
```
|
||||
|
||||
|
@ -270,8 +270,6 @@ Added methods:
|
|||
```csharp
|
||||
public SKColorSpaceXyz ToColorSpaceXyz ();
|
||||
public bool ToColorSpaceXyz (out SKColorSpaceXyz toXyzD50);
|
||||
public SKMatrix44 ToMatrix44 ();
|
||||
public bool ToMatrix44 (out SKMatrix44 toXyzD50);
|
||||
```
|
||||
|
||||
|
||||
|
@ -956,7 +954,6 @@ public struct SKColorSpaceXyz, System.IEquatable<SKColorSpaceXyz> {
|
|||
public override bool Equals (object obj);
|
||||
public override int GetHashCode ();
|
||||
public SKColorSpaceXyz Invert ();
|
||||
public SKMatrix44 ToMatrix44 ();
|
||||
public static bool op_Equality (SKColorSpaceXyz left, SKColorSpaceXyz right);
|
||||
public static bool op_Inequality (SKColorSpaceXyz left, SKColorSpaceXyz right);
|
||||
}
|
||||
|
|
|
@ -14,6 +14,9 @@ namespace SkiaSharpGenerator
|
|||
[JsonPropertyName("flags")]
|
||||
public bool IsFlags { get; set; } = false;
|
||||
|
||||
[JsonPropertyName("obsolete")]
|
||||
public bool IsObsolete { get; set; } = false;
|
||||
|
||||
[JsonPropertyName("properties")]
|
||||
public bool GenerateProperties { get; set; } = true;
|
||||
|
||||
|
|
|
@ -271,6 +271,8 @@ namespace SkiaSharpGenerator
|
|||
|
||||
writer.WriteLine();
|
||||
writer.WriteLine($"\t// {enm.GetDisplayName()}");
|
||||
if (map?.IsObsolete == true)
|
||||
writer.WriteLine($"\t[Obsolete]");
|
||||
if (map?.IsFlags == true)
|
||||
writer.WriteLine($"\t[Flags]");
|
||||
writer.WriteLine($"\t{visibility} enum {name} {{");
|
||||
|
|
Загрузка…
Ссылка в новой задаче