Skip to content

Commit 35acddc

Browse files
JimBobSquarePantsJimBobSquarePants
committed
Remove project references
1 parent 8c84666 commit 35acddc

File tree

3 files changed

+14
-32
lines changed

3 files changed

+14
-32
lines changed

‎ImageSharp.Drawing.sln‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
337337
.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
338338
EndProjectSection
339339
EndProject
340-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PolygonClipper", "..\..\SixLabors\PolygonClipper\src\PolygonClipper\PolygonClipper.csproj", "{5ED54794-99BF-5E50-A861-0BAAAC794E44}"
341-
EndProject
342-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp", "..\..\SixLabors\ImageSharp\src\ImageSharp\ImageSharp.csproj", "{AAF7501C-8537-7F13-5193-B538318BD071}"
343-
EndProject
344340
Global
345341
GlobalSection(SolutionConfigurationPlatforms) = preSolution
346342
Debug|Any CPU = Debug|Any CPU
@@ -363,14 +359,6 @@ Global
363359
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Debug|Any CPU.Build.0 = Debug|Any CPU
364360
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|Any CPU.ActiveCfg = Release|Any CPU
365361
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|Any CPU.Build.0 = Release|Any CPU
366-
{5ED54794-99BF-5E50-A861-0BAAAC794E44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
367-
{5ED54794-99BF-5E50-A861-0BAAAC794E44}.Debug|Any CPU.Build.0 = Debug|Any CPU
368-
{5ED54794-99BF-5E50-A861-0BAAAC794E44}.Release|Any CPU.ActiveCfg = Release|Any CPU
369-
{5ED54794-99BF-5E50-A861-0BAAAC794E44}.Release|Any CPU.Build.0 = Release|Any CPU
370-
{AAF7501C-8537-7F13-5193-B538318BD071}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
371-
{AAF7501C-8537-7F13-5193-B538318BD071}.Debug|Any CPU.Build.0 = Debug|Any CPU
372-
{AAF7501C-8537-7F13-5193-B538318BD071}.Release|Any CPU.ActiveCfg = Release|Any CPU
373-
{AAF7501C-8537-7F13-5193-B538318BD071}.Release|Any CPU.Build.0 = Release|Any CPU
374362
EndGlobalSection
375363
GlobalSection(SolutionProperties) = preSolution
376364
HideSolutionNode = FALSE
@@ -398,17 +386,13 @@ Global
398386
{68A8CC40-6AED-4E96-B524-31B1158FDEEA} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
399387
{5493F024-0A3F-420C-AC2D-05B77A36025B} = {528610AC-7C0C-46E8-9A2D-D46FD92FEE29}
400388
{23859314-5693-4E6C-BE5C-80A433439D2A} = {1799C43E-5C54-4A8F-8D64-B1475241DB0D}
401-
{5ED54794-99BF-5E50-A861-0BAAAC794E44} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
402-
{AAF7501C-8537-7F13-5193-B538318BD071} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
403389
EndGlobalSection
404390
GlobalSection(ExtensibilityGlobals) = postSolution
405391
SolutionGuid = {5F8B9D1F-CD8B-4CC5-8216-D531E25BD795}
406392
EndGlobalSection
407393
GlobalSection(SharedMSBuildProjectFiles) = preSolution
408394
shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{2e33181e-6e28-4662-a801-e2e7dc206029}*SharedItemsImports = 5
409-
..\..\SixLabors\PolygonClipper\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{5ed54794-99bf-5e50-a861-0baaac794e44}*SharedItemsImports = 5
410395
shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{68a8cc40-6aed-4e96-b524-31b1158fdeea}*SharedItemsImports = 13
411-
..\..\SixLabors\ImageSharp\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{aaf7501c-8537-7f13-5193-b538318bd071}*SharedItemsImports = 5
412396
EndGlobalSection
413397
GlobalSection(Performance) = preSolution
414398
HasPerformanceSessions = true

‎src/ImageSharp.Drawing/ImageSharp.Drawing.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,9 @@
4444
<None Include="..\..\shared-infrastructure\branding\icons\imagesharp.drawing\sixlabors.imagesharp.drawing.128.png" Pack="true" PackagePath="" />
4545
</ItemGroup>
4646
<ItemGroup>
47-
<PackageReference Include="SixLabors.Fonts" Version="3.0.0-alpha.0.3" />
48-
<PackageReference Include="SixLabors.ImageSharp" Version="4.0.0-alpha.0.49" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<ProjectReference Include="..\..\..\..\SixLabors\PolygonClipper\src\PolygonClipper\PolygonClipper.csproj" />
47+
<PackageReference Include="SixLabors.Fonts" Version="3.0.0-alpha.0.16" />
48+
<PackageReference Include="SixLabors.ImageSharp" Version="4.0.0-alpha.0.70" />
49+
<PackageReference Include="SixLabors.PolygonClipper" Version="1.0.0-alpha.0.49" />
5250
</ItemGroup>
5351
<Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
5452
</Project>

‎tests/ImageSharp.Drawing.Tests/Drawing/DrawingRobustnessTests.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) Six Labors.
22
// Licensed under the Six Labors Split License.
33

4+
#pragma warning disable xUnit1004 // Test methods should not be skipped
45
using System.Numerics;
56
using System.Runtime.InteropServices;
67
using GeoJSON.Net.Feature;
@@ -73,10 +74,10 @@ private static void CompareToSkiaResultsImpl(TestImageProvider<Rgba32> provider,
7374
appendSourceFileOrDescription: false);
7475

7576
ImageSimilarityReport<Rgba32, Rgba32> result = ImageComparer.Exact.CompareImagesOrFrames(image, skResultImage);
76-
throw new Exception(result.DifferencePercentageString);
77+
throw new ImagesSimilarityException(result.DifferencePercentageString);
7778
}
7879

