From 0aefff0b652f98afbec300ded5381113164a4cff Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sun, 2 Dec 2018 03:41:28 +0200 Subject: [PATCH] Updated docs --- changelogs/SkiaSharp/1.68.0/SkiaSharp.md | 9 +- docs/xml/FrameworksIndex/skiasharp-1.68.0.xml | 3 + docs/xml/SkiaSharp/SKBitmap.xml | 130 +++++++++++++++++- docs/xml/index.xml | 28 ++-- scripts/build-debug-app.ps1 | 2 +- scripts/build-debug-app.sh | 7 +- 6 files changed, 153 insertions(+), 26 deletions(-) diff --git a/changelogs/SkiaSharp/1.68.0/SkiaSharp.md b/changelogs/SkiaSharp/1.68.0/SkiaSharp.md index 70a89b9a..5afe0ec2 100644 --- a/changelogs/SkiaSharp/1.68.0/SkiaSharp.md +++ b/changelogs/SkiaSharp/1.68.0/SkiaSharp.md @@ -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); diff --git a/docs/xml/FrameworksIndex/skiasharp-1.68.0.xml b/docs/xml/FrameworksIndex/skiasharp-1.68.0.xml index 3138da08..9cae67bb 100644 --- a/docs/xml/FrameworksIndex/skiasharp-1.68.0.xml +++ b/docs/xml/FrameworksIndex/skiasharp-1.68.0.xml @@ -288,6 +288,9 @@ + + + diff --git a/docs/xml/SkiaSharp/SKBitmap.xml b/docs/xml/SkiaSharp/SKBitmap.xml index c5f99281..92fba4e0 100644 --- a/docs/xml/SkiaSharp/SKBitmap.xml +++ b/docs/xml/SkiaSharp/SKBitmap.xml @@ -2072,7 +2072,7 @@ - System.Obsolete + System.Obsolete("Use ScalePixels(SKBitmap, SKFilterQuality) instead.") @@ -2105,7 +2105,7 @@ - System.Obsolete + System.Obsolete("Use Resize(SKImageInfo, SKFilterQuality) instead.") @@ -2123,6 +2123,30 @@ + + + + + Method + + SkiaSharp + 1.68.0.0 + + + SkiaSharp.SKBitmap + + + + + + + The image information of the desired bitmap. + The level of quality to use when scaling the pixels. + Resizes the current bitmap using the specified quality filter. + Returns the resized bitmap if the resize operation could be performed, otherwise . + + + @@ -2138,7 +2162,7 @@ - System.Obsolete + System.Obsolete("Use ScalePixels(SKBitmap, SKFilterQuality) instead.") @@ -2180,6 +2204,106 @@ The same as . + + + + + Method + + SkiaSharp + 1.68.0.0 + + + System.Boolean + + + + + + + The bitmap to recieve the scaled and converted pixels. + The level of quality to use when scaling the pixels. + 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. + Returns on success, or if there was an error. + + , or +, the destination color type must match. +If the color type is , destination +colorspace must also match. + +If the alpha type is , the destination +alpha type must match. + +If the colorspace is `null`, the destination colorspace must also be `null`. + +Filter Quality: + + - is fastest, typically implemented + with nearest neighbor filter. + - is typically implemented with bilerp + filter. + - is typically implemented with + bilerp filter, and mipmap when size is reduced. + - is slowest, typically implemented + with the bicubic filter.]]> + + + + + + + + Method + + SkiaSharp + 1.68.0.0 + + + System.Boolean + + + + + + + The pixmap to recieve the scaled and converted pixels. + The level of quality to use when scaling the pixels. + 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. + Returns on success, or if there was an error. + + , or +, the destination color type must match. +If the color type is , destination +colorspace must also match. + +If the alpha type is , the destination +alpha type must match. + +If the colorspace is `null`, the destination colorspace must also be `null`. + +Filter Quality: + + - is fastest, typically implemented + with nearest neighbor filter. + - is typically implemented with bilerp + filter. + - is typically implemented with + bilerp filter, and mipmap when size is reduced. + - is slowest, typically implemented + with the bicubic filter.]]> + + + diff --git a/docs/xml/index.xml b/docs/xml/index.xml index 73e89b69..da4b2c16 100644 --- a/docs/xml/index.xml +++ b/docs/xml/index.xml @@ -130,7 +130,7 @@ System.Reflection.AssemblyFileVersion("1.68.0.0") - System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") @@ -270,7 +270,7 @@ System.Reflection.AssemblyFileVersion("1.68.0.0") - System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") @@ -404,7 +404,7 @@ System.Reflection.AssemblyFileVersion("1.68.0.0") - System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") @@ -484,7 +484,7 @@ System.Reflection.AssemblyFileVersion("1.68.0.0") - System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") @@ -618,7 +618,7 @@ System.Reflection.AssemblyFileVersion("1.68.0.0") - System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") @@ -680,7 +680,7 @@ System.Reflection.AssemblyFileVersion("1.68.0.0") - System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") @@ -814,7 +814,7 @@ System.Reflection.AssemblyFileVersion("1.68.0.0") - System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") @@ -951,7 +951,7 @@ System.Reflection.AssemblyFileVersion("1.68.0.0") - System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") @@ -1088,7 +1088,7 @@ System.Reflection.AssemblyFileVersion("1.68.0.0") - System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") @@ -1225,7 +1225,7 @@ System.Reflection.AssemblyFileVersion("1.68.0.0") - System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") @@ -1305,7 +1305,7 @@ System.Reflection.AssemblyFileVersion("1.68.0.0") - System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") @@ -1441,7 +1441,7 @@ System.Reflection.AssemblyFileVersion("1.68.0.0") - System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") @@ -1518,7 +1518,7 @@ System.Reflection.AssemblyFileVersion("1.4.6.2") - System.Reflection.AssemblyInformationalVersion("1.4.6.2-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.4.6.2-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") @@ -1598,7 +1598,7 @@ System.Reflection.AssemblyFileVersion("1.68.0.0") - System.Reflection.AssemblyInformationalVersion("1.68.0.0-6c7f0187245efc4500b85e911a7c954177801fa5") + System.Reflection.AssemblyInformationalVersion("1.68.0.0-9733dd79b3af76b624bb30145b9d9b6aff52d9c1") diff --git a/scripts/build-debug-app.ps1 b/scripts/build-debug-app.ps1 index f9915452..cd9f6f4d 100644 --- a/scripts/build-debug-app.ps1 +++ b/scripts/build-debug-app.ps1 @@ -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 ../../ } diff --git a/scripts/build-debug-app.sh b/scripts/build-debug-app.sh index f5e22c91..b6a52e8e 100644 --- a/scripts/build-debug-app.sh +++ b/scripts/build-debug-app.sh @@ -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"