Skip to content

Commit 2bedf20

Browse files
JimBobSquarePantsJimBobSquarePants
authored
Merge pull request #2065 from mikeirvingweb/product-name-corrections
naming corrections - macOS and .NET
2 parents aac0783 + 12abd59 commit 2bedf20

File tree

11 files changed

+28
-28
lines changed

11 files changed

+28
-28
lines changed

‎src/ImageSharp/Metadata/Profiles/Exif/ExifReader.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ protected void ReadSubIfd(List<IExifValue> values)
202202

203203
protected void ReadValues64(List<IExifValue> values, ulong offset)
204204
{
205-
DebugGuard.MustBeLessThanOrEqualTo(offset, (ulong)this.data.Length, "By spec UInt64.MaxValue is supported, but .Net Stream.Length can Int64.MaxValue.");
205+
DebugGuard.MustBeLessThanOrEqualTo(offset, (ulong)this.data.Length, "By spec UInt64.MaxValue is supported, but .NET Stream.Length can Int64.MaxValue.");
206206

207207
this.Seek(offset);
208208
ulong count = this.ReadUInt64();

‎src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor{TPixel}.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,12 @@ public void Invoke(in RowInterval rows, Span<Vector4> span)
187187
&& RuntimeEnvironment.IsNetCore)
188188
{
189189
// There's something wrong with the JIT in .NET Core 3.1 on certain
190-
// MacOSX machines so we have to use different pipelines.
190+
// macOS machines so we have to use different pipelines.
191191
// It's:
192192
// - Not reproducable locally
193193
// - Doesn't seem to be triggered by the bulk Numerics.UnPremultiply method but by caller.
194194
// https://github.com/SixLabors/ImageSharp/pull/1591
195-
this.InvokeMacOSX(in rows, span);
195+
this.InvokeMacOS(in rows, span);
196196
return;
197197
}
198198

@@ -259,7 +259,7 @@ public void Invoke(in RowInterval rows, Span<Vector4> span)
259259

260260
[ExcludeFromCodeCoverage]
261261
[MethodImpl(InliningOptions.ShortMethod)]
262-
private void InvokeMacOSX(in RowInterval rows, Span<Vector4> span)
262+
private void InvokeMacOS(in RowInterval rows, Span<Vector4> span)
263263
{
264264
Matrix3x2 matrix = this.matrix;
265265
TResampler sampler = this.sampler;

‎src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor{TPixel}.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,12 @@ public void Invoke(in RowInterval rows, Span<Vector4> span)
186186
&& RuntimeEnvironment.IsNetCore)
187187
{
188188
// There's something wrong with the JIT in .NET Core 3.1 on certain
189-
// MacOSX machines so we have to use different pipelines.
189+
// macOS machines so we have to use different pipelines.
190190
// It's:
191191
// - Not reproducable locally
192192
// - Doesn't seem to be triggered by the bulk Numerics.UnPremultiply method but by caller.
193193
// https://github.com/SixLabors/ImageSharp/pull/1591
194-
this.InvokeMacOSX(in rows, span);
194+
this.InvokeMacOS(in rows, span);
195195
return;
196196
}
197197

@@ -258,7 +258,7 @@ public void Invoke(in RowInterval rows, Span<Vector4> span)
258258

