wieslawsoltes
/
SkiaSharp
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'master' into update-m58 

Fixed the issue with the updated version numbers
This commit is contained in:
Matthew Leibowitz 2017-05-08 17:48:35 -04:00
Родитель 4e1d1ea539 a2221c7ddc
Коммит 0d7b0a6422
9 изменённых файлов: 49 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -9,7 +9,7 @@ using System.Reflection;
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SkiaSharp")]
[assembly: AssemblyVersion("1.57.2.0")]
[assembly: AssemblyVersion("1.57.0.0")]
[assembly: AssemblyFileVersion("1.57.2.0")]
[assembly: AssemblyInformationalVersion("1.57.2.0-{GIT_SHA}")]
[assembly: AssemblyCopyright("Xamarin Inc.")]

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

@ -13,14 +13,15 @@ namespace SkiaSharp
{
[Obsolete ("Use SKEncodedImageFormat instead.", true)]
public enum SKImageEncodeFormat {
Bmp = SKEncodedImageFormat.Bmp,
Gif = SKEncodedImageFormat.Gif,
Ico = SKEncodedImageFormat.Ico,
Jpeg = SKEncodedImageFormat.Jpeg,
Png = SKEncodedImageFormat.Png,
Wbmp = SKEncodedImageFormat.Wbmp,
Webp = SKEncodedImageFormat.Webp,
Ktx = SKEncodedImageFormat.Ktx,
Unknown,
Bmp,
Gif,
Ico,
Jpeg,
Png,
Wbmp,
Webp,
Ktx,
}
// public delegates
@ -263,7 +264,38 @@ namespace SkiaSharp
[Obsolete ("Use Encode(SKEncodedImageFormat, int) instead.", true)]
public SKData Encode (SKImageEncodeFormat format, int quality)
{
return Encode ((SKEncodedImageFormat)format, quality);
SKEncodedImageFormat newFormat;
switch (format) {
case SKImageEncodeFormat.Bmp:
newFormat = SKEncodedImageFormat.Bmp;
break;
case SKImageEncodeFormat.Gif:
newFormat = SKEncodedImageFormat.Gif;
break;
case SKImageEncodeFormat.Ico:
newFormat = SKEncodedImageFormat.Ico;
break;
case SKImageEncodeFormat.Jpeg:
newFormat = SKEncodedImageFormat.Jpeg;
break;
case SKImageEncodeFormat.Png:
newFormat = SKEncodedImageFormat.Png;
break;
case SKImageEncodeFormat.Wbmp:
newFormat = SKEncodedImageFormat.Wbmp;
break;
case SKImageEncodeFormat.Webp:
newFormat = SKEncodedImageFormat.Webp;
break;
case SKImageEncodeFormat.Ktx:
newFormat = SKEncodedImageFormat.Ktx;
break;
case SKImageEncodeFormat.Unknown:
default:
newFormat = SKEncodedImageFormat.Png;
break;
}
return Encode (newFormat, quality);
}
public SKData Encode (SKEncodedImageFormat format, int quality)

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

@ -24,7 +24,7 @@ var GenApiToolPath = GetToolPath ("Microsoft.DotNet.BuildTools.GenAPI/tools/GenA
var MDocPath = GetToolPath ("mdoc/mdoc.exe");
var SNToolPath = GetSNToolPath (EnvironmentVariable ("SN_EXE"));
var VERSION_ASSEMBLY = "1.57.2.0";
var VERSION_ASSEMBLY = "1.57.0.0";
var VERSION_FILE = "1.57.2.0";
var VERSION_SONAME = VERSION_FILE.Substring(VERSION_FILE.IndexOf(".") + 1);

2
source/SkiaSharp.Extended/SkiaSharp.Extended.Shared/Properties/SkiaSharpExtendedAssemblyInfo.cs
Просмотреть файл

@ -9,7 +9,7 @@ using System.Reflection;
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SkiaSharp.Extended")]
[assembly: AssemblyVersion("1.57.2.0")]
[assembly: AssemblyVersion("1.57.0.0")]
[assembly: AssemblyFileVersion("1.57.2.0")]
[assembly: AssemblyInformationalVersion("1.57.2.0-{GIT_SHA}")]
[assembly: AssemblyCopyright("Xamarin Inc.")]

2
source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.Shared/Properties/SkiaSharpHarfBuzzAssemblyInfo.cs
Просмотреть файл

@ -9,7 +9,7 @@ using System.Reflection;
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SkiaSharp.HarfBuzz")]
[assembly: AssemblyVersion("1.57.2.0")]
[assembly: AssemblyVersion("1.57.0.0")]
[assembly: AssemblyFileVersion("1.57.2.0")]
[assembly: AssemblyInformationalVersion("1.57.2.0-{GIT_SHA}")]
[assembly: AssemblyCopyright("Xamarin Inc.")]

2
source/SkiaSharp.Svg/SkiaSharp.Svg.Shared/Properties/SkiaSharpSvgAssemblyInfo.cs
Просмотреть файл

@ -9,7 +9,7 @@ using System.Reflection;
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SkiaSharp.Svg")]
[assembly: AssemblyVersion("1.57.2.0")]
[assembly: AssemblyVersion("1.57.0.0")]
[assembly: AssemblyFileVersion("1.57.2.0")]
[assembly: AssemblyInformationalVersion("1.57.2.0-{GIT_SHA}")]
[assembly: AssemblyCopyright("Xamarin Inc.")]

2
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Shared/Properties/SkiaSharpViewsFormsAssemblyInfo.cs
Просмотреть файл

@ -9,7 +9,7 @@ using System.Reflection;
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SkiaSharp.Views.Forms")]
[assembly: AssemblyVersion("1.57.2.0")]
[assembly: AssemblyVersion("1.57.0.0")]
[assembly: AssemblyFileVersion("1.57.2.0")]
[assembly: AssemblyInformationalVersion("1.57.2.0-{GIT_SHA}")]
[assembly: AssemblyCopyright("Xamarin Inc.")]

2
source/SkiaSharp.Views/SkiaSharp.Views.Shared/Properties/SkiaSharpViewsAssemblyInfo.cs
Просмотреть файл

@ -9,7 +9,7 @@ using System.Reflection;
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SkiaSharp.Views")]
[assembly: AssemblyVersion("1.57.2.0")]
[assembly: AssemblyVersion("1.57.0.0")]
[assembly: AssemblyFileVersion("1.57.2.0")]
[assembly: AssemblyInformationalVersion("1.57.2.0-{GIT_SHA}")]
[assembly: AssemblyCopyright("Xamarin Inc.")]

2
source/SkiaSharp.Workbooks/Properties/SkiaSharpWorkbooksAssemblyInfo.cs
Просмотреть файл

@ -9,7 +9,7 @@ using System.Reflection;
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SkiaSharp")]
[assembly: AssemblyVersion("1.57.2.0")]
[assembly: AssemblyVersion("1.57.0.0")]
[assembly: AssemblyFileVersion("1.57.2.0")]
[assembly: AssemblyInformationalVersion("1.57.2.0-{GIT_SHA}")]
[assembly: AssemblyCopyright("Microsoft")]