Skip to content

Commit 20468cc

Browse files
IOL0ol1IOL0ol1
committed
update dll and fix bug
1 parent 556270b commit 20468cc

40 files changed

+805
-206
lines changed

‎OpenSlideSharp.Common.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
<!--- Package information, Version -->
55
<PropertyGroup>
6-
<PackageVersion>1.0.1.4</PackageVersion>
76
<Authors>IOL0ol1</Authors>
87
<Copyright>Copyright © 2021-2022</Copyright>
98
<PackageLicenseExpression>MIT</PackageLicenseExpression>

‎OpenSlideSharp.sln‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30406.217
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.4.33110.190
55
MinimumVisualStudioVersion = 15.0.26124.0
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6EE7C68C-65D9-4290-81AE-09BA58C857CD}"
77
EndProject
@@ -25,7 +25,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSlideSharp.BitmapExtens
2525
EndProject
2626
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSlideSharp.BruTile", "src\OpenSlideSharp.BruTile\OpenSlideSharp.BruTile.csproj", "{9DA7F592-F964-45CB-9E2E-F8028AE3C956}"
2727
EndProject
28-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SlideViewer", "example\SlideViewer\SlideViewer.csproj", "{11D9A92F-2314-407B-A392-18B2290E4972}"
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlideViewer", "example\SlideViewer\SlideViewer.csproj", "{11D9A92F-2314-407B-A392-18B2290E4972}"
29+
EndProject
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSlideSharp.OpencvExtensions", "src\OpenSlideSharp.OpencvExtensions\OpenSlideSharp.OpencvExtensions.csproj", "{4322CA50-F9C6-4619-8A8F-9D99E5906CCB}"
2931
EndProject
3032
Global
3133
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -69,6 +71,10 @@ Global
6971
{11D9A92F-2314-407B-A392-18B2290E4972}.Debug|Any CPU.Build.0 = Debug|Any CPU
7072
{11D9A92F-2314-407B-A392-18B2290E4972}.Release|Any CPU.ActiveCfg = Release|Any CPU
7173
{11D9A92F-2314-407B-A392-18B2290E4972}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{4322CA50-F9C6-4619-8A8F-9D99E5906CCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75+
{4322CA50-F9C6-4619-8A8F-9D99E5906CCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
76+
{4322CA50-F9C6-4619-8A8F-9D99E5906CCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
77+
{4322CA50-F9C6-4619-8A8F-9D99E5906CCB}.Release|Any CPU.Build.0 = Release|Any CPU
7278
EndGlobalSection
7379
GlobalSection(SolutionProperties) = preSolution
7480
HideSolutionNode = FALSE
@@ -83,6 +89,7 @@ Global
8389
{695DED59-4106-424A-9831-2227F0B35BAE} = {6EE7C68C-65D9-4290-81AE-09BA58C857CD}
8490
{9DA7F592-F964-45CB-9E2E-F8028AE3C956} = {6EE7C68C-65D9-4290-81AE-09BA58C857CD}
8591
{11D9A92F-2314-407B-A392-18B2290E4972} = {C3C9459E-1461-4480-B551-AAED7BDAD940}
92+
{4322CA50-F9C6-4619-8A8F-9D99E5906CCB} = {6EE7C68C-65D9-4290-81AE-09BA58C857CD}
8693
EndGlobalSection
8794
GlobalSection(ExtensibilityGlobals) = postSolution
8895
SolutionGuid = {6D55D41F-7887-4787-BD15-17389C769282}

‎build/DownloadAndCopy.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22

33
param(
4-
[string]$x86="https://github.com/openslide/openslide-winbuild/releases/download/v20171122/openslide-win32-20171122.zip",
5-
[string]$x64="https://github.com/openslide/openslide-winbuild/releases/download/v20171122/openslide-win64-20171122.zip",
4+
[string]$x86="https://github.com/openslide/openslide-winbuild/releases/download/v20221111/openslide-win32-20221111.zip",
5+
[string]$x64="https://github.com/openslide/openslide-winbuild/releases/download/v20221111/openslide-win64-20221111.zip",
66
[string]$x86Output="..\openslide\x86\",
77
[string]$x64Output="..\openslide\x64\")
88

‎example/MultiSlideServer/Cache/DeepZoomGeneratorCache.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System;
2-
3-
using Microsoft.Extensions.Caching.Memory;
1+
using Microsoft.Extensions.Caching.Memory;
42
using Microsoft.Extensions.Options;
3+
using System;
54

65
namespace MultiSlideServer.Cache
76
{

‎example/MultiSlideServer/Controllers/HomeController.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
using System.Linq;
2-
using System.Text;
3-
4-
using Microsoft.AspNetCore.Mvc;
5-
1+
using Microsoft.AspNetCore.Mvc;
62
using MultiSlideServer.Cache;
3+
using System.Linq;
4+
using System.Text;
75

86
namespace MultiSlideServer.Controllers
97
{

‎example/MultiSlideServer/ImageProvider.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Microsoft.Extensions.Options;
22
using MultiSlideServer.Cache;
33
using OpenSlideSharp;
4-
using System;
54
using System.Collections.Generic;
65

76
namespace MultiSlideServer
@@ -53,6 +52,6 @@ public RetainableDeepZoomGenerator RetainDeepZoomGenerator(string name, string p
5352
dz.Dispose();
5453
return dz;
5554
}
56-
55+
5756
}
5857
}

‎example/MultiSlideServer/Startup.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
using System;
2-
using System.Threading.Tasks;
3-
4-
using Microsoft.AspNetCore.Builder;
1+
using Microsoft.AspNetCore.Builder;
52
using Microsoft.AspNetCore.Hosting;
63
using Microsoft.AspNetCore.Http;
74
using Microsoft.Extensions.Configuration;
85
using Microsoft.Extensions.DependencyInjection;
96
using Microsoft.Extensions.Hosting;
107
using Microsoft.Extensions.Primitives;
11-
128
using MultiSlideServer.Cache;
13-
149
using OpenSlideSharp;
10+
using OpenSlideSharp.BitmapExtensions;
11+
using System;
1512
namespace MultiSlideServer
1613
{
1714
public class Startup

‎example/SingleSlideServer/ImageOption.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
{
33
public class ImageOption
44
{
5-
public string Path { get; set; }
5+
public string Path { get; set; }
66
}
77
}

‎example/SingleSlideServer/ImageProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using System;
2-
using Microsoft.Extensions.Options;
1+
using Microsoft.Extensions.Options;
32
using OpenSlideSharp;
3+
using System;
44

55
namespace SingleSlideServer
66
{

‎example/SingleSlideServer/Startup.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
using System.Threading.Tasks;
2-
3-
using Microsoft.AspNetCore.Builder;
1+
using Microsoft.AspNetCore.Builder;
42
using Microsoft.AspNetCore.Hosting;
53
using Microsoft.Extensions.Configuration;
64
using Microsoft.Extensions.DependencyInjection;
75
using Microsoft.Extensions.Hosting;
86
using Microsoft.Extensions.Primitives;
97

10-
using OpenSlideSharp;
8+
using OpenSlideSharp.BitmapExtensions;
119

1210
namespace SingleSlideServer
1311
{

0 commit comments

Comments
 (0)