259259
[ExcludeFromCodeCoverage]
260260
[MethodImpl(InliningOptions.ShortMethod)]
261-
public void InvokeMacOSX(in RowInterval rows, Span<Vector4> span)
261+
public void InvokeMacOS(in RowInterval rows, Span<Vector4> span)
262262
{
263263
Matrix4x4 matrix = this.matrix;
264264
TResampler sampler = this.sampler;

‎tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public void TiffDecoder_CanDecode_12Bit_WithUnassociatedAlpha<TPixel>(TestImageP
192192
public void TiffDecoder_CanDecode_12Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
193193
where TPixel : unmanaged, IPixel<TPixel>
194194
{
195-
if (TestEnvironment.IsOSX)
195+
if (TestEnvironment.IsMacOS)
196196
{
197197
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
198198
using Image<TPixel> image = provider.GetImage(TiffDecoder);
@@ -249,7 +249,7 @@ public void TiffDecoder_CanDecode_20Bit_WithAssociatedAlpha<TPixel>(TestImagePro
249249

250250
where TPixel : unmanaged, IPixel<TPixel>
251251
{
252-
if (TestEnvironment.IsOSX)
252+
if (TestEnvironment.IsMacOS)
253253
{
254254
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
255255
using Image<TPixel> image = provider.GetImage(TiffDecoder);
@@ -276,7 +276,7 @@ public void TiffDecoder_CanDecode_24Bit_WithUnassociatedAlpha<TPixel>(TestImageP
276276
public void TiffDecoder_CanDecode_24Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
277277
where TPixel : unmanaged, IPixel<TPixel>
278278
{
279-
if (TestEnvironment.IsOSX)
279+
if (TestEnvironment.IsMacOS)
280280
{
281281
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
282282
using Image<TPixel> image = provider.GetImage(TiffDecoder);
@@ -313,7 +313,7 @@ public void TiffDecoder_CanDecode_YCbCr_24Bit<TPixel>(TestImageProvider<TPixel>
313313
where TPixel : unmanaged, IPixel<TPixel>
314314
{
315315
// Note: The image from MagickReferenceDecoder does not look right, maybe we are doing something wrong
316-
// converting the pixel data from Magick.Net to our format with YCbCr?
316+
// converting the pixel data from Magick.NET to our format with YCbCr?
317317
using Image<TPixel> image = provider.GetImage();
318318
image.DebugSave(provider);
319319
}
@@ -353,7 +353,7 @@ public void TiffDecoder_CanDecode_32Bit_WithUnassociatedAlpha<TPixel>(TestImageP
353353
public void TiffDecoder_CanDecode_32Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
354354
where TPixel : unmanaged, IPixel<TPixel>
355355
{
356-
if (TestEnvironment.IsOSX)
356+
if (TestEnvironment.IsMacOS)
357357
{
358358
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
359359
using Image<TPixel> image = provider.GetImage(TiffDecoder);
@@ -393,7 +393,7 @@ public void TiffDecoder_CanDecode_40Bit_WithUnassociatedAlpha<TPixel>(TestImageP
393393
public void TiffDecoder_CanDecode_40Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
394394
where TPixel : unmanaged, IPixel<TPixel>
395395
{
396-
if (TestEnvironment.IsOSX)
396+
if (TestEnvironment.IsMacOS)
397397
{
398398
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
399399
using Image<TPixel> image = provider.GetImage(TiffDecoder);
@@ -432,7 +432,7 @@ public void TiffDecoder_CanDecode_48Bit_WithUnassociatedAlpha<TPixel>(TestImageP
432432
public void TiffDecoder_CanDecode_48Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
433433
where TPixel : unmanaged, IPixel<TPixel>
434434
{
435-
if (TestEnvironment.IsOSX)
435+
if (TestEnvironment.IsMacOS)
436436
{
437437
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
438438
using Image<TPixel> image = provider.GetImage(TiffDecoder);
@@ -462,7 +462,7 @@ public void TiffDecoder_CanDecode_56Bit_WithUnassociatedAlpha<TPixel>(TestImageP
462462
public void TiffDecoder_CanDecode_56Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
463463
where TPixel : unmanaged, IPixel<TPixel>
464464
{
465-
if (TestEnvironment.IsOSX)
465+
if (TestEnvironment.IsMacOS)
466466
{
467467
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
468468
using Image<TPixel> image = provider.GetImage(TiffDecoder);

‎tests/ImageSharp.Tests/Helpers/RuntimeEnvironmentTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void CanDetectOSPlatform()
2828
{
2929
Assert.True(RuntimeEnvironment.IsOSPlatform(OSPlatform.Linux));
3030
}
31-
else if (TestEnvironment.IsOSX)
31+
else if (TestEnvironment.IsMacOS)
3232
{
3333
Assert.True(RuntimeEnvironment.IsOSPlatform(OSPlatform.OSX));
3434
}

‎tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ public class NonParallelCollection
5858
[Collection(nameof(NonParallelCollection))]
5959
public class NonParallel
6060
{
61-
public static readonly bool IsNotMacOs = !TestEnvironment.IsOSX;
61+
public static readonly bool IsNotMacOS = !TestEnvironment.IsMacOS;
6262

63-
// TODO: Investigate failures on MacOS. All handles are released after GC.
63+
// TODO: Investigate failures on macOS. All handles are released after GC.
6464
// (It seems to happen more consistently on .NET 6.)
65-
[ConditionalFact(nameof(IsNotMacOs))]
65+
[ConditionalFact(nameof(IsNotMacOS))]
6666
public void MultiplePoolInstances_TrimPeriodElapsed_AllAreTrimmed()
6767
{
6868
if (!TestEnvironment.RunsOnCI)

‎tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,9 @@ public void Rent_MultiBuff_BelowCapacity_Succeeds(int initialRent, int attempt,
245245
cleanup.Register(b1);
246246
}
247247

248-
public static readonly bool IsNotMacOS = !TestEnvironment.IsOSX;
248+
public static readonly bool IsNotMacOS = !TestEnvironment.IsMacOS;
249249

250-
// TODO: Investigate MacOS failures
250+
// TODO: Investigate macOS failures
251251
[ConditionalTheory(nameof(IsNotMacOS))]
252252
[InlineData(false)]
253253
[InlineData(true)]

‎tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,9 @@ static void RunTest()
259259
[InlineData(1200)] // Group of two UniformUnmanagedMemoryPool buffers
260260
public void AllocateMemoryGroup_Finalization_ReturnsToPool(int length)
261261
{
262-
if (TestEnvironment.IsOSX)
262+
if (TestEnvironment.IsMacOS)
263263
{
264-
// Skip on OSX: https://github.com/SixLabors/ImageSharp/issues/1887
264+
// Skip on macOS: https://github.com/SixLabors/ImageSharp/issues/1887
265265
return;
266266
}
267267

@@ -321,9 +321,9 @@ private static void AllocateGroupAndForget(UniformUnmanagedMemoryPoolMemoryAlloc
321321
[InlineData(600)] // Group of single UniformUnmanagedMemoryPool buffer
322322
public void AllocateSingleMemoryOwner_Finalization_ReturnsToPool(int length)
323323
{
324-
if (TestEnvironment.IsOSX)
324+
if (TestEnvironment.IsMacOS)
325325
{
326-
// Skip on OSX: https://github.com/SixLabors/ImageSharp/issues/1887
326+
// Skip on macOS: https://github.com/SixLabors/ImageSharp/issues/1887
327327
return;
328328
}
329329

‎tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class ResizeTests
3434
};
3535

3636
private static readonly ImageComparer ValidatorComparer =
37-
ImageComparer.TolerantPercentage(TestEnvironment.IsOSX && TestEnvironment.RunsOnCI ? 0.26F : 0.07F);
37+
ImageComparer.TolerantPercentage(TestEnvironment.IsMacOS && TestEnvironment.RunsOnCI ? 0.26F : 0.07F);
3838

3939
[Fact]
4040
public void Resize_PixelAgnostic()

‎tests/ImageSharp.Tests/TestUtilities/ImageComparison/Exceptions/ImageDifferenceIsOverThresholdException.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ private static string StringifyReports(IEnumerable<ImageSimilarityReport> report
2424

2525
sb.Append(Environment.NewLine);
2626

27-
// TODO: We should add OSX.
27+
// TODO: We should add macOS.
2828
sb.AppendFormat("Test Environment OS : {0}", TestEnvironment.IsWindows ? "Windows" : "Linux");
2929
sb.Append(Environment.NewLine);
3030

0 commit comments

Comments
 (0)