From 1c805aea7f4636134d9ca1157eb757d39370027d Mon Sep 17 00:00:00 2001 From: Robin Date: Mon, 16 Apr 2018 07:49:13 +0200 Subject: [PATCH] Updated dependencies and modified some tests to have a better coverage by using xunit theory. --- .../Greenshot.Addon.Box.csproj | 12 ++++---- src/Greenshot.Addon.Box/packages.config | 6 ++-- .../Greenshot.Addon.Confluence.csproj | 16 +++++----- .../packages.config | 8 ++--- .../Greenshot.Addon.Dropbox.csproj | 12 ++++---- src/Greenshot.Addon.Dropbox/packages.config | 6 ++-- .../Greenshot.Addon.Flickr.csproj | 8 ++--- src/Greenshot.Addon.Flickr/packages.config | 4 +-- .../Greenshot.Addon.GooglePhotos.csproj | 8 ++--- .../packages.config | 4 +-- .../Greenshot.Addon.Imgur.csproj | 12 ++++---- src/Greenshot.Addon.Imgur/packages.config | 6 ++-- .../Greenshot.Addon.Jira.csproj | 16 +++++----- src/Greenshot.Addon.Jira/packages.config | 8 ++--- .../Greenshot.Addon.Lutim.csproj | 8 ++--- src/Greenshot.Addon.Lutim/packages.config | 4 +-- .../Greenshot.Addon.OneDrive.csproj | 12 ++++---- src/Greenshot.Addon.OneDrive/packages.config | 6 ++-- .../Greenshot.Addon.Photobucket.csproj | 8 ++--- .../packages.config | 4 +-- src/Greenshot.Addons/Greenshot.Addons.csproj | 12 ++++---- src/Greenshot.Addons/packages.config | 6 ++-- .../GfxPerformance.cs | 30 ++++++++++++++----- src/Greenshot.Tests/BlurTests.cs | 22 +++++++++----- src/Greenshot/Greenshot.csproj | 12 ++++---- src/Greenshot/packages.config | 6 ++-- 26 files changed, 138 insertions(+), 118 deletions(-) diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index c0de4d745..60ea61942 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -61,14 +61,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.32\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.32\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.32\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index 7692e1360..a76f6c7d2 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 448fc2ce8..ef5cab6f7 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -80,17 +80,17 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.Confluence.0.7.17\lib\net45\Dapplo.Confluence.dll + + ..\packages\Dapplo.Confluence.0.7.19\lib\net45\Dapplo.Confluence.dll - - ..\packages\Dapplo.HttpExtensions.0.8.32\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonSimple.0.8.32\lib\net45\Dapplo.HttpExtensions.JsonSimple.dll + + ..\packages\Dapplo.HttpExtensions.JsonSimple.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonSimple.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.32\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index fab9ae268..069c27d0a 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 019729e10..f03840b34 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -73,14 +73,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.32\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.32\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.32\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index 7692e1360..a76f6c7d2 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 683ecf8a9..5af82eacd 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -73,11 +73,11 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.32\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.32\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index 44d9e1ed3..b0446e64a 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -11,8 +11,8 @@ - - + + diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 8fe05f569..41d19b8ed 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -59,11 +59,11 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.32\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.32\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index 44d9e1ed3..b0446e64a 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -11,8 +11,8 @@ - - + + diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 296a17376..d9b7e58e0 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -78,14 +78,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.32\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.32\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.32\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index e551a9a12..05265b8db 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -12,9 +12,9 @@ - - - + + + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index a677d9194..d7f544d69 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -78,14 +78,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.32\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.32\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.32\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll @@ -93,8 +93,8 @@ ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Jira.0.7.7\lib\net45\Dapplo.Jira.dll + + ..\packages\Dapplo.Jira.0.7.10\lib\net45\Dapplo.Jira.dll ..\packages\Dapplo.Language.0.5.24\lib\net45\Dapplo.Language.dll diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index a5b03ef5a..317d4524c 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -12,12 +12,12 @@ - - - + + + - + diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index f27889159..6d6e1233b 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -76,11 +76,11 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.32\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.32\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index e8c6d12f7..e57360094 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -12,8 +12,8 @@ - - + + diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index 9fd2b6c33..b499b7a83 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -72,14 +72,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.32\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.32\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.32\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index 7692e1360..a76f6c7d2 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index 79f61e55d..23d63f8ff 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -73,11 +73,11 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.32\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.32\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index 44d9e1ed3..b0446e64a 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -11,8 +11,8 @@ - - + + diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 14fa251d1..a9525ba40 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -55,14 +55,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.32\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.32\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.32\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index fb50e0637..dae7ffd69 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Greenshot.PerformanceTests/GfxPerformance.cs b/src/Greenshot.PerformanceTests/GfxPerformance.cs index 4a51840a4..32d1eeffc 100644 --- a/src/Greenshot.PerformanceTests/GfxPerformance.cs +++ b/src/Greenshot.PerformanceTests/GfxPerformance.cs @@ -2,6 +2,7 @@ using System.Drawing.Imaging; using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Attributes.Columns; +using BenchmarkDotNet.Order; using Greenshot.Gfx; using Greenshot.Gfx.Experimental; using Greenshot.Gfx.Quantizer; @@ -13,6 +14,7 @@ namespace Greenshot.PerformanceTests /// This defines the benchmarks which can be done /// [MinColumn, MaxColumn, MemoryDiagnoser] + [OrderProvider(SummaryOrderPolicy.FastestToSlowest)] public class GfxPerformance { //[Benchmark] @@ -34,9 +36,12 @@ namespace Greenshot.PerformanceTests } [Benchmark] - public void Blur() + [Arguments(PixelFormat.Format24bppRgb)] + [Arguments(PixelFormat.Format32bppRgb)] + [Arguments(PixelFormat.Format32bppArgb)] + public void Blur(PixelFormat pixelFormat) { - using (var bitmap = BitmapFactory.CreateEmpty(400, 400, PixelFormat.Format32bppArgb, Color.White)) + using (var bitmap = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White)) { using (var graphics = Graphics.FromImage(bitmap)) using (var pen = new SolidBrush(Color.Blue)) @@ -48,9 +53,12 @@ namespace Greenshot.PerformanceTests } [Benchmark] - public void BlurSpan() + [Arguments(PixelFormat.Format24bppRgb)] + [Arguments(PixelFormat.Format32bppRgb)] + [Arguments(PixelFormat.Format32bppArgb)] + public void BlurSpan(PixelFormat pixelFormat) { - using (var bitmap = BitmapFactory.CreateEmpty(400, 400, PixelFormat.Format32bppArgb, Color.White)) + using (var bitmap = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White)) { using (var graphics = Graphics.FromImage(bitmap)) using (var pen = new SolidBrush(Color.Blue)) @@ -62,9 +70,12 @@ namespace Greenshot.PerformanceTests } [Benchmark] - public void BlurOld() + [Arguments(PixelFormat.Format24bppRgb)] + [Arguments(PixelFormat.Format32bppRgb)] + [Arguments(PixelFormat.Format32bppArgb)] + public void BlurOld(PixelFormat pixelFormat) { - using (var bitmap = BitmapFactory.CreateEmpty(400, 400, PixelFormat.Format32bppArgb, Color.White)) + using (var bitmap = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White)) { using (var graphics = Graphics.FromImage(bitmap)) using (var pen = new SolidBrush(Color.Blue)) @@ -76,9 +87,12 @@ namespace Greenshot.PerformanceTests } [Benchmark] - public void Scale() + [Arguments(PixelFormat.Format24bppRgb)] + [Arguments(PixelFormat.Format32bppRgb)] + [Arguments(PixelFormat.Format32bppArgb)] + public void Scale(PixelFormat pixelFormat) { - using (var bitmap = BitmapFactory.CreateEmpty(400, 400, PixelFormat.Format32bppArgb, Color.White)) + using (var bitmap = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White)) { using (var graphics = Graphics.FromImage(bitmap)) using (var pen = new SolidBrush(Color.Blue)) diff --git a/src/Greenshot.Tests/BlurTests.cs b/src/Greenshot.Tests/BlurTests.cs index 00ef6d761..f3f44caca 100644 --- a/src/Greenshot.Tests/BlurTests.cs +++ b/src/Greenshot.Tests/BlurTests.cs @@ -12,11 +12,14 @@ namespace Greenshot.Tests /// public class BlurTests { - [Fact] - public void Test_Blur() + [Theory] + [InlineData(PixelFormat.Format24bppRgb)] + [InlineData(PixelFormat.Format32bppRgb)] + [InlineData(PixelFormat.Format32bppArgb)] + public void Test_Blur(PixelFormat pixelFormat) { - using (var bitmapNew = BitmapFactory.CreateEmpty(400, 400, backgroundColor: Color.White)) - using (var bitmapOld = BitmapFactory.CreateEmpty(400, 400, backgroundColor: Color.White)) + using (var bitmapNew = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White)) + using (var bitmapOld = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White)) { using (var graphics = Graphics.FromImage(bitmapNew)) using (var pen = new SolidBrush(Color.Blue)) @@ -37,11 +40,14 @@ namespace Greenshot.Tests } } - [Fact] - public void Test_Blur_Span() + [Theory] + [InlineData(PixelFormat.Format24bppRgb)] + [InlineData(PixelFormat.Format32bppRgb)] + [InlineData(PixelFormat.Format32bppArgb)] + public void Test_Blur_Span(PixelFormat pixelFormat) { - using (var bitmapNew = BitmapFactory.CreateEmpty(400, 400, backgroundColor: Color.White)) - using (var bitmapOld = BitmapFactory.CreateEmpty(400, 400, backgroundColor: Color.White)) + using (var bitmapNew = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White)) + using (var bitmapOld = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White)) { using (var graphics = Graphics.FromImage(bitmapNew)) using (var pen = new SolidBrush(Color.Blue)) diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 1bc1feb92..d3253f7ee 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -71,14 +71,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.32\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.32\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.32\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index 62a42c81e..0af37d35b 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -16,9 +16,9 @@ - - - + + +