79-
[Theory]//(Skip = "For local testing")]
80+
[Theory(Skip = "For local testing")]
8081
[WithSolidFilledImages(3600, 2400, "Black", PixelTypes.Rgba32, TestImages.GeoJson.States, 16, 30, 30)]
8182
public void LargeGeoJson_Lines(TestImageProvider<Rgba32> provider, string geoJsonFile, int aa, float sx, float sy)
8283
{
@@ -107,14 +108,14 @@ public void LargeGeoJson_Lines(TestImageProvider<Rgba32> provider, string geoJso
107108
[WithSolidFilledImages(7200, 3300, "Black", PixelTypes.Rgba32)]
108109
public void LargeGeoJson_States_Fill(TestImageProvider<Rgba32> provider)
109110
{
110-
using Image<Rgba32> image = this.FillGeoJsonPolygons(provider, TestImages.GeoJson.States, 16, new Vector2(60), new Vector2(0, -1000));
111+
using Image<Rgba32> image = FillGeoJsonPolygons(provider, TestImages.GeoJson.States, true, new Vector2(60), new Vector2(0, -1000));
111112
ImageComparer comparer = ImageComparer.TolerantPercentage(0.001f);
112113

113114
image.DebugSave(provider, appendPixelTypeToFileName: false, appendSourceFileOrDescription: false);
114115
image.CompareToReferenceOutput(comparer, provider, appendPixelTypeToFileName: false, appendSourceFileOrDescription: false);
115116
}
116117

117-
private Image<Rgba32> FillGeoJsonPolygons(TestImageProvider<Rgba32> provider, string geoJsonFile, int aa, Vector2 scale, Vector2 pixelOffset)
118+
private static Image<Rgba32> FillGeoJsonPolygons(TestImageProvider<Rgba32> provider, string geoJsonFile, bool aa, Vector2 scale, Vector2 pixelOffset)
118119
{
119120
string jsonContent = File.ReadAllText(TestFile.GetInputFileFullPath(geoJsonFile));
120121

@@ -123,15 +124,15 @@ private Image<Rgba32> FillGeoJsonPolygons(TestImageProvider<Rgba32> provider, st
123124
Image<Rgba32> image = provider.GetImage();
124125
DrawingOptions options = new()
125126
{
126-
GraphicsOptions = new GraphicsOptions() { Antialias = aa > 0 },
127+
GraphicsOptions = new GraphicsOptions() { Antialias = aa },
127128
};
128129
Random rnd = new(42);
129130
byte[] rgb = new byte[3];
130131
foreach (PointF[] loop in points)
131132
{
132133
rnd.NextBytes(rgb);
133134

134-
Color color = Color.FromPixel<Rgb24>(new Rgb24(rgb[0], rgb[1], rgb[2]));
135+
Color color = Color.FromPixel(new Rgb24(rgb[0], rgb[1], rgb[2]));
135136
image.Mutate(c => c.FillPolygon(options, color, loop));
136137
}
137138

@@ -201,9 +202,7 @@ public void LargeGeoJson_Mississippi_LinesScaled(TestImageProvider<Rgba32> provi
201202
image.CompareToReferenceOutput(comparer, provider, testOutputDetails: details, appendPixelTypeToFileName: false, appendSourceFileOrDescription: false);
202203
}
203204

204-
#pragma warning disable xUnit1004 // Test methods should not be skipped
205205
[Theory(Skip = "For local experiments only")]
206-
#pragma warning restore xUnit1004 // Test methods should not be skipped
207206
[InlineData(0)]
208207
[InlineData(5000)]
209208
[InlineData(9000)]
@@ -259,7 +258,7 @@ public void Missisippi_Skia(int offset)
259258
data.SaveTo(fs);
260259
}
261260

262-
[Theory]
261+
[Theory(Skip = "For local experiments only")]
263262
[WithSolidFilledImages(1000, 1000, "Black", PixelTypes.Rgba32, 10)]
264263
public void LargeGeoJson_States_Separate_Benchmark(TestImageProvider<Rgba32> provider, int thickness)
265264
{
@@ -286,7 +285,7 @@ public void LargeGeoJson_States_Separate_Benchmark(TestImageProvider<Rgba32> pro
286285
image.DebugSave(provider, $"Benchmark_{thickness}", appendPixelTypeToFileName: false, appendSourceFileOrDescription: false);
287286
}
288287

289-
[Theory]
288+
[Theory(Skip = "For local experiments only")]
290289
[WithSolidFilledImages(1000, 1000, "Black", PixelTypes.Rgba32, 10)]
291290
public void LargeGeoJson_States_All_Benchmark(TestImageProvider<Rgba32> provider, int thickness)
292291
{
@@ -320,7 +319,7 @@ public void LargeGeoJson_States_All_Benchmark(TestImageProvider<Rgba32> provider
320319
image.DebugSave(provider, $"Benchmark_{thickness}", appendPixelTypeToFileName: false, appendSourceFileOrDescription: false);
321320
}
322321

323-
[Theory]
322+
[Theory(Skip = "For local experiments only")]
324323
[WithSolidFilledImages(1000, 1000, "Black", PixelTypes.Rgba32, 10)]
325324
public void LargeStar_Benchmark(TestImageProvider<Rgba32> provider, int thickness)
326325
{
@@ -362,3 +361,4 @@ private static List<PointF[]> CreateStarPolygon(int vertexCount, float radius)
362361
return [[.. contour]];
363362
}
364363
}
364+
#pragma warning restore xUnit1004 // Test methods should not be skipped

0 commit comments

Comments
 (0)