Skip to content

Commit 63da967

Browse files
frg2089frg2089
committed
Flatten namespace.
Signed-off-by: 舰队的偶像-岛风酱! <frg2089@outlook.com>
1 parent 729d64e commit 63da967

19 files changed

Lines changed: 30 additions & 26 deletions

‎src/ImageSharp/Configuration.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
using System.Collections.Concurrent;
55
using SixLabors.ImageSharp.Formats;
66
using SixLabors.ImageSharp.Formats.Bmp;
7+
using SixLabors.ImageSharp.Formats.Cur;
78
using SixLabors.ImageSharp.Formats.Gif;
8-
using SixLabors.ImageSharp.Formats.Icon.Cur;
9-
using SixLabors.ImageSharp.Formats.Icon.Ico;
9+
using SixLabors.ImageSharp.Formats.Ico;
1010
using SixLabors.ImageSharp.Formats.Jpeg;
1111
using SixLabors.ImageSharp.Formats.Pbm;
1212
using SixLabors.ImageSharp.Formats.Png;

src/ImageSharp/Formats/Icon/Cur/CurConfigurationModule.cs renamed to src/ImageSharp/Formats/Cur/CurConfigurationModule.cs

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

4-
namespace SixLabors.ImageSharp.Formats.Icon.Cur;
4+
using SixLabors.ImageSharp.Formats.Icon;
5+
6+
namespace SixLabors.ImageSharp.Formats.Cur;
57

68
/// <summary>
79
/// Registers the image encoders, decoders and mime type detectors for the Ico format.

src/ImageSharp/Formats/Icon/Cur/CurConstants.cs renamed to src/ImageSharp/Formats/Cur/CurConstants.cs

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

4-
namespace SixLabors.ImageSharp.Formats.Icon.Cur;
4+
namespace SixLabors.ImageSharp.Formats.Cur;
55

66
/// <summary>
77
/// Defines constants relating to ICOs

src/ImageSharp/Formats/Icon/Cur/CurDecoder.cs renamed to src/ImageSharp/Formats/Cur/CurDecoder.cs

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

44
using SixLabors.ImageSharp.PixelFormats;
55

6-
namespace SixLabors.ImageSharp.Formats.Icon.Cur;
6+
namespace SixLabors.ImageSharp.Formats.Cur;
77

88
/// <summary>
99
/// Decoder for generating an image out of a ico encoded stream.

src/ImageSharp/Formats/Icon/Cur/CurDecoderCore.cs renamed to src/ImageSharp/Formats/Cur/CurDecoderCore.cs

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

4+
using SixLabors.ImageSharp.Formats.Icon;
45
using SixLabors.ImageSharp.Metadata;
56

6-
// TODO: flatten namespace.
7-
// namespace SixLabors.ImageSharp.Formats.Cur;
8-
namespace SixLabors.ImageSharp.Formats.Icon.Cur;
7+
namespace SixLabors.ImageSharp.Formats.Cur;
98

109
internal sealed class CurDecoderCore : IconDecoderCore
1110
{

src/ImageSharp/Formats/Icon/Cur/CurFormat.cs renamed to src/ImageSharp/Formats/Cur/CurFormat.cs

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

4-
namespace SixLabors.ImageSharp.Formats.Icon.Cur;
4+
namespace SixLabors.ImageSharp.Formats.Cur;
55

66
/// <summary>
77
/// Registers the image encoders, decoders and mime type detectors for the ICO format.

src/ImageSharp/Formats/Icon/Cur/CurFrameMetadata.cs renamed to src/ImageSharp/Formats/Cur/CurFrameMetadata.cs

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

4-
namespace SixLabors.ImageSharp.Formats.Icon.Cur;
4+
using SixLabors.ImageSharp.Formats.Icon;
5+
6+
namespace SixLabors.ImageSharp.Formats.Cur;
57

68
/// <summary>
79
/// IcoFrameMetadata.

src/ImageSharp/Formats/Icon/Cur/CurMetadata.cs renamed to src/ImageSharp/Formats/Cur/CurMetadata.cs

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

4-
namespace SixLabors.ImageSharp.Formats.Icon.Cur;
4+
namespace SixLabors.ImageSharp.Formats.Cur;
55

66
/// <summary>
77
/// Provides Ico specific metadata information for the image.

src/ImageSharp/Formats/Icon/Cur/MetadataExtensions.cs renamed to src/ImageSharp/Formats/Cur/MetadataExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Diagnostics.CodeAnalysis;
55
using SixLabors.ImageSharp.Metadata;
66

7-
namespace SixLabors.ImageSharp.Formats.Icon.Cur;
7+
namespace SixLabors.ImageSharp.Formats.Cur;
88

99
/// <summary>
1010
/// Extension methods for the <see cref="ImageMetadata"/> type.

src/ImageSharp/Formats/Icon/Ico/IcoConfigurationModule.cs renamed to src/ImageSharp/Formats/Ico/IcoConfigurationModule.cs

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

4-
namespace SixLabors.ImageSharp.Formats.Icon.Ico;
4+
using SixLabors.ImageSharp.Formats.Icon;
5+
6+
namespace SixLabors.ImageSharp.Formats.Ico;
57

68
/// <summary>
79
/// Registers the image encoders, decoders and mime type detectors for the Ico format.

0 commit comments

Comments
 (0)