This commit is contained in:
Matthew Leibowitz 2018-12-02 03:41:28 +02:00
Родитель 9733dd79b3
Коммит 0aefff0b65
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 3650EBE4AA155AF9
6 изменённых файлов: 153 добавлений и 26 удалений

Просмотреть файл

@ -161,11 +161,11 @@ Obsoleted methods:
public bool InstallPixels (SKImageInfo info, IntPtr pixels, int rowBytes, SKColorTable ctable);
[Obsolete ("The Index8 color type and color table is no longer supported. Use InstallPixels(SKImageInfo, IntPtr, int, SKBitmapReleaseDelegate, object) instead.")]
public bool InstallPixels (SKImageInfo info, IntPtr pixels, int rowBytes, SKColorTable ctable, SKBitmapReleaseDelegate releaseProc, object context);
[Obsolete ()]
[Obsolete ("Use ScalePixels(SKBitmap, SKFilterQuality) instead.")]
public bool Resize (SKBitmap dst, SKBitmapResizeMethod method);
[Obsolete ()]
[Obsolete ("Use Resize(SKImageInfo, SKFilterQuality) instead.")]
public SKBitmap Resize (SKImageInfo info, SKBitmapResizeMethod method);
[Obsolete ()]
[Obsolete ("Use ScalePixels(SKBitmap, SKFilterQuality) instead.")]
public static bool Resize (SKBitmap dst, SKBitmap src, SKBitmapResizeMethod method);
[Obsolete ("The Index8 color type and color table is no longer supported.")]
public void SetColorTable (SKColorTable ct);
@ -178,6 +178,9 @@ Added methods:
```csharp
public bool InstallPixels (SKImageInfo info, IntPtr pixels, int rowBytes, SKBitmapReleaseDelegate releaseProc);
public bool InstallPixels (SKImageInfo info, IntPtr pixels, int rowBytes, SKBitmapReleaseDelegate releaseProc, object context);
public SKBitmap Resize (SKImageInfo info, SKFilterQuality quality);
public bool ScalePixels (SKBitmap destination, SKFilterQuality quality);
public bool ScalePixels (SKPixmap destination, SKFilterQuality quality);
public bool TryAllocPixels (SKImageInfo info);
public bool TryAllocPixels (SKImageInfo info, SKBitmapAllocFlags flags);
public bool TryAllocPixels (SKImageInfo info, int rowBytes);

Просмотреть файл

@ -288,6 +288,9 @@
<Member Id="M:SkiaSharp.SKBitmap.Resize(SkiaSharp.SKBitmap,SkiaSharp.SKBitmap,SkiaSharp.SKBitmapResizeMethod)" />
<Member Id="M:SkiaSharp.SKBitmap.Resize(SkiaSharp.SKBitmap,SkiaSharp.SKBitmapResizeMethod)" />
<Member Id="M:SkiaSharp.SKBitmap.Resize(SkiaSharp.SKImageInfo,SkiaSharp.SKBitmapResizeMethod)" />
<Member Id="M:SkiaSharp.SKBitmap.Resize(SkiaSharp.SKImageInfo,SkiaSharp.SKFilterQuality)" />
<Member Id="M:SkiaSharp.SKBitmap.ScalePixels(SkiaSharp.SKBitmap,SkiaSharp.SKFilterQuality)" />
<Member Id="M:SkiaSharp.SKBitmap.ScalePixels(SkiaSharp.SKPixmap,SkiaSharp.SKFilterQuality)" />
<Member Id="M:SkiaSharp.SKBitmap.SetColorTable(SkiaSharp.SKColorTable)" />
<Member Id="M:SkiaSharp.SKBitmap.SetImmutable" />
<Member Id="M:SkiaSharp.SKBitmap.SetPixel(System.Int32,System.Int32,SkiaSharp.SKColor)" />

Просмотреть файл

@ -2072,7 +2072,7 @@
</AssemblyInfo>
<Attributes>
<Attribute FrameworkAlternate="skiasharp-1.68.0">
<AttributeName>System.Obsolete</AttributeName>
<AttributeName>System.Obsolete("Use ScalePixels(SKBitmap, SKFilterQuality) instead.")</AttributeName>
</Attribute>
</Attributes>
<ReturnValue>
@ -2105,7 +2105,7 @@
</AssemblyInfo>
<Attributes>
<Attribute FrameworkAlternate="skiasharp-1.68.0">
<AttributeName>System.Obsolete</AttributeName>
<AttributeName>System.Obsolete("Use Resize(SKImageInfo, SKFilterQuality) instead.")</AttributeName>
</Attribute>
</Attributes>
<ReturnValue>
@ -2123,6 +2123,30 @@
<remarks></remarks>
</Docs>
</Member>
<Member MemberName="Resize">
<MemberSignature Language="C#" Value="public SkiaSharp.SKBitmap Resize (SkiaSharp.SKImageInfo info, SkiaSharp.SKFilterQuality quality);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance class SkiaSharp.SKBitmap Resize(valuetype SkiaSharp.SKImageInfo info, valuetype SkiaSharp.SKFilterQuality quality) cil managed" />
<MemberSignature Language="DocId" Value="M:SkiaSharp.SKBitmap.Resize(SkiaSharp.SKImageInfo,SkiaSharp.SKFilterQuality)" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyName>SkiaSharp</AssemblyName>
<AssemblyVersion>1.68.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>SkiaSharp.SKBitmap</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="info" Type="SkiaSharp.SKImageInfo" />
<Parameter Name="quality" Type="SkiaSharp.SKFilterQuality" />
</Parameters>
<Docs>
<param name="info">The image information of the desired bitmap.</param>
<param name="quality">The level of quality to use when scaling the pixels.</param>
<summary>Resizes the current bitmap using the specified quality filter.</summary>
<returns>Returns the resized bitmap if the resize operation could be performed, otherwise <see langword="null" />.</returns>
<remarks></remarks>
</Docs>
</Member>
<Member MemberName="Resize">
<MemberSignature Language="C#" Value="public static bool Resize (SkiaSharp.SKBitmap dst, SkiaSharp.SKBitmap src, SkiaSharp.SKBitmapResizeMethod method);" />
<MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Resize(class SkiaSharp.SKBitmap dst, class SkiaSharp.SKBitmap src, valuetype SkiaSharp.SKBitmapResizeMethod method) cil managed" />
@ -2138,7 +2162,7 @@
</AssemblyInfo>
<Attributes>
<Attribute FrameworkAlternate="skiasharp-1.68.0">
<AttributeName>System.Obsolete</AttributeName>
<AttributeName>System.Obsolete("Use ScalePixels(SKBitmap, SKFilterQuality) instead.")</AttributeName>
</Attribute>
</Attributes>
<ReturnValue>
@ -2180,6 +2204,106 @@
<remarks>The same as <see cref="P:SkiaSharp.SKImageInfo.RowBytes" />.</remarks>
</Docs>
</Member>
<Member MemberName="ScalePixels">
<MemberSignature Language="C#" Value="public bool ScalePixels (SkiaSharp.SKBitmap destination, SkiaSharp.SKFilterQuality quality);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool ScalePixels(class SkiaSharp.SKBitmap destination, valuetype SkiaSharp.SKFilterQuality quality) cil managed" />
<MemberSignature Language="DocId" Value="M:SkiaSharp.SKBitmap.ScalePixels(SkiaSharp.SKBitmap,SkiaSharp.SKFilterQuality)" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyName>SkiaSharp</AssemblyName>
<AssemblyVersion>1.68.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>System.Boolean</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="destination" Type="SkiaSharp.SKBitmap" />
<Parameter Name="quality" Type="SkiaSharp.SKFilterQuality" />
</Parameters>
<Docs>
<param name="destination">The bitmap to recieve the scaled and converted pixels.</param>
<param name="quality">The level of quality to use when scaling the pixels.</param>
<summary>Copies this pixmap to the destination, scaling the pixels to fit the destination size and converting the pixels to match the color type and alpha type.</summary>
<returns>Returns <see langword="true" /> on success, or <see langword="false" /> if there was an error.</returns>
<remarks>
<format type="text/markdown"><![CDATA[
## Remarks
Pixels are copied only if pixel conversion is possible.
If the color type is <xref:SkiaSharp.SKColorType.Gray8>, or
<xref:SkiaSharp.SKColorType.Alpha8>, the destination color type must match.
If the color type is <xref:SkiaSharp.SKColorType.Gray8>, destination
colorspace must also match.
If the alpha type is <xref:SkiaSharp.SKAlphaType.Opaque>, the destination
alpha type must match.
If the colorspace is `null`, the destination colorspace must also be `null`.
Filter Quality:
- <xref:SkiaSharp.SKFilterQuality.None> is fastest, typically implemented
with nearest neighbor filter.
- <xref:SkiaSharp.SKFilterQuality.Low> is typically implemented with bilerp
filter.
- <xref:SkiaSharp.SKFilterQuality.Medium> is typically implemented with
bilerp filter, and mipmap when size is reduced.
- <xref:SkiaSharp.SKFilterQuality.High> is slowest, typically implemented
with the bicubic filter.]]></format>
</remarks>
</Docs>
</Member>
<Member MemberName="ScalePixels">
<MemberSignature Language="C#" Value="public bool ScalePixels (SkiaSharp.SKPixmap destination, SkiaSharp.SKFilterQuality quality);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool ScalePixels(class SkiaSharp.SKPixmap destination, valuetype SkiaSharp.SKFilterQuality quality) cil managed" />
<MemberSignature Language="DocId" Value="M:SkiaSharp.SKBitmap.ScalePixels(SkiaSharp.SKPixmap,SkiaSharp.SKFilterQuality)" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyName>SkiaSharp</AssemblyName>
<AssemblyVersion>1.68.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>System.Boolean</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="destination" Type="SkiaSharp.SKPixmap" />
<Parameter Name="quality" Type="SkiaSharp.SKFilterQuality" />
</Parameters>
<Docs>
<param name="destination">The pixmap to recieve the scaled and converted pixels.</param>
<param name="quality">The level of quality to use when scaling the pixels.</param>
<summary>Copies this pixmap to the destination, scaling the pixels to fit the destination size and converting the pixels to match the color type and alpha type.</summary>
<returns>Returns <see langword="true" /> on success, or <see langword="false" /> if there was an error.</returns>
<remarks>
<format type="text/markdown"><![CDATA[
## Remarks
Pixels are copied only if pixel conversion is possible.
If the color type is <xref:SkiaSharp.SKColorType.Gray8>, or
<xref:SkiaSharp.SKColorType.Alpha8>, the destination color type must match.
If the color type is <xref:SkiaSharp.SKColorType.Gray8>, destination
colorspace must also match.
If the alpha type is <xref:SkiaSharp.SKAlphaType.Opaque>, the destination
alpha type must match.
If the colorspace is `null`, the destination colorspace must also be `null`.
Filter Quality:
- <xref:SkiaSharp.SKFilterQuality.None> is fastest, typically implemented
with nearest neighbor filter.
- <xref:SkiaSharp.SKFilterQuality.Low> is typically implemented with bilerp
filter.
- <xref:SkiaSharp.SKFilterQuality.Medium> is typically implemented with
bilerp filter, and mipmap when size is reduced.
- <xref:SkiaSharp.SKFilterQuality.High> is slowest, typically implemented
with the bicubic filter.]]></format>
</remarks>
</Docs>
</Member>
<Member MemberName="SetColorTable">
<MemberSignature Language="C#" Value="public void SetColorTable (SkiaSharp.SKColorTable ct);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance void SetColorTable(class SkiaSharp.SKColorTable ct) cil managed" />

Просмотреть файл

@ -130,7 +130,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.68.0.0")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="skiasharp-1.68.0">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
@ -270,7 +270,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.68.0.0")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="skiasharp-views-android-1.68.0">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
@ -404,7 +404,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.68.0.0")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="skiasharp-views-net-1.68.0">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
@ -484,7 +484,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.68.0.0")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="skiasharp-views-net-1.68.0">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
@ -618,7 +618,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.68.0.0")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="skiasharp-views-net-1.68.0">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
@ -680,7 +680,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.68.0.0")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="skiasharp-views-tizen-1.68.0">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
@ -814,7 +814,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.68.0.0")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="skiasharp-views-uwp-1.68.0">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
@ -951,7 +951,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.68.0.0")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="skiasharp-views-ios-1.68.0">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
@ -1088,7 +1088,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.68.0.0")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="skiasharp-views-macos-1.68.0">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
@ -1225,7 +1225,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.68.0.0")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="skiasharp-views-tvos-1.68.0">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
@ -1305,7 +1305,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.68.0.0")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="skiasharp-views-watchos-1.68.0">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
@ -1441,7 +1441,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.68.0.0")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="skiasharp-views-forms-1.68.0">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
@ -1518,7 +1518,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.4.6.2")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="harfbuzzsharp-1.4.6.2">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.4.6.2-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.4.6.2-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
@ -1598,7 +1598,7 @@
<AttributeName>System.Reflection.AssemblyFileVersion("1.68.0.0")</AttributeName>
</Attribute>
<Attribute FrameworkAlternate="skiasharp-harfbuzz-1.68.0">
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1")</AttributeName>
</Attribute>
</Attributes>
</Assembly>

Просмотреть файл

@ -10,7 +10,7 @@ try {
./bin/gn gen "out/Debug"
# ninja
../../externals/depot_tools/ninja "dm" -C "out/Debug"
../depot_tools/ninja "dm" -C "out/Debug"
} finally {
cd ../../
}

Просмотреть файл

@ -4,9 +4,6 @@ set -e
# git-sync-deps
(cd externals/skia && python tools/git-sync-deps)
# output folders
[[ -z $PLATFORM_DIR ]] && PLATFORM_DIR="linux"
# compiler options
CUSTOM_COMPILERS=
[[ ! -z $CC ]] && CUSTOM_COMPILERS="$CUSTOM_COMPILERS cc=\"$CC\""
@ -14,7 +11,7 @@ CUSTOM_COMPILERS=
[[ ! -z $AR ]] && CUSTOM_COMPILERS="$CUSTOM_COMPILERS ar=\"$AR\""
# gn
(cd externals/skia && ./bin/gn gen "out/$PLATFORM_DIR/Debug" --args="$CUSTOM_COMPILERS")
(cd externals/skia && ./bin/gn gen "out/Debug" --args="$CUSTOM_COMPILERS")
# ninja
./externals/depot_tools/ninja 'dm' -C "externals/skia/out/$PLATFORM_DIR/Debug"
./externals/depot_tools/ninja 'dm' -C "externals/skia/out/Debug"