mono
/
SkiaSharp
зеркало из https://github.com/mono/SkiaSharp.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Rename Native Library [#77] (#81) 

Main change:
 * Changed the native library to libSkiaSharp for Windows, UWP, Android, OSX and iOS
   Issue #77 #81

Other changes
 * Updated the version number
 * Use Android level 10 or v2.3 s the library version
 * Update the docs
 * Allow for the case where a custom libSkiaSharp is to be provided
 * Make sure we have all the Android architectures
This commit is contained in:
Matthew Leibowitz 2016-05-14 01:12:32 +02:00
Родитель 5b90e16c4d
Коммит f6a0e7c157
54 изменённых файлов: 601 добавлений и 354 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
binding/Binding/SkiaApi.cs
Просмотреть файл

@ -1,4 +1,4 @@
//
//
// Low-level P/Invoke declarations
//
// Author:
@ -37,17 +37,17 @@ namespace SkiaSharp
internal static class SkiaApi
{
#if MONOTOUCH
const string SKIA = "@rpath/libskia_ios.framework/libskia_ios";
const string SKIA = "@rpath/libSkiaSharp.framework/libSkiaSharp";
#elif __ANDROID__
const string SKIA = "libskia_android.so";
const string SKIA = "libSkiaSharp.so";
#elif XAMARIN_MAC
const string SKIA = "libskia_osx.dylib";
const string SKIA = "libSkiaSharp.dylib";
#elif DESKTOP
const string SKIA = "libskia_windows.dll"; // redirected using .dll.config to 'libskia_osx.dylib' on OS X
const string SKIA = "libSkiaSharp.dll"; // redirected using .dll.config to 'libSkiaSharp.dylib' on OS X
#elif WINDOWS_UWP
const string SKIA = "libskia_uwp.dll";
const string SKIA = "libSkiaSharp.dll";
#else
const string SKIA = "path_to_native.library";
const string SKIA = "libSkiaSharp";
#endif
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]

21
binding/SkiaSharp.Android/SkiaSharp.Android.csproj
Просмотреть файл

@ -13,7 +13,6 @@
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
<AssemblyName>SkiaSharp</AssemblyName>
<TargetFrameworkVersion>v4.3</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -53,20 +52,20 @@
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedNativeLibrary Include="..\..\native-builds\lib\android\arm64-v8a\libskia_android.so">
<Link>libs\arm64-v8a\libskia_android.so</Link>
<EmbeddedNativeLibrary Include="..\..\native-builds\lib\android\arm64-v8a\libSkiaSharp.so">
<Link>libs\arm64-v8a\libSkiaSharp.so</Link>
</EmbeddedNativeLibrary>
<EmbeddedNativeLibrary Include="..\..\native-builds\lib\android\armeabi\libskia_android.so">
<Link>libs\armeabi\libskia_android.so</Link>
<EmbeddedNativeLibrary Include="..\..\native-builds\lib\android\armeabi\libSkiaSharp.so">
<Link>libs\armeabi\libSkiaSharp.so</Link>
</EmbeddedNativeLibrary>
<EmbeddedNativeLibrary Include="..\..\native-builds\lib\android\armeabi-v7a\libskia_android.so">
<Link>libs\armeabi-v7a\libskia_android.so</Link>
<EmbeddedNativeLibrary Include="..\..\native-builds\lib\android\armeabi-v7a\libSkiaSharp.so">
<Link>libs\armeabi-v7a\libSkiaSharp.so</Link>
</EmbeddedNativeLibrary>
<EmbeddedNativeLibrary Include="..\..\native-builds\lib\android\x86\libskia_android.so">
<Link>libs\x86\libskia_android.so</Link>
<EmbeddedNativeLibrary Include="..\..\native-builds\lib\android\x86\libSkiaSharp.so">
<Link>libs\x86\libSkiaSharp.so</Link>
</EmbeddedNativeLibrary>
<EmbeddedNativeLibrary Include="..\..\native-builds\lib\android\x86_64\libskia_android.so">
<Link>libs\x86_64\libskia_android.so</Link>
<EmbeddedNativeLibrary Include="..\..\native-builds\lib\android\x86_64\libSkiaSharp.so">
<Link>libs\x86_64\libSkiaSharp.so</Link>
</EmbeddedNativeLibrary>
</ItemGroup>
</Project>

28
binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj
Просмотреть файл

@ -48,34 +48,34 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(OS)' != 'Unix' ">
<None Include="..\..\native-builds\lib\windows\x64\libskia_windows.lib">
<Link>x64\libskia_windows.lib</Link>
<None Include="..\..\native-builds\lib\windows\x64\libSkiaSharp.lib">
<Link>x64\libSkiaSharp.lib</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\windows\x86\libskia_windows.lib">
<Link>x86\libskia_windows.lib</Link>
<None Include="..\..\native-builds\lib\windows\x86\libSkiaSharp.lib">
<Link>x86\libSkiaSharp.lib</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\windows\x64\libskia_windows.dll">
<Link>x64\libskia_windows.dll</Link>
<None Include="..\..\native-builds\lib\windows\x64\libSkiaSharp.dll">
<Link>x64\libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\windows\x64\libskia_windows.pdb">
<Link>x64\libskia_windows.pdb</Link>
<None Include="..\..\native-builds\lib\windows\x64\libSkiaSharp.pdb">
<Link>x64\libSkiaSharp.pdb</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\windows\x86\libskia_windows.dll">
<Link>x86\libskia_windows.dll</Link>
<None Include="..\..\native-builds\lib\windows\x86\libSkiaSharp.dll">
<Link>x86\libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\windows\x86\libskia_windows.pdb">
<Link>x86\libskia_windows.pdb</Link>
<None Include="..\..\native-builds\lib\windows\x86\libSkiaSharp.pdb">
<Link>x86\libSkiaSharp.pdb</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup Condition=" '$(OS)' == 'Unix' ">
<None Include="..\..\native-builds\lib\osx\libskia_osx.dylib">
<Link>mac\libskia_osx.dylib</Link>
<None Include="..\..\native-builds\lib\osx\libSkiaSharp.dylib">
<Link>mac\libSkiaSharp.dylib</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

31
binding/SkiaSharp.Desktop/SkiaSharp.Desktop.targets
Просмотреть файл

@ -1,27 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Condition=" '$(Platform)' == 'x86' and '$(OS)' != 'Unix' ">
<None Include="$(MSBuildThisFileDirectory)x86\libskia_windows.dll">
<Link>libskia_windows.dll</Link>
<!-- if ShouldIncludeNativeSkiaSharp == False then don't include the native libSkiaSharp -->
<PropertyGroup>
<ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' ">True</ShouldIncludeNativeSkiaSharp>
</PropertyGroup>
<!-- add the native x86 Windows library -->
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(Platform)' == 'x86' and '$(OS)' != 'Unix' ">
<None Include="$(MSBuildThisFileDirectory)x86\libSkiaSharp.dll">
<Link>libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'x64' and '$(OS)' != 'Unix' ">
<None Include="$(MSBuildThisFileDirectory)x64\libskia_windows.dll">
<Link>libskia_windows.dll</Link>
<!-- add the native x64 Windows library -->
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(Platform)' == 'x64' and '$(OS)' != 'Unix' ">
<None Include="$(MSBuildThisFileDirectory)x64\libSkiaSharp.dll">
<Link>libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<Target Condition=" '$(Platform)' != 'x64' and '$(Platform)' != 'x86' and '$(OS)' != 'Unix' " Name="CheckSkiaPlatforms" BeforeTargets="Build">
<!-- make sure Windows is x86 or x64 -->
<Target Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(Platform)' != 'x64' and '$(Platform)' != 'x86' and '$(OS)' != 'Unix' "
Name="CheckSkiaPlatforms"
BeforeTargets="Build">
<Error Text="The Platform needs to be either x64 or x86 to support Skia in Windows." />
</Target>
<ItemGroup Condition=" '$(OS)' == 'Unix' ">
<None Include="$(MSBuildThisFileDirectory)mac\libskia_osx.dylib">
<Link>libskia_osx.dylib</Link>
<!-- add the native OSX library -->
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(OS)' == 'Unix' ">
<None Include="$(MSBuildThisFileDirectory)mac\libSkiaSharp.dylib">
<Link>libSkiaSharp.dylib</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)SkiaSharp.dll.config">

4
binding/SkiaSharp.Desktop/SkiaSharp.dll.config
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<dllmap dll="libskia_windows.dll" target="libskia_osx.dylib" os="!windows" />
<dllmap dll="libSkiaSharp.dll" target="libSkiaSharp.dylib" os="!windows" />
</configuration>

4
binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj
Просмотреть файл

@ -64,8 +64,8 @@
<None Include="SkiaSharp.OSX.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\osx\libskia_osx.dylib">
<Link>libskia_osx.dylib</Link>
<None Include="..\..\native-builds\lib\osx\libSkiaSharp.dylib">
<Link>libSkiaSharp.dylib</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

2
binding/SkiaSharp.OSX/SkiaSharp.OSX.targets
Просмотреть файл

@ -2,7 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<NativeReference Include="$(MSBuildThisFileDirectory)libskia_osx.dylib">
<NativeReference Include="$(MSBuildThisFileDirectory)libSkiaSharp.dylib">
<IsCxx>False</IsCxx>
<Kind>Dynamic</Kind>
</NativeReference>

36
binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
Просмотреть файл

@ -40,40 +40,40 @@
</PropertyGroup>
<ItemGroup>
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
<None Include="..\..\native-builds\lib\uwp\arm\libskia_uwp.dll">
<Link>arm\libskia_uwp.dll</Link>
<None Include="..\..\native-builds\lib\uwp\arm\libSkiaSharp.dll">
<Link>arm\libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\uwp\arm\libskia_uwp.lib">
<Link>arm\libskia_uwp.lib</Link>
<None Include="..\..\native-builds\lib\uwp\arm\libSkiaSharp.lib">
<Link>arm\libSkiaSharp.lib</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\uwp\arm\libskia_uwp.pdb">
<Link>arm\libskia_uwp.pdb</Link>
<None Include="..\..\native-builds\lib\uwp\arm\libSkiaSharp.pdb">
<Link>arm\libSkiaSharp.pdb</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\uwp\x64\libskia_uwp.dll">
<Link>x64\libskia_uwp.dll</Link>
<None Include="..\..\native-builds\lib\uwp\x64\libSkiaSharp.dll">
<Link>x64\libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\uwp\x64\libskia_uwp.lib">
<Link>x64\libskia_uwp.lib</Link>
<None Include="..\..\native-builds\lib\uwp\x64\libSkiaSharp.lib">
<Link>x64\libSkiaSharp.lib</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\uwp\x64\libskia_uwp.pdb">
<Link>x64\libskia_uwp.pdb</Link>
<None Include="..\..\native-builds\lib\uwp\x64\libSkiaSharp.pdb">
<Link>x64\libSkiaSharp.pdb</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\uwp\x86\libskia_uwp.dll">
<Link>x86\libskia_uwp.dll</Link>
<None Include="..\..\native-builds\lib\uwp\x86\libSkiaSharp.dll">
<Link>x86\libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\uwp\x86\libskia_uwp.lib">
<Link>x86\libskia_uwp.lib</Link>
<None Include="..\..\native-builds\lib\uwp\x86\libSkiaSharp.lib">
<Link>x86\libSkiaSharp.lib</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\uwp\x86\libskia_uwp.pdb">
<Link>x86\libskia_uwp.pdb</Link>
<None Include="..\..\native-builds\lib\uwp\x86\libSkiaSharp.pdb">
<Link>x86\libSkiaSharp.pdb</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="project.json" />

12
binding/SkiaSharp.UWP/SkiaSharp.UWP.targets
Просмотреть файл

@ -2,22 +2,22 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Condition=" '$(Platform)' == 'x86' ">
<Content Include="$(MSBuildThisFileDirectory)x86\libskia_uwp.dll">
<Link>libskia_uwp.dll</Link>
<Content Include="$(MSBuildThisFileDirectory)x86\libSkiaSharp.dll">
<Link>libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'x64' ">
<Content Include="$(MSBuildThisFileDirectory)x64\libskia_uwp.dll">
<Link>libskia_uwp.dll</Link>
<Content Include="$(MSBuildThisFileDirectory)x64\libSkiaSharp.dll">
<Link>libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'ARM' ">
<Content Include="$(MSBuildThisFileDirectory)arm\libskia_uwp.dll">
<Link>libskia_uwp.dll</Link>
<Content Include="$(MSBuildThisFileDirectory)arm\libSkiaSharp.dll">
<Link>libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>

2
binding/SkiaSharp.iOS/AllLibs.linkwith.cs
Просмотреть файл

@ -1,4 +1,4 @@
using ObjCRuntime;
[assembly: LinkWith ("libskia_ios.framework")]
[assembly: LinkWith ("libSkiaSharp.framework")]

2
binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj
Просмотреть файл

@ -51,7 +51,7 @@
<ObjcBindingCoreSource Include="StructsAndEnums.cs" />
</ItemGroup>
<ItemGroup>
<ObjcBindingNativeFramework Include="..\..\native-builds\lib\ios\libskia_ios.framework" />
<ObjcBindingNativeFramework Include="..\..\native-builds\lib\ios\libSkiaSharp.framework" />
</ItemGroup>
<Import Project="..\Binding\Binding.projitems" Label="Shared" Condition="Exists('..\Binding\Binding.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.ObjCBinding.CSharp.targets" />

4
binding/SkiaSharp/Properties/SkiaSharpAssemblyInfo.cs
Просмотреть файл

@ -17,8 +17,8 @@
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
[assembly: AssemblyVersion ("1.49.0.0")]
[assembly: AssemblyFileVersion ("1.49.2.1")]
[assembly: AssemblyInformationalVersion ("1.49.2.1-{GIT_SHA}")]
[assembly: AssemblyFileVersion ("1.49.3.0")]
[assembly: AssemblyInformationalVersion ("1.49.3.0-{GIT_SHA}")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.

129
build.cake
Просмотреть файл

@ -154,7 +154,7 @@ var RunTests = new Action<FilePath> ((testAssembly) =>
var RunMdocUpdate = new Action<FilePath, DirectoryPath> ((assembly, docsRoot) =>
{
StartProcess (MDocPath, new ProcessSettings {
Arguments = string.Format ("update --out=\"{0}\" \"{1}\"", docsRoot, assembly),
Arguments = string.Format ("update --delete --out=\"{0}\" \"{1}\"", docsRoot, assembly),
});
});
@ -263,25 +263,25 @@ Task ("externals-native")
if (IsRunningOnWindows ()) {
if (!DirectoryExists ("./output/windows/x86")) CreateDirectory ("./output/windows/x86");
if (!DirectoryExists ("./output/windows/x64")) CreateDirectory ("./output/windows/x64");
CopyFileToDirectory ("./native-builds/lib/windows/x86/libskia_windows.dll", "./output/windows/x86/");
CopyFileToDirectory ("./native-builds/lib/windows/x86/libskia_windows.pdb", "./output/windows/x86/");
CopyFileToDirectory ("./native-builds/lib/windows/x64/libskia_windows.dll", "./output/windows/x64/");
CopyFileToDirectory ("./native-builds/lib/windows/x64/libskia_windows.pdb", "./output/windows/x64/");
CopyFileToDirectory ("./native-builds/lib/windows/x86/libSkiaSharp.dll", "./output/windows/x86/");
CopyFileToDirectory ("./native-builds/lib/windows/x86/libSkiaSharp.pdb", "./output/windows/x86/");
CopyFileToDirectory ("./native-builds/lib/windows/x64/libSkiaSharp.dll", "./output/windows/x64/");
CopyFileToDirectory ("./native-builds/lib/windows/x64/libSkiaSharp.pdb", "./output/windows/x64/");
if (!DirectoryExists ("./output/uwp/x86")) CreateDirectory ("./output/uwp/x86");
if (!DirectoryExists ("./output/uwp/x64")) CreateDirectory ("./output/uwp/x64");
if (!DirectoryExists ("./output/uwp/arm")) CreateDirectory ("./output/uwp/arm");
CopyFileToDirectory ("./native-builds/lib/uwp/x86/libskia_uwp.dll", "./output/uwp/x86/");
CopyFileToDirectory ("./native-builds/lib/uwp/x86/libskia_uwp.pdb", "./output/uwp/x86/");
CopyFileToDirectory ("./native-builds/lib/uwp/x64/libskia_uwp.dll", "./output/uwp/x64/");
CopyFileToDirectory ("./native-builds/lib/uwp/x64/libskia_uwp.pdb", "./output/uwp/x64/");
CopyFileToDirectory ("./native-builds/lib/uwp/arm/libskia_uwp.dll", "./output/uwp/arm/");
CopyFileToDirectory ("./native-builds/lib/uwp/arm/libskia_uwp.pdb", "./output/uwp/arm/");
CopyFileToDirectory ("./native-builds/lib/uwp/x86/libSkiaSharp.dll", "./output/uwp/x86/");
CopyFileToDirectory ("./native-builds/lib/uwp/x86/libSkiaSharp.pdb", "./output/uwp/x86/");
CopyFileToDirectory ("./native-builds/lib/uwp/x64/libSkiaSharp.dll", "./output/uwp/x64/");
CopyFileToDirectory ("./native-builds/lib/uwp/x64/libSkiaSharp.pdb", "./output/uwp/x64/");
CopyFileToDirectory ("./native-builds/lib/uwp/arm/libSkiaSharp.dll", "./output/uwp/arm/");
CopyFileToDirectory ("./native-builds/lib/uwp/arm/libSkiaSharp.pdb", "./output/uwp/arm/");
}
if (IsRunningOnUnix ()) {
if (!DirectoryExists ("./output/osx")) CreateDirectory ("./output/osx");
if (!DirectoryExists ("./output/mac")) CreateDirectory ("./output/mac");
CopyFileToDirectory ("./native-builds/lib/osx/libskia_osx.dylib", "./output/osx/");
CopyFileToDirectory ("./native-builds/lib/osx/libskia_osx.dylib", "./output/mac/");
CopyFileToDirectory ("./native-builds/lib/osx/libSkiaSharp.dylib", "./output/osx/");
CopyFileToDirectory ("./native-builds/lib/osx/libSkiaSharp.dylib", "./output/mac/");
}
});
// this builds the managed PCL external
@ -307,21 +307,21 @@ Task ("externals-genapi")
Task ("externals-windows")
.WithCriteria (IsRunningOnWindows ())
.WithCriteria (
!FileExists ("native-builds/lib/windows/x86/libskia_windows.dll") ||
!FileExists ("native-builds/lib/windows/x64/libskia_windows.dll"))
!FileExists ("native-builds/lib/windows/x86/libSkiaSharp.dll") ||
!FileExists ("native-builds/lib/windows/x64/libSkiaSharp.dll"))
.Does (() =>
{
var buildArch = new Action<string, string, string> ((platform, skiaArch, dir) => {
RunGyp ("skia_arch_type='" + skiaArch + "'", "ninja,msvs");
VisualStudioPathFixup ();
DotNetBuild ("native-builds/libskia_windows/libskia_windows_" + dir + ".sln", c => {
DotNetBuild ("native-builds/libSkiaSharp_windows/libSkiaSharp_" + dir + ".sln", c => {
c.Configuration = "Release";
c.Properties ["Platform"] = new [] { platform };
});
if (!DirectoryExists ("native-builds/lib/windows/" + dir)) CreateDirectory ("native-builds/lib/windows/" + dir);
CopyFileToDirectory ("native-builds/libskia_windows/Release/libskia_windows.lib", "native-builds/lib/windows/" + dir);
CopyFileToDirectory ("native-builds/libskia_windows/Release/libskia_windows.dll", "native-builds/lib/windows/" + dir);
CopyFileToDirectory ("native-builds/libskia_windows/Release/libskia_windows.pdb", "native-builds/lib/windows/" + dir);
CopyFileToDirectory ("native-builds/libSkiaSharp_windows/Release/libSkiaSharp.lib", "native-builds/lib/windows/" + dir);
CopyFileToDirectory ("native-builds/libSkiaSharp_windows/Release/libSkiaSharp.dll", "native-builds/lib/windows/" + dir);
CopyFileToDirectory ("native-builds/libSkiaSharp_windows/Release/libSkiaSharp.pdb", "native-builds/lib/windows/" + dir);
});
// set up the gyp environment variables
@ -334,9 +334,9 @@ Task ("externals-windows")
Task ("externals-uwp")
.WithCriteria (IsRunningOnWindows ())
.WithCriteria (
!FileExists ("native-builds/lib/uwp/ARM/libskia_uwp.dll") ||
!FileExists ("native-builds/lib/uwp/x86/libskia_uwp.dll") ||
!FileExists ("native-builds/lib/uwp/x64/libskia_uwp.dll"))
!FileExists ("native-builds/lib/uwp/ARM/libSkiaSharp.dll") ||
!FileExists ("native-builds/lib/uwp/x86/libSkiaSharp.dll") ||
!FileExists ("native-builds/lib/uwp/x64/libSkiaSharp.dll"))
.Does (() =>
{
var convertDesktopToUWP = new Action<FilePath, string> ((projectFilePath, platform) => {
@ -407,22 +407,22 @@ Task ("externals-uwp")
});
var buildArch = new Action<string, string> ((platform, arch) => {
CleanDirectories ("native-builds/libskia_uwp/" + arch);
CleanDirectories ("native-builds/libskia_uwp/Release");
CleanDirectories ("native-builds/libskia_uwp/Generated Files");
ProcessSolutionProjects ("native-builds/libskia_uwp/libskia_uwp_" + arch + ".sln", (projectName, projectPath) => {
if (projectName != "libskia_uwp")
CleanDirectories ("native-builds/libSkiaSharp_uwp/" + arch);
CleanDirectories ("native-builds/libSkiaSharp_uwp/Release");
CleanDirectories ("native-builds/libSkiaSharp_uwp/Generated Files");
ProcessSolutionProjects ("native-builds/libSkiaSharp_uwp/libSkiaSharp_" + arch + ".sln", (projectName, projectPath) => {
if (projectName != "libSkiaSharp")
convertDesktopToUWP (projectPath, platform);
});
VisualStudioPathFixup ();
DotNetBuild ("native-builds/libskia_uwp/libskia_uwp_" + arch + ".sln", c => {
DotNetBuild ("native-builds/libSkiaSharp_uwp/libSkiaSharp_" + arch + ".sln", c => {
c.Configuration = "Release";
c.Properties ["Platform"] = new [] { platform };
});
if (!DirectoryExists ("native-builds/lib/uwp/" + arch)) CreateDirectory ("native-builds/lib/uwp/" + arch);
CopyFileToDirectory ("native-builds/libskia_uwp/Release/libskia_uwp.lib", "native-builds/lib/uwp/" + arch);
CopyFileToDirectory ("native-builds/libskia_uwp/Release/libskia_uwp.dll", "native-builds/lib/uwp/" + arch);
CopyFileToDirectory ("native-builds/libskia_uwp/Release/libskia_uwp.pdb", "native-builds/lib/uwp/" + arch);
CopyFileToDirectory ("native-builds/libSkiaSharp_uwp/Release/libSkiaSharp.lib", "native-builds/lib/uwp/" + arch);
CopyFileToDirectory ("native-builds/libSkiaSharp_uwp/Release/libSkiaSharp.dll", "native-builds/lib/uwp/" + arch);
CopyFileToDirectory ("native-builds/libSkiaSharp_uwp/Release/libSkiaSharp.pdb", "native-builds/lib/uwp/" + arch);
});
// set up the gyp environment variables
@ -441,15 +441,15 @@ Task ("externals-uwp")
Task ("externals-osx")
.WithCriteria (IsRunningOnUnix ())
.WithCriteria (
!FileExists ("native-builds/lib/osx/libskia_osx.dylib"))
!FileExists ("native-builds/lib/osx/libSkiaSharp.dylib"))
.Does (() =>
{
var buildArch = new Action<string, string> ((arch, skiaArch) => {
RunGyp ("skia_arch_type='" + skiaArch + "'", "ninja,xcode");
XCodeBuild (new XCodeBuildSettings {
Project = "native-builds/libskia_osx/libskia_osx.xcodeproj",
Target = "libskia_osx",
Project = "native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj",
Target = "libSkiaSharp",
Sdk = "macosx",
Arch = arch,
Configuration = "Release",
@ -457,8 +457,8 @@ Task ("externals-osx")
if (!DirectoryExists ("native-builds/lib/osx/" + arch)) {
CreateDirectory ("native-builds/lib/osx/" + arch);
}
CopyDirectory ("native-builds/libskia_osx/build/Release/", "native-builds/lib/osx/" + arch);
RunInstallNameTool ("native-builds/lib/osx/" + arch, "lib/libskia_osx.dylib", "@loader_path/libskia_osx.dylib", "libskia_osx.dylib");
CopyDirectory ("native-builds/libSkiaSharp_osx/build/Release/", "native-builds/lib/osx/" + arch);
RunInstallNameTool ("native-builds/lib/osx/" + arch, "lib/libSkiaSharp.dylib", "@loader_path/libSkiaSharp.dylib", "libSkiaSharp.dylib");
});
// set up the gyp environment variables
@ -468,22 +468,22 @@ Task ("externals-osx")
buildArch ("x86_64", "x86_64");
// create the fat dylib
RunLipo ("native-builds/lib/osx/", "libskia_osx.dylib", new [] {
(FilePath) "i386/libskia_osx.dylib",
(FilePath) "x86_64/libskia_osx.dylib"
RunLipo ("native-builds/lib/osx/", "libSkiaSharp.dylib", new [] {
(FilePath) "i386/libSkiaSharp.dylib",
(FilePath) "x86_64/libSkiaSharp.dylib"
});
});
// this builds the native C and C++ externals for iOS
Task ("externals-ios")
.WithCriteria (IsRunningOnUnix ())
.WithCriteria (
!FileExists ("native-builds/lib/ios/libskia_ios.framework/libskia_ios"))
!FileExists ("native-builds/lib/ios/libSkiaSharp.framework/libSkiaSharp"))
.Does (() =>
{
var buildArch = new Action<string, string> ((sdk, arch) => {
XCodeBuild (new XCodeBuildSettings {
Project = "native-builds/libskia_ios/libskia_ios.xcodeproj",
Target = "libskia_ios",
Project = "native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj",
Target = "libSkiaSharp",
Sdk = sdk,
Arch = arch,
Configuration = "Release",
@ -491,7 +491,7 @@ Task ("externals-ios")
if (!DirectoryExists ("native-builds/lib/ios/" + arch)) {
CreateDirectory ("native-builds/lib/ios/" + arch);
}
CopyDirectory ("native-builds/libskia_ios/build/Release-" + sdk, "native-builds/lib/ios/" + arch);
CopyDirectory ("native-builds/libSkiaSharp_ios/build/Release-" + sdk, "native-builds/lib/ios/" + arch);
});
// set up the gyp environment variables
@ -506,25 +506,25 @@ Task ("externals-ios")
buildArch ("iphoneos", "arm64");
// create the fat framework
CopyDirectory ("native-builds/lib/ios/armv7/libskia_ios.framework/", "native-builds/lib/ios/libskia_ios.framework/");
DeleteFile ("native-builds/lib/ios/libskia_ios.framework/libskia_ios");
RunLipo ("native-builds/lib/ios/", "libskia_ios.framework/libskia_ios", new [] {
(FilePath) "i386/libskia_ios.framework/libskia_ios",
(FilePath) "x86_64/libskia_ios.framework/libskia_ios",
(FilePath) "armv7/libskia_ios.framework/libskia_ios",
(FilePath) "armv7s/libskia_ios.framework/libskia_ios",
(FilePath) "arm64/libskia_ios.framework/libskia_ios"
CopyDirectory ("native-builds/lib/ios/armv7/libSkiaSharp.framework/", "native-builds/lib/ios/libSkiaSharp.framework/");
DeleteFile ("native-builds/lib/ios/libSkiaSharp.framework/libSkiaSharp");
RunLipo ("native-builds/lib/ios/", "libSkiaSharp.framework/libSkiaSharp", new [] {
(FilePath) "i386/libSkiaSharp.framework/libSkiaSharp",
(FilePath) "x86_64/libSkiaSharp.framework/libSkiaSharp",
(FilePath) "armv7/libSkiaSharp.framework/libSkiaSharp",
(FilePath) "armv7s/libSkiaSharp.framework/libSkiaSharp",
(FilePath) "arm64/libSkiaSharp.framework/libSkiaSharp"
});
});
// this builds the native C and C++ externals for Android
Task ("externals-android")
.WithCriteria (IsRunningOnUnix ())
.WithCriteria (
!FileExists ("native-builds/lib/android/x86/libskia_android.so") ||
!FileExists ("native-builds/lib/android/x86_64/libskia_android.so") ||
!FileExists ("native-builds/lib/android/armeabi/libskia_android.so") ||
!FileExists ("native-builds/lib/android/armeabi-v7a/libskia_android.so") ||
!FileExists ("native-builds/lib/android/arm64-v8a/libskia_android.so"))
!FileExists ("native-builds/lib/android/x86/libSkiaSharp.so") ||
!FileExists ("native-builds/lib/android/x86_64/libSkiaSharp.so") ||
!FileExists ("native-builds/lib/android/armeabi/libSkiaSharp.so") ||
!FileExists ("native-builds/lib/android/armeabi-v7a/libSkiaSharp.so") ||
!FileExists ("native-builds/lib/android/arm64-v8a/libSkiaSharp.so"))
.Does (() =>
{
var ANDROID_HOME = EnvironmentVariable ("ANDROID_HOME") ?? EnvironmentVariable ("HOME") + "/Library/Developer/Xamarin/android-sdk-macosx";
@ -556,14 +556,14 @@ Task ("externals-android")
var ndkbuild = MakeAbsolute (Directory (ANDROID_NDK_HOME)).CombineWithFilePath ("ndk-build").FullPath;
StartProcess (ndkbuild, new ProcessSettings {
Arguments = "",
WorkingDirectory = ROOT_PATH.Combine ("native-builds/libskia_android").FullPath,
WorkingDirectory = ROOT_PATH.Combine ("native-builds/libSkiaSharp_android").FullPath,
});
foreach (var folder in new [] { "x86", "x86_64", "armeabi", "armeabi-v7a", "arm64-v8a" }) {
if (!DirectoryExists ("native-builds/lib/android/" + folder)) {
CreateDirectory ("native-builds/lib/android/" + folder);
}
CopyFileToDirectory ("native-builds/libskia_android/libs/" + folder + "/libskia_android.so", "native-builds/lib/android/" + folder);
CopyFileToDirectory ("native-builds/libSkiaSharp_android/libs/" + folder + "/libSkiaSharp.so", "native-builds/lib/android/" + folder);
}
});
@ -709,6 +709,7 @@ Task ("samples")
////////////////////////////////////////////////////////////////////////////////////////////////////
Task ("docs")
.IsDependentOn ("libs-base")
.IsDependentOn ("externals-genapi")
.Does (() =>
{
@ -792,15 +793,15 @@ Task ("clean-externals").Does (() =>
// all
CleanDirectories ("native-builds/lib");
// android
CleanDirectories ("native-builds/libskia_android/obj");
CleanDirectories ("native-builds/libskia_android/libs");
CleanDirectories ("native-builds/libSkiaSharp_android/obj");
CleanDirectories ("native-builds/libSkiaSharp_android/libs");
// ios
CleanDirectories ("native-builds/libskia_ios/build");
CleanDirectories ("native-builds/libSkiaSharp_ios/build");
// osx
CleanDirectories ("native-builds/libskia_osx/build");
CleanDirectories ("native-builds/libSkiaSharp_osx/build");
// windows
CleanDirectories ("native-builds/libskia_windows/Release");
CleanDirectories ("native-builds/libskia_windows/x64/Release");
CleanDirectories ("native-builds/libSkiaSharp_windows/Release");
CleanDirectories ("native-builds/libSkiaSharp_windows/x64/Release");
});
////////////////////////////////////////////////////////////////////////////////////////////////////

3
docs/en/SkiaSharp/SKAlphaType.xml
Просмотреть файл

@ -12,7 +12,8 @@
<Docs>
<summary>Describes how to interpret the alpha component of a pixel.</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
<Members>

173
docs/en/SkiaSharp/SKCanvas.xml
Просмотреть файл

@ -14,18 +14,22 @@
<summary>Encapsulates all of the state about drawing into a device (bitmap).</summary>
<remarks>
<para>Encapsulates all of the state about drawing into a device (bitmap).</para>
<para></para>
<para>
</para>
<para>This includes a reference to the device itself, and a stack of matrix/clip values. For any given draw call (e.g. drawRect), the geometry of the object being drawn is transformed by the concatenation of all the matrices in the stack. The transformed geometry is clipped by the intersection of all of the clips in the stack.</para>
<para></para>
<para>
</para>
<para>While the Canvas holds the state of the drawing device, the state (style) of the object being drawn is held by the Paint, which is provided as a parameter to each of the draw() methods. The Paint holds attributes such as color, typeface, the text size, the stroke width, the shader (for example, gradients, patterns), etc.</para>
<para></para>
<para>
</para>
<para>The SkCanvas is returned when accessing the <see cref="P:SkiaSharp.SKSurface.Canvas" /> property of a surface.</para>
<para>Transformations</para>
<para>The <see cref="T:SkiaSharp.SKCanvas" /> supports a number of 2D transformations.   Unlike other 2D graphic systems like CoreGraphics or Cairo, SKCanvas extends the transformations to include perspectives.   </para>
<para>You can use the <see cref="M:SkiaSharp.SKCanvas.Scale" />, <see cref="M:SkiaSharp.SKCanvas.Skew" />, <see cref="M:SkiaSharp.SKCanvas.Translate" />, <see cref="M:SkiaSharp.SKCanvas.RotateDegrees" />, <see cref="M:SkiaSharp.SKCanvas.RotateRadians" /> to perform some of the most common 2D transformations.   </para>
<para>For more control you can use the <see cref="M:SkiaSharp.SKCanvas.SetMatrix" /> to set an arbitrary transformation using the <see cref="T:SkiaSharp.SKMatrix" /> and the <see cref="M:SkiaSharp.SKCanvas.Concat" /> to concatenate an <see cref="T:SkiaSharp.SKMatrix" /> transformation to the current matrix in use.</para>
<para>The <see cref="M:SkiaSharp.SKCanvas.ResetMatrix" /> can be used to reset the state of the matrix</para>
<para></para>
<para>
</para>
<para>Drawing</para>
<para>The drawing operations can take a <see cref="T:SkiaSharp.SKPaint" /> parameter to affect their drawing.  You use <see cref="T:SkiaSharp.SKPaint" /> objects to cache the style and color information to draw geometries, texts and bitmaps.</para>
<para>Clipping Path</para>
@ -33,9 +37,12 @@
<para>It is possible to save the current transformations by calling the <see cref="M:SkiaSharp.SKCanvas.Save" /> method which preserves the current transformation matrix, you can then alter the matrix and restore the previous state by using the <see cref="M:SkiaSharp.SKCanvas.Restore" /> or <see cref="M:SkiaSharp.SKCanvas.RestoreToCount" /> methods.   </para>
<para>Additionally, it is possible to push a new state with <see cref="M:SkiaSharp.SKCanvas.SaveLayer" /> which will make an offscreen copy of a region, and once the drawing is completed, calling the <see cref="M:SkiaSharp.SKCanvas.Restore" /> method which copies the offscreen bitmap into this canvas.</para>
<para>The example below shows a typical use:</para>
<para></para>
<para></para>
<para></para>
<para>
</para>
<para>
</para>
<para>
</para>
<example>
<code lang="C#"><![CDATA[using (var surface = SKSurface.Create (width: 640, height: 480, SKColorType.N_32, SKAlphaType.Premul)) {
SKCanvas canvas = surface.Canvas;
@ -121,7 +128,6 @@
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
@ -135,13 +141,35 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="ClipPath">
<MemberSignature Language="C#" Value="public void ClipPath (SkiaSharp.SKPath path, SkiaSharp.SKRegionOperation operation = SkiaSharp.SKRegionOperation.Intersect, bool antialias = false);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance void ClipPath(class SkiaSharp.SKPath path, valuetype SkiaSharp.SKRegionOperation operation, bool antialias) cil managed" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="path" Type="SkiaSharp.SKPath" />
<Parameter Name="operation" Type="SkiaSharp.SKRegionOperation" />
<Parameter Name="antialias" Type="System.Boolean" />
</Parameters>
<Docs>
<param name="path">To be added.</param>
<param name="operation">To be added.</param>
<param name="antialias">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="ClipRect">
<MemberSignature Language="C#" Value="public void ClipRect (SkiaSharp.SKRect rect);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance void ClipRect(valuetype SkiaSharp.SKRect rect) cil managed" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
@ -157,6 +185,29 @@
</remarks>
</Docs>
</Member>
<Member MemberName="ClipRect">
<MemberSignature Language="C#" Value="public void ClipRect (SkiaSharp.SKRect rect, SkiaSharp.SKRegionOperation operation = SkiaSharp.SKRegionOperation.Intersect, bool antialias = false);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance void ClipRect(valuetype SkiaSharp.SKRect rect, valuetype SkiaSharp.SKRegionOperation operation, bool antialias) cil managed" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="rect" Type="SkiaSharp.SKRect" />
<Parameter Name="operation" Type="SkiaSharp.SKRegionOperation" />
<Parameter Name="antialias" Type="System.Boolean" />
</Parameters>
<Docs>
<param name="rect">To be added.</param>
<param name="operation">To be added.</param>
<param name="antialias">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Concat">
<MemberSignature Language="C#" Value="public void Concat (ref SkiaSharp.SKMatrix m);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Concat(valuetype SkiaSharp.SKMatrix m) cil managed" />
@ -275,7 +326,8 @@
<param name="mode">The transfer mode for the color.</param>
<summary>Fills the current clipping path with the specified color using the specified transfer mode.</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -473,7 +525,8 @@
<param name="paint">The paint used to draw the picture, or <see langword="null" />.</param>
<summary>Draws a picture on the canvas.</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -578,15 +631,20 @@
<summary>Draws an array of points, lines or a polygon in the canvas.</summary>
<remarks>
<para>For all modes, the count parameter is interpreted as the total number of points. For kLine mode, count/2 line segments are drawn.</para>
<para></para>
<para>
</para>
<para>For point mode, each point is drawn centered at its coordinate, and its size is specified by the paint's stroke-width. It draws as a square, unless the paint's cap-type is round, in which the points are drawn as circles.</para>
<para></para>
<para>
</para>
<para>For line mode, each pair of points is drawn as a line segment, respecting the paint's settings for cap, join and width. </para>
<para></para>
<para>
</para>
<para>For polygon mode, the entire array is drawn as a series of connected line segments.</para>
<para></para>
<para>
</para>
<para>Note that, while similar, the line and polygon modes draw slightly differently than the equivalent path built with a series of move to, line to calls, in that the path will draw all of its contours at once, with no interactions if contours intersect each other (think XOR xfermode).  DrawPoints always draws each element one at a time.</para>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -614,6 +672,31 @@
</remarks>
</Docs>
</Member>
<Member MemberName="DrawRoundRect">
<MemberSignature Language="C#" Value="public void DrawRoundRect (SkiaSharp.SKRect rect, float rx, float ry, SkiaSharp.SKPaint paint);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance void DrawRoundRect(valuetype SkiaSharp.SKRect rect, float32 rx, float32 ry, class SkiaSharp.SKPaint paint) cil managed" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="rect" Type="SkiaSharp.SKRect" />
<Parameter Name="rx" Type="System.Single" />
<Parameter Name="ry" Type="System.Single" />
<Parameter Name="paint" Type="SkiaSharp.SKPaint" />
</Parameters>
<Docs>
<param name="rect">To be added.</param>
<param name="rx">To be added.</param>
<param name="ry">To be added.</param>
<param name="paint">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="DrawText">
<MemberSignature Language="C#" Value="public void DrawText (string text, SkiaSharp.SKPoint[] points, SkiaSharp.SKPaint paint);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance void DrawText(string text, valuetype SkiaSharp.SKPoint[] points, class SkiaSharp.SKPaint paint) cil managed" />
@ -665,7 +748,8 @@
<summary>Draws text from a UTF-8 buffer at specified locations on the canvas.</summary>
<remarks>
<para>Draw the text, with each character/glyph origin specified by the <paramref name="points" /> array. The origin is interpreted by the Align setting in the paint.</para>
<para></para>
<para>
</para>
<para>The <paramref name="buffer" /> parameter is a pointer to a region in memory that contains a UTF-8 encoded block of text.   This only consumes up to <paramref name="length" /> bytes from the buffer.</para>
</remarks>
</Docs>
@ -761,7 +845,8 @@
<summary>Draws text encoded in a UTF-8 buffer on the canvas.</summary>
<remarks>
<para>Draws the <paramref name="text" />, with origin at (<paramref name="x" />,<paramref name="y" />), using the specified <paramref name="paint" />. The origin is interpreted based on the Align setting in the paint.</para>
<para></para>
<para>
</para>
<para>The <paramref name="buffer" /> parameter is a pointer to a region in memory that contains a UTF-8 encoded block of text.   This only consumes up to <paramref name="length" /> bytes from the buffer.</para>
</remarks>
</Docs>
@ -833,6 +918,46 @@
</remarks>
</Docs>
</Member>
<Member MemberName="GetClipBounds">
<MemberSignature Language="C#" Value="public bool GetClipBounds (ref SkiaSharp.SKRect bounds);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool GetClipBounds(valuetype SkiaSharp.SKRect bounds) cil managed" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>System.Boolean</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="bounds" Type="SkiaSharp.SKRect&amp;" RefType="ref" />
</Parameters>
<Docs>
<param name="bounds">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="GetClipDeviceBounds">
<MemberSignature Language="C#" Value="public bool GetClipDeviceBounds (ref SkiaSharp.SKRectI bounds);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool GetClipDeviceBounds(valuetype SkiaSharp.SKRectI bounds) cil managed" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>System.Boolean</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="bounds" Type="SkiaSharp.SKRectI&amp;" RefType="ref" />
</Parameters>
<Docs>
<param name="bounds">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="ResetMatrix">
<MemberSignature Language="C#" Value="public void ResetMatrix ();" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance void ResetMatrix() cil managed" />
@ -868,7 +993,8 @@
<summary>Restore the canvas state.</summary>
<remarks>
<para>This call balances a previous call to <see cref="M:SkiaSharp.SKCanvas.Save" />, and is used to remove all modifications to the matrix, clip and draw filter state since the last Save call.</para>
<para></para>
<para>
</para>
<para>It is an error to call Restore() more times than Save() was called.</para>
</remarks>
</Docs>
@ -915,7 +1041,8 @@
<param name="degrees">The number of degrees to rotate.</param>
<summary>Preconcat the current matrix with the specified rotation.</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -937,7 +1064,8 @@
<param name="radians">The number of radiants to rotate.</param>
<summary>Preconcat the current matrix with the specified rotation.</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -982,7 +1110,8 @@
<para>This will equal the number of Save calls minus Retore calls + 1. The save count on a new canvas is 1.</para>
</value>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>

17
docs/en/SkiaSharp/SKData.xml
Просмотреть файл

@ -134,23 +134,6 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="FromMallocMemory">
<MemberSignature Language="C#" Value="public static SkiaSharp.SKData FromMallocMemory (byte[] bytes);" />
<MemberSignature Language="ILAsm" Value=".method public static hidebysig class SkiaSharp.SKData FromMallocMemory(unsigned int8[] bytes) cil managed" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>SkiaSharp.SKData</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="bytes" Type="System.Byte[]" />
</Parameters>
<Docs>
<param name="bytes">To be added.</param>
<summary>Deprecated</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="FromMallocMemory">
<MemberSignature Language="C#" Value="public static SkiaSharp.SKData FromMallocMemory (IntPtr bytes, ulong length);" />
<MemberSignature Language="ILAsm" Value=".method public static hidebysig class SkiaSharp.SKData FromMallocMemory(native int bytes, unsigned int64 length) cil managed" />

3
docs/en/SkiaSharp/SKFilterQuality.xml
Просмотреть файл

@ -12,7 +12,8 @@
<Docs>
<summary>Filter quality settings.</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
<Members>

9
docs/en/SkiaSharp/SKFontMetrics.xml
Просмотреть файл

@ -13,7 +13,8 @@
<Docs>
<summary>Structure to represent measurements for a font.</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
<Members>
@ -227,7 +228,8 @@
<summary>The maximum bounding box x value for all glyphs.</summary>
<value>The maximum bounding box x value for all glyphs.</value>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -246,7 +248,8 @@
<summary>The minimum bounding box x value for all glyphs.</summary>
<value>The minimum bounding box x value for all glyphs.</value>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>

9
docs/en/SkiaSharp/SKImageDecoder.xml
Просмотреть файл

@ -154,7 +154,8 @@
<returns>
<paramref name="true" /> on success, <paramref name="false" /> on failure.</returns>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -186,7 +187,8 @@
<returns>
<paramref name="true" /> on success, <paramref name="false" /> on failure.</returns>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -502,7 +504,8 @@
<Docs>
<summary>Controls whether the decoder attempts to dither the image.</summary>
<value>
<para></para>
<para>
</para>
</value>
<remarks>The default setting is <paramref name="true" />.</remarks>
</Docs>

3
docs/en/SkiaSharp/SKImageDecoderFormat.xml
Просмотреть файл

@ -12,7 +12,8 @@
<Docs>
<summary>Decoder file format</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
<Members>

3
docs/en/SkiaSharp/SKImageInfo.xml
Просмотреть файл

@ -13,7 +13,8 @@
<Docs>
<summary>Describe an image's dimensions and pixel type.</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
<Members>

6
docs/en/SkiaSharp/SKManagedStream.xml
Просмотреть файл

@ -14,8 +14,10 @@
<summary>Wraps a <see cref="T:System.IO.Stream" /> into a <see cref="T:SkiaSharp.SKStreamAsset" /> (a seekable, rewindable Skia Stream)</summary>
<remarks>
<para>The following example shows how to wrap a <see cref="T:System.IO.Stream" /> that represents a stream into an embedded resource in an assembly and use it with Skia APIs that use resources:</para>
<para></para>
<para></para>
<para>
</para>
<para>
</para>
<example>
<code lang="C#"><![CDATA[public static void BitmapShader (SKCanvas canvas, int width, int height)
{

30
docs/en/SkiaSharp/SKPaint.xml
Просмотреть файл

@ -52,7 +52,8 @@
<summary>Measure the text, stopping early if the measured width exceeds <paramref name="maxWidth" />.</summary>
<returns>Return the number of characters of text that were measured. </returns>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -76,16 +77,19 @@
<param name="text">The text to be measured</param>
<param name="maxWidth">
<para>Maximum width. Only the subset of text whose accumulated widths are &lt;= <paramref name="maxWidth" /> are measured.</para>
<para></para>
<para>
</para>
</param>
<param name="measuredWidth">Returns the actual width of the measured text</param>
<summary>
<para>Measure the text, stopping early if the measured width exceeds <paramref name="maxWidth" />.</para>
<para></para>
<para>
</para>
</summary>
<returns>Return the number of characters of text that were measured. </returns>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -130,7 +134,8 @@
<Docs>
<summary>The paint’s color.</summary>
<value>
<para></para>
<para>
</para>
</value>
<remarks>
<para>Note that the color is a 32bit value containing alpha as well as r,g,b. This 32bit value is not premultiplied, meaning that its alpha can be any value, regardless of the values of r,g,b.</para>
@ -190,7 +195,8 @@
</summary>
<value>The <see cref="T:SkiaSharp.SKFilterQuality" /> of the current paint.</value>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -233,7 +239,8 @@
<summary>Return the path (outline) for the specified text.</summary>
<returns>A <see cref="T:SkiaSharp.SKPath" /> containing the outline of the text.</returns>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -259,7 +266,8 @@
<summary>Return the path (outline) for the specified text.</summary>
<returns>A <see cref="T:SkiaSharp.SKPath" /> containing the outline of the text.</returns>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -285,7 +293,8 @@
<summary>Return the path (outline) for the specified text.</summary>
<returns>A <see cref="T:SkiaSharp.SKPath" /> containing the outline of the text.</returns>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -313,7 +322,8 @@
<summary>Return the path (outline) for the specified text.</summary>
<returns>A <see cref="T:SkiaSharp.SKPath" /> containing the outline of the text.</returns>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>

50
docs/en/SkiaSharp/SKPath.xml
Просмотреть файл

@ -33,6 +33,22 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public SKPath (SkiaSharp.SKPath path);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(class SkiaSharp.SKPath path) cil managed" />
<MemberType>Constructor</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<Parameters>
<Parameter Name="path" Type="SkiaSharp.SKPath" />
</Parameters>
<Docs>
<param name="path">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="AddArc">
<MemberSignature Language="C#" Value="public void AddArc (SkiaSharp.SKRect oval, float startAngle, float sweepAngle);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance void AddArc(valuetype SkiaSharp.SKRect oval, float32 startAngle, float32 sweepAngle) cil managed" />
@ -78,7 +94,8 @@
<param name="direction">The direction to wind the oval's contour.</param>
<summary>Adds an oval to the current path.</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -175,7 +192,8 @@
<summary>Add a conic path from the last point.</summary>
<remarks>
<para> If no <see cref="M:SkiaSharp.SKPath.MoveTo" /> call has been made for this contour, the first point is automatically set to (0,0).</para>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -324,7 +342,8 @@
<param name="y">The y-coordinate of the start of a new contour</param>
<summary>Set the beginning of the next contour to the point.</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -415,7 +434,8 @@
<summary>Same as <see cref="M:SkiaSharp.SKPath.CubicTo" /> but the coordinates are considered relative to the last point on this contour.</summary>
<remarks>
<para> If no <see cref="M:SkiaSharp.SKPath.MoveTo" /> call has been made for this contour, the first point is automatically set to (0,0).</para>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -459,7 +479,8 @@
<param name="dy">The amount to add to the x-coordinate of the last point on this contour, to specify the start of a new contour.</param>
<summary>Same as <see cref="M:SkiaSharp.SKPath.MoveTo" /> but the coordinates are considered relative to the last point on this contour.</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -488,5 +509,24 @@
<remarks> If no <see cref="M:SkiaSharp.SKPath.MoveTo" /> call has been made for this contour, the first point is automatically set to (0,0).</remarks>
</Docs>
</Member>
<Member MemberName="Transform">
<MemberSignature Language="C#" Value="public void Transform (SkiaSharp.SKMatrix matrix);" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Transform(valuetype SkiaSharp.SKMatrix matrix) cil managed" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="matrix" Type="SkiaSharp.SKMatrix" />
</Parameters>
<Docs>
<param name="matrix">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
</Members>
</Type>

24
docs/en/SkiaSharp/SKPoint.xml
Просмотреть файл

@ -363,18 +363,6 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="X">
<MemberSignature Language="C#" Value="public float X;" />
<MemberSignature Language="ILAsm" Value=".field public float32 X" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Single</ReturnType>
</ReturnValue>
<Docs>
<summary>The X component of the point.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="X">
<MemberSignature Language="C#" Value="public float X { get; set; }" />
<MemberSignature Language="ILAsm" Value=".property instance float32 X" />
@ -392,18 +380,6 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Y">
<MemberSignature Language="C#" Value="public float Y;" />
<MemberSignature Language="ILAsm" Value=".field public float32 Y" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Single</ReturnType>
</ReturnValue>
<Docs>
<summary>The Y component of the point.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Y">
<MemberSignature Language="C#" Value="public float Y { get; set; }" />
<MemberSignature Language="ILAsm" Value=".property instance float32 Y" />

36
docs/en/SkiaSharp/SKPoint3.xml
Просмотреть файл

@ -172,18 +172,6 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="X">
<MemberSignature Language="C#" Value="public float X;" />
<MemberSignature Language="ILAsm" Value=".field public float32 X" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Single</ReturnType>
</ReturnValue>
<Docs>
<summary>The X component of the point.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="X">
<MemberSignature Language="C#" Value="public float X { get; set; }" />
<MemberSignature Language="ILAsm" Value=".property instance float32 X" />
@ -201,18 +189,6 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Y">
<MemberSignature Language="C#" Value="public float Y;" />
<MemberSignature Language="ILAsm" Value=".field public float32 Y" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Single</ReturnType>
</ReturnValue>
<Docs>
<summary>The Y component of the point.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Y">
<MemberSignature Language="C#" Value="public float Y { get; set; }" />
<MemberSignature Language="ILAsm" Value=".property instance float32 Y" />
@ -230,18 +206,6 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Z">
<MemberSignature Language="C#" Value="public float Z;" />
<MemberSignature Language="ILAsm" Value=".field public float32 Z" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Single</ReturnType>
</ReturnValue>
<Docs>
<summary>The Z component of the point.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Z">
<MemberSignature Language="C#" Value="public float Z { get; set; }" />
<MemberSignature Language="ILAsm" Value=".property instance float32 Z" />

6
docs/en/SkiaSharp/SKPointI.xml
Просмотреть файл

@ -207,7 +207,8 @@
<param name="dy">The amount to offset the y-coordinate.</param>
<summary>Translates this <see cref="T:SkiaSharp.SKPointI" /> by the specified amount.</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
</Member>
@ -341,7 +342,8 @@
<param name="pt">The <see cref="T:SkiaSharp.SKPointI" /> to translate.</param>
<param name="sz">
<para>The <see cref="T:SkiaSharp.SKSizeI" /> that specifies the numbers to subtract from the coordinates of <paramref name="pt" />.</para>
<para></para>
<para>
</para>
</param>
<summary>Translates a <see cref="T:SkiaSharp.SKPointI" /> by the negative of a given <see cref="T:SkiaSharp.SKSizeI" /> added.</summary>
<returns>The translated <see cref="T:SkiaSharp.SKPointI" />.</returns>

101
docs/en/SkiaSharp/SKRegionOperation.xml Normal file
Просмотреть файл

@ -0,0 +1,101 @@
<Type Name="SKRegionOperation" FullName="SkiaSharp.SKRegionOperation">
<TypeSignature Language="C#" Value="public enum SKRegionOperation" />
<TypeSignature Language="ILAsm" Value=".class public auto ansi sealed SKRegionOperation extends System.Enum" />
<AssemblyInfo>
<AssemblyName>SkiaSharp</AssemblyName>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.Enum</BaseTypeName>
</Base>
<Docs>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
<Members>
<Member MemberName="Difference">
<MemberSignature Language="C#" Value="Difference" />
<MemberSignature Language="ILAsm" Value=".field public static literal valuetype SkiaSharp.SKRegionOperation Difference = int32(0)" />
<MemberType>Field</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>SkiaSharp.SKRegionOperation</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
</Docs>
</Member>
<Member MemberName="Intersect">
<MemberSignature Language="C#" Value="Intersect" />
<MemberSignature Language="ILAsm" Value=".field public static literal valuetype SkiaSharp.SKRegionOperation Intersect = int32(1)" />
<MemberType>Field</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>SkiaSharp.SKRegionOperation</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
</Docs>
</Member>
<Member MemberName="Replace">
<MemberSignature Language="C#" Value="Replace" />
<MemberSignature Language="ILAsm" Value=".field public static literal valuetype SkiaSharp.SKRegionOperation Replace = int32(5)" />
<MemberType>Field</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>SkiaSharp.SKRegionOperation</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
</Docs>
</Member>
<Member MemberName="ReverseDifference">
<MemberSignature Language="C#" Value="ReverseDifference" />
<MemberSignature Language="ILAsm" Value=".field public static literal valuetype SkiaSharp.SKRegionOperation ReverseDifference = int32(4)" />
<MemberType>Field</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>SkiaSharp.SKRegionOperation</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
</Docs>
</Member>
<Member MemberName="Union">
<MemberSignature Language="C#" Value="Union" />
<MemberSignature Language="ILAsm" Value=".field public static literal valuetype SkiaSharp.SKRegionOperation Union = int32(2)" />
<MemberType>Field</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>SkiaSharp.SKRegionOperation</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
</Docs>
</Member>
<Member MemberName="XOR">
<MemberSignature Language="C#" Value="XOR" />
<MemberSignature Language="ILAsm" Value=".field public static literal valuetype SkiaSharp.SKRegionOperation XOR = int32(3)" />
<MemberType>Field</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>SkiaSharp.SKRegionOperation</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
</Docs>
</Member>
</Members>
</Type>

3
docs/en/SkiaSharp/SKShader.xml
Просмотреть файл

@ -14,7 +14,8 @@
<summary>Shaders specify the source color(s) for what is being drawn in the <see cref="T:SkiaSharp.SKPaint" />.</summary>
<remarks>
<para>Shaders specify the source color(s) for what is being drawn. If a paint has no shader, then the paint's color is used. If the paint has a shader, then the shader's color(s) are use instead, but they are modulated by the paint's alpha. </para>
<para></para>
<para>
</para>
<para>This makes it easy to create a shader once (e.g. bitmap tiling or gradient) and then change its transparency w/o having to modify the original shader, only the paint's alpha needs to be modified.</para>
</remarks>
</Docs>

16
docs/en/SkiaSharp/SKSurfaceProps.xml
Просмотреть файл

@ -20,13 +20,27 @@
</remarks>
</Docs>
<Members>
<Member MemberName="PixelGeometry">
<MemberSignature Language="C#" Value="public SkiaSharp.SKPixelGeometry PixelGeometry;" />
<MemberSignature Language="ILAsm" Value=".field public valuetype SkiaSharp.SKPixelGeometry PixelGeometry" />
<MemberType>Field</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>SkiaSharp.SKPixelGeometry</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="PixelGeometry">
<MemberSignature Language="C#" Value="public SkiaSharp.SKPixelGeometry PixelGeometry { get; set; }" />
<MemberSignature Language="ILAsm" Value=".property instance valuetype SkiaSharp.SKPixelGeometry PixelGeometry" />
<MemberType>Property</MemberType>
<AssemblyInfo>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<AssemblyVersion>1.49.0.0</AssemblyVersion>
</AssemblyInfo>
<ReturnValue>
<ReturnType>SkiaSharp.SKPixelGeometry</ReturnType>

12
docs/en/SkiaSharp/SKTypeface.xml
Просмотреть файл

@ -15,9 +15,11 @@
<remarks>
<para>The SkTypeface class specifies the typeface and intrinsic style of a font.</para>
<para>This is used in the paint, along with optionally algorithmic settings like textSize, textSkewX, textScaleX, kFakeBoldText_Mask, to specifyhow text appears when drawn (and measured).</para>
<para></para>
<para>
</para>
<para>Typeface objects are immutable, and so they can be shared between threads.</para>
<para></para>
<para>
</para>
</remarks>
</Docs>
<Members>
@ -186,7 +188,8 @@
<param name="index">The font face index.</param>
<summary>Return a new typeface given a file. </summary>
<returns>
<para></para>
<para>
</para>
</returns>
<remarks>
<para>If the file does not exist, or is not a valid font file, returns <paramref name="null" />.</para>
@ -214,7 +217,8 @@
<summary>Return a new typeface given a stream. </summary>
<returns>If the stream is not a valid font file, returns <paramref name="null" />. </returns>
<remarks>
<para></para>
<para>
</para>
<example>
<code lang="C#"><![CDATA[using (var stream = new SKFileStream (“myfont.ttf"))
using (var tf = SKTypeface.FromStream (stream)) {

3
docs/en/SkiaSharp/SkiaExtensions.xml
Просмотреть файл

@ -13,7 +13,8 @@
<Docs>
<summary>Convenience methods for <see cref="T:SkiaSharp.SKPixelGeometry" />.</summary>
<remarks>
<para></para>
<para>
</para>
</remarks>
</Docs>
<Members>

10
docs/en/index.xml
Просмотреть файл

@ -3,7 +3,7 @@
<Assembly Name="SkiaSharp" Version="1.49.0.0">
<Attributes>
<Attribute>
<AttributeName>System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.DisableOptimizations | System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints)</AttributeName>
<AttributeName>System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints)</AttributeName>
</Attribute>
<Attribute>
<AttributeName>System.Reflection.AssemblyCompany("")</AttributeName>
@ -18,10 +18,10 @@
<AttributeName>System.Reflection.AssemblyDescription("")</AttributeName>
</Attribute>
<Attribute>
<AttributeName>System.Reflection.AssemblyFileVersion("1.49.1.0")</AttributeName>
<AttributeName>System.Reflection.AssemblyFileVersion("1.49.3.0")</AttributeName>
</Attribute>
<Attribute>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.49.1.0")</AttributeName>
<AttributeName>System.Reflection.AssemblyInformationalVersion("1.49.3.0")</AttributeName>
</Attribute>
<Attribute>
<AttributeName>System.Reflection.AssemblyProduct("SkiaSharp")</AttributeName>
@ -35,9 +35,6 @@
<Attribute>
<AttributeName>System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true)</AttributeName>
</Attribute>
<Attribute>
<AttributeName>System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.5", FrameworkDisplayName="")</AttributeName>
</Attribute>
</Attributes>
</Assembly>
</Assemblies>
@ -93,6 +90,7 @@
<Type Name="SKPointMode" Kind="Enumeration" />
<Type Name="SKRect" Kind="Structure" />
<Type Name="SKRectI" Kind="Structure" />
<Type Name="SKRegionOperation" Kind="Enumeration" />
<Type Name="SKShader" Kind="Class" />
<Type Name="SKShaderTileMode" Kind="Enumeration" />
<Type Name="SKSize" Kind="Structure" />

0
native-builds/libskia_android/.gitignore → native-builds/libSkiaSharp_android/.gitignore поставляемый
Просмотреть файл

2
native-builds/libskia_android/jni/Android.mk → native-builds/libSkiaSharp_android/jni/Android.mk
Просмотреть файл

@ -1,3 +1,3 @@
LOCAL_PATH:= $(call my-dir)
include jni/skia_android.mk
include jni/SkiaSharp.mk

0
native-builds/libskia_android/jni/Application.mk → native-builds/libSkiaSharp_android/jni/Application.mk
Просмотреть файл

2
native-builds/libskia_android/jni/skia_android.mk → native-builds/libSkiaSharp_android/jni/SkiaSharp.mk
Просмотреть файл

@ -16,7 +16,7 @@ LOCAL_STATIC_LIBRARIES := libskia_ports libskia_skgpu libskia_images libskia_opt
LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv2 -lz
LOCAL_MODULE := skia_android
LOCAL_MODULE := SkiaSharp
LOCAL_C_INCLUDES := ../../skia/src/c ../../skia/include/c ../../skia/include/core ../../skia/include/config ../../skia/include/images

0
native-builds/libskia_android/jni/skia_prebuilt.mk → native-builds/libSkiaSharp_android/jni/skia_prebuilt.mk
Просмотреть файл

36
native-builds/libskia_ios/libskia_ios.xcodeproj/project.pbxproj → native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj/project.pbxproj
Просмотреть файл

@ -7,7 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
21FD2B341C014C000023CFAE /* libskia_ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 21FD2B331C014C000023CFAE /* libskia_ios.h */; settings = {ATTRIBUTES = (Public, ); }; };
21FD2B341C014C000023CFAE /* libSkiaSharp.h in Headers */ = {isa = PBXBuildFile; fileRef = 21FD2B331C014C000023CFAE /* libSkiaSharp.h */; settings = {ATTRIBUTES = (Public, ); }; };
21FD2D831C0165370023CFAE /* libskia_core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 21FD2D0E1C015ED70023CFAE /* libskia_core.a */; };
21FD2D841C0165510023CFAE /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 21FD2D411C015F780023CFAE /* libc++.tbd */; };
21FD2D871C0165880023CFAE /* libskia_skgpu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 21FD2D141C015ED70023CFAE /* libskia_skgpu.a */; };
@ -332,8 +332,8 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
21FD2B301C014C000023CFAE /* libskia_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libskia_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; };
21FD2B331C014C000023CFAE /* libskia_ios.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libskia_ios.h; sourceTree = "<group>"; };
21FD2B301C014C000023CFAE /* libSkiaSharp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libSkiaSharp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
21FD2B331C014C000023CFAE /* libSkiaSharp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libSkiaSharp.h; sourceTree = "<group>"; };
21FD2B351C014C000023CFAE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
21FD2CE11C015ED60023CFAE /* codec_android.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec_android.xcodeproj; path = ../../skia/out/gyp/codec_android.xcodeproj; sourceTree = "<group>"; };
21FD2CE41C015ED60023CFAE /* codec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec.xcodeproj; path = ../../skia/out/gyp/codec.xcodeproj; sourceTree = "<group>"; };
@ -413,7 +413,7 @@
21FD2B311C014C000023CFAE /* Products */ = {
isa = PBXGroup;
children = (
21FD2B301C014C000023CFAE /* libskia_ios.framework */,
21FD2B301C014C000023CFAE /* libSkiaSharp.framework */,
);
name = Products;
sourceTree = "<group>";
@ -428,11 +428,11 @@
340303DA1C40877300630F26 /* sk_xamarin.cpp */,
3403038B1C404F6B00630F26 /* sk_xamarin.h */,
343DAE451C3F285700FAD826 /* SkiaKeeper.c */,
21FD2B331C014C000023CFAE /* libskia_ios.h */,
21FD2B331C014C000023CFAE /* libSkiaSharp.h */,
21FD2B351C014C000023CFAE /* Info.plist */,
);
name = Source;
path = libskia_ios;
path = libSkiaSharp;
sourceTree = "<group>";
};
21FD2B3B1C014C110023CFAE /* skia_libs */ = {
@ -602,7 +602,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
21FD2B341C014C000023CFAE /* libskia_ios.h in Headers */,
21FD2B341C014C000023CFAE /* libSkiaSharp.h in Headers */,
3403038C1C404F6B00630F26 /* sk_xamarin.h in Headers */,
340303971C4053E500630F26 /* SkManagedStream.h in Headers */,
340303951C4053E500630F26 /* sk_managedstream.h in Headers */,
@ -612,9 +612,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
21FD2B2F1C014C000023CFAE /* libskia_ios */ = {
21FD2B2F1C014C000023CFAE /* libSkiaSharp */ = {
isa = PBXNativeTarget;
buildConfigurationList = 21FD2B381C014C000023CFAE /* Build configuration list for PBXNativeTarget "libskia_ios" */;
buildConfigurationList = 21FD2B381C014C000023CFAE /* Build configuration list for PBXNativeTarget "libSkiaSharp" */;
buildPhases = (
21FD2B2B1C014C000023CFAE /* Sources */,
21FD2B2C1C014C000023CFAE /* Frameworks */,
@ -638,9 +638,9 @@
21FD2D861C0165810023CFAE /* PBXTargetDependency */,
21FD2D821C0165310023CFAE /* PBXTargetDependency */,
);
name = libskia_ios;
productName = libskia_ios;
productReference = 21FD2B301C014C000023CFAE /* libskia_ios.framework */;
name = libSkiaSharp;
productName = libSkiaSharp;
productReference = 21FD2B301C014C000023CFAE /* libSkiaSharp.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */
@ -657,7 +657,7 @@
};
};
};
buildConfigurationList = 21FD2B2A1C014C000023CFAE /* Build configuration list for PBXProject "libskia_ios" */;
buildConfigurationList = 21FD2B2A1C014C000023CFAE /* Build configuration list for PBXProject "libSkiaSharp" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
@ -731,7 +731,7 @@
);
projectRoot = "";
targets = (
21FD2B2F1C014C000023CFAE /* libskia_ios */,
21FD2B2F1C014C000023CFAE /* libSkiaSharp */,
);
};
/* End PBXProject section */
@ -1151,7 +1151,7 @@
../../skia/include/core,
../../skia/include/config,
);
INFOPLIST_FILE = libskia_ios/Info.plist;
INFOPLIST_FILE = libSkiaSharp/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = ../ios;
@ -1181,7 +1181,7 @@
../../skia/include/core,
../../skia/include/config,
);
INFOPLIST_FILE = libskia_ios/Info.plist;
INFOPLIST_FILE = libSkiaSharp/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = ../ios;
@ -1201,7 +1201,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
21FD2B2A1C014C000023CFAE /* Build configuration list for PBXProject "libskia_ios" */ = {
21FD2B2A1C014C000023CFAE /* Build configuration list for PBXProject "libSkiaSharp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
21FD2B361C014C000023CFAE /* Debug */,
@ -1210,7 +1210,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
21FD2B381C014C000023CFAE /* Build configuration list for PBXNativeTarget "libskia_ios" */ = {
21FD2B381C014C000023CFAE /* Build configuration list for PBXNativeTarget "libSkiaSharp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
21FD2B391C014C000023CFAE /* Debug */,

0
native-builds/libskia_ios/libskia_ios/Info.plist → native-builds/libSkiaSharp_ios/libSkiaSharp/Info.plist
Просмотреть файл

19
native-builds/libSkiaSharp_ios/libSkiaSharp/libSkiaSharp.h Normal file
Просмотреть файл

@ -0,0 +1,19 @@
//
// libSkiaSharp.h
// libSkiaSharp
//
// Created by Bill Holmes on 11/21/15.
// Copyright © 2015 Xamarin. All rights reserved.
//
#import <UIKit/UIKit.h>
//! Project version number for libSkiaSharp.
FOUNDATION_EXPORT double libSkiaSharpVersionNumber;
//! Project version string for libSkiaSharp.
FOUNDATION_EXPORT const unsigned char libSkiaSharpVersionString[];
// In this header, you should import all the public headers of your framework using statements like #import <libSkiaSharp/PublicHeader.h>

22
native-builds/libskia_osx/libskia_osx.xcodeproj/project.pbxproj → native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj
Просмотреть файл

@ -389,7 +389,7 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
21C951551C03D27A003A1E1D /* libskia_osx.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libskia_osx.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
21C951551C03D27A003A1E1D /* libSkiaSharp.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSkiaSharp.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
21C951661C03D363003A1E1D /* sfnt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sfnt.xcodeproj; path = ../../skia/out/gyp/sfnt.xcodeproj; sourceTree = "<group>"; };
21C9516C1C03D36D003A1E1D /* core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = core.xcodeproj; path = ../../skia/out/gyp/core.xcodeproj; sourceTree = "<group>"; };
21C951781C03D380003A1E1D /* effects.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = effects.xcodeproj; path = ../../skia/out/gyp/effects.xcodeproj; sourceTree = "<group>"; };
@ -468,7 +468,7 @@
21C951561C03D27A003A1E1D /* Products */ = {
isa = PBXGroup;
children = (
21C951551C03D27A003A1E1D /* libskia_osx.dylib */,
21C951551C03D27A003A1E1D /* libSkiaSharp.dylib */,
);
name = Products;
sourceTree = "<group>";
@ -661,9 +661,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
21C951541C03D27A003A1E1D /* libskia_osx */ = {
21C951541C03D27A003A1E1D /* libSkiaSharp */ = {
isa = PBXNativeTarget;
buildConfigurationList = 21C9515E1C03D27A003A1E1D /* Build configuration list for PBXNativeTarget "libskia_osx" */;
buildConfigurationList = 21C9515E1C03D27A003A1E1D /* Build configuration list for PBXNativeTarget "libSkiaSharp" */;
buildPhases = (
21C951511C03D27A003A1E1D /* Sources */,
21C951521C03D27A003A1E1D /* Frameworks */,
@ -689,9 +689,9 @@
21C951AA1C03D3AE003A1E1D /* PBXTargetDependency */,
21C951A81C03D3A7003A1E1D /* PBXTargetDependency */,
);
name = libskia_osx;
productName = libskia_osx;
productReference = 21C951551C03D27A003A1E1D /* libskia_osx.dylib */;
name = libSkiaSharp;
productName = libSkiaSharp;
productReference = 21C951551C03D27A003A1E1D /* libSkiaSharp.dylib */;
productType = "com.apple.product-type.library.dynamic";
};
/* End PBXNativeTarget section */
@ -708,7 +708,7 @@
};
};
};
buildConfigurationList = 21C951501C03D27A003A1E1D /* Build configuration list for PBXProject "libskia_osx" */;
buildConfigurationList = 21C951501C03D27A003A1E1D /* Build configuration list for PBXProject "libSkiaSharp" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
@ -778,7 +778,7 @@
);
projectRoot = "";
targets = (
21C951541C03D27A003A1E1D /* libskia_osx */,
21C951541C03D27A003A1E1D /* libSkiaSharp */,
);
};
/* End PBXProject section */
@ -1261,7 +1261,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
21C951501C03D27A003A1E1D /* Build configuration list for PBXProject "libskia_osx" */ = {
21C951501C03D27A003A1E1D /* Build configuration list for PBXProject "libSkiaSharp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
21C9515C1C03D27A003A1E1D /* Debug */,
@ -1270,7 +1270,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
21C9515E1C03D27A003A1E1D /* Build configuration list for PBXNativeTarget "libskia_osx" */ = {
21C9515E1C03D27A003A1E1D /* Build configuration list for PBXNativeTarget "libSkiaSharp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
21C9515F1C03D27A003A1E1D /* Debug */,

2
native-builds/libskia_uwp/libskia_uwp.vcxproj → native-builds/libSkiaSharp_uwp/libSkiaSharp.vcxproj
Просмотреть файл

@ -29,7 +29,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{93d08eb4-1cbc-4268-9394-795012182731}</ProjectGuid>
<Keyword>DynamicLibrary</Keyword>
<RootNamespace>libskia_uwp</RootNamespace>
<RootNamespace>libSkiaSharp</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>

2
native-builds/libskia_uwp/libskia_uwp_ARM.sln → native-builds/libSkiaSharp_uwp/libSkiaSharp_ARM.sln
Просмотреть файл

@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libskia_uwp", "libskia_uwp.vcxproj", "{93D08EB4-1CBC-4268-9394-795012182731}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkiaSharp", "libSkiaSharp.vcxproj", "{93D08EB4-1CBC-4268-9394-795012182731}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skia", "skia", "{38E1A434-8032-4721-8B8A-F4283BB56DAB}"
EndProject

2
native-builds/libskia_uwp/libskia_uwp_x64.sln → native-builds/libSkiaSharp_uwp/libSkiaSharp_x64.sln
Просмотреть файл

@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libskia_uwp", "libskia_uwp.vcxproj", "{93D08EB4-1CBC-4268-9394-795012182731}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkiaSharp", "libSkiaSharp.vcxproj", "{93D08EB4-1CBC-4268-9394-795012182731}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skia", "skia", "{38E1A434-8032-4721-8B8A-F4283BB56DAB}"
EndProject

2
native-builds/libskia_uwp/libskia_uwp_x86.sln → native-builds/libSkiaSharp_uwp/libSkiaSharp_x86.sln
Просмотреть файл

@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libskia_uwp", "libskia_uwp.vcxproj", "{93D08EB4-1CBC-4268-9394-795012182731}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkiaSharp", "libSkiaSharp.vcxproj", "{93D08EB4-1CBC-4268-9394-795012182731}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skia", "skia", "{38E1A434-8032-4721-8B8A-F4283BB56DAB}"
EndProject

2
native-builds/libskia_windows/libskia_windows.vcxproj → native-builds/libSkiaSharp_windows/libSkiaSharp.vcxproj
Просмотреть файл

@ -21,7 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{22B9B540-CC67-43B3-9341-336DEA7FC0EB}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libskia_windows</RootNamespace>
<RootNamespace>libSkiaSharp</RootNamespace>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>

2
native-builds/libskia_windows/libskia_windows_x64.sln → native-builds/libSkiaSharp_windows/libSkiaSharp_x64.sln
Просмотреть файл

@ -4,7 +4,7 @@ VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libskia_windows", "libskia_windows.vcxproj", "{22B9B540-CC67-43B3-9341-336DEA7FC0EB}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkiaSharp", "libSkiaSharp.vcxproj", "{22B9B540-CC67-43B3-9341-336DEA7FC0EB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skia", "skia", "{38E1A434-8032-4721-8B8A-F4283BB56DAB}"
EndProject

2
native-builds/libskia_windows/libskia_windows_x86.sln → native-builds/libSkiaSharp_windows/libSkiaSharp_x86.sln
Просмотреть файл

@ -4,7 +4,7 @@ VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libskia_windows", "libskia_windows.vcxproj", "{22B9B540-CC67-43B3-9341-336DEA7FC0EB}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkiaSharp", "libSkiaSharp.vcxproj", "{22B9B540-CC67-43B3-9341-336DEA7FC0EB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skia", "skia", "{38E1A434-8032-4721-8B8A-F4283BB56DAB}"
EndProject

19
native-builds/libskia_ios/libskia_ios/libskia_ios.h
Просмотреть файл

@ -1,19 +0,0 @@
//
// libskia_ios.h
// libskia_ios
//
// Created by Bill Holmes on 11/21/15.
// Copyright © 2015 Xamarin. All rights reserved.
//
#import <UIKit/UIKit.h>
//! Project version number for libskia_ios.
FOUNDATION_EXPORT double libskia_iosVersionNumber;
//! Project version string for libskia_ios.
FOUNDATION_EXPORT const unsigned char libskia_iosVersionString[];
// In this header, you should import all the public headers of your framework using statements like #import <libskia_ios/PublicHeader.h>

6
nuget/SkiaSharp.Mac.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Mac</id>
<title>SkiaSharp for OSX</title>
<version>1.49.2.1-beta</version>
<version>1.49.3.0-beta</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -33,10 +33,10 @@
<!-- .NET 4.5 -->
<file src="output/mac/SkiaSharp.Desktop.targets" target="build\net45\Xamarin.SkiaSharp.Mac.targets" />
<!-- .NET 4.5 (OS X) -->
<file src="output/mac/libskia_osx.dylib" target="build\net45\mac\libskia_osx.dylib" />
<file src="output/mac/libSkiaSharp.dylib" target="build\net45\mac\libSkiaSharp.dylib" />
<file src="output/mac/SkiaSharp.dll.config" target="build\net45\SkiaSharp.dll.config" />
<!-- OS X -->
<file src="output/osx/SkiaSharp.OSX.targets" target="build\XamarinMac\Xamarin.SkiaSharp.Mac.targets" />
<file src="output/osx/libskia_osx.dylib" target="build\XamarinMac\libskia_osx.dylib" />
<file src="output/osx/libSkiaSharp.dylib" target="build\XamarinMac\libSkiaSharp.dylib" />
</files>
</package>

12
nuget/SkiaSharp.Windows.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Windows</id>
<title>SkiaSharp for Windows</title>
<version>1.49.2.1-beta</version>
<version>1.49.3.0-beta</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -29,12 +29,12 @@
<!-- .NET 4.5 -->
<file src="output/windows/SkiaSharp.Desktop.targets" target="build\net45\SkiaSharp.Windows.targets" />
<!-- .NET 4.5 (Windows) -->
<file src="output/windows/x64/libskia_windows.dll" target="build\net45\x64\libskia_windows.dll" />
<file src="output/windows/x86/libskia_windows.dll" target="build\net45\x86\libskia_windows.dll" />
<file src="output/windows/x64/libSkiaSharp.dll" target="build\net45\x64\libSkiaSharp.dll" />
<file src="output/windows/x86/libSkiaSharp.dll" target="build\net45\x86\libSkiaSharp.dll" />
<!-- UWP -->
<file src="output/uwp/SkiaSharp.UWP.targets" target="build\uap10.0\SkiaSharp.Windows.targets" />
<file src="output/uwp/x64/libskia_uwp.dll" target="build\uap10.0\x64\libskia_uwp.dll" />
<file src="output/uwp/x86/libskia_uwp.dll" target="build\uap10.0\x86\libskia_uwp.dll" />
<file src="output/uwp/arm/libskia_uwp.dll" target="build\uap10.0\arm\libskia_uwp.dll" />
<file src="output/uwp/x64/libSkiaSharp.dll" target="build\uap10.0\x64\libSkiaSharp.dll" />
<file src="output/uwp/x86/libSkiaSharp.dll" target="build\uap10.0\x86\libSkiaSharp.dll" />
<file src="output/uwp/arm/libSkiaSharp.dll" target="build\uap10.0\arm\libSkiaSharp.dll" />
</files>
</package>

16
nuget/SkiaSharp.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp</id>
<title>SkiaSharp</title>
<version>1.49.2.1-beta</version>
<version>1.49.3.0-beta</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -35,18 +35,18 @@
<!-- .NET 4.5 -->
<file src="output/mac/SkiaSharp.Desktop.targets" target="build\net45\SkiaSharp.targets" />
<!-- .NET 4.5 (Windows) -->
<file src="output/windows/x64/libskia_windows.dll" target="build\net45\x64\libskia_windows.dll" />
<file src="output/windows/x86/libskia_windows.dll" target="build\net45\x86\libskia_windows.dll" />
<file src="output/windows/x64/libSkiaSharp.dll" target="build\net45\x64\libSkiaSharp.dll" />
<file src="output/windows/x86/libSkiaSharp.dll" target="build\net45\x86\libSkiaSharp.dll" />
<!-- .NET 4.5 (OS X) -->
<file src="output/mac/libskia_osx.dylib" target="build\net45\mac\libskia_osx.dylib" />
<file src="output/mac/libSkiaSharp.dylib" target="build\net45\mac\libSkiaSharp.dylib" />
<file src="output/mac/SkiaSharp.dll.config" target="build\net45\SkiaSharp.dll.config" />
<!-- OS X -->
<file src="output/osx/SkiaSharp.OSX.targets" target="build\XamarinMac\SkiaSharp.targets" />
<file src="output/osx/libskia_osx.dylib" target="build\XamarinMac\libskia_osx.dylib" />
<file src="output/osx/libSkiaSharp.dylib" target="build\XamarinMac\libSkiaSharp.dylib" />
<!-- UWP -->
<file src="output/uwp/SkiaSharp.UWP.targets" target="build\uap10.0\SkiaSharp.Windows.targets" />
<file src="output/uwp/x64/libskia_uwp.dll" target="build\uap10.0\x64\libskia_uwp.dll" />
<file src="output/uwp/x86/libskia_uwp.dll" target="build\uap10.0\x86\libskia_uwp.dll" />
<file src="output/uwp/arm/libskia_uwp.dll" target="build\uap10.0\arm\libskia_uwp.dll" />
<file src="output/uwp/x64/libSkiaSharp.dll" target="build\uap10.0\x64\libSkiaSharp.dll" />
<file src="output/uwp/x86/libSkiaSharp.dll" target="build\uap10.0\x86\libSkiaSharp.dll" />
<file src="output/uwp/arm/libSkiaSharp.dll" target="build\uap10.0\arm\libSkiaSharp.dll" />
</files>
</package>

1
samples/Skia.Forms.Demo/Droid/Skia.Forms.Demo.Droid.csproj
Просмотреть файл

@ -36,6 +36,7 @@
<WarningLevel>4</WarningLevel>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<ConsolePause>false</ConsolePause>
<AndroidSupportedAbis>armeabi-v7a;armeabi;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />