Flatten namespace.

Signed-off-by: 舰队的偶像-岛风酱! <frg2089@outlook.com>

src/ImageSharp/Configuration.cs

@@ -4,9 +4,9 @@
 using System.Collections.Concurrent;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Bmp;
+using SixLabors.ImageSharp.Formats.Cur;
 using SixLabors.ImageSharp.Formats.Gif;
-using SixLabors.ImageSharp.Formats.Icon.Cur;
-using SixLabors.ImageSharp.Formats.Icon.Ico;
+using SixLabors.ImageSharp.Formats.Ico;
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Pbm;
 using SixLabors.ImageSharp.Formats.Png;

src/ImageSharp/Formats/Icon/Cur/CurConfigurationModule.cs → src/ImageSharp/Formats/Cur/CurConfigurationModule.cs

@@ -1,7 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Icon.Cur;
+using SixLabors.ImageSharp.Formats.Icon;
+
+namespace SixLabors.ImageSharp.Formats.Cur;
 
 /// <summary>
 /// Registers the image encoders, decoders and mime type detectors for the Ico format.

src/ImageSharp/Formats/Icon/Cur/CurConstants.cs → src/ImageSharp/Formats/Cur/CurConstants.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Icon.Cur;
+namespace SixLabors.ImageSharp.Formats.Cur;
 
 /// <summary>
 /// Defines constants relating to ICOs

src/ImageSharp/Formats/Icon/Cur/CurDecoder.cs → src/ImageSharp/Formats/Cur/CurDecoder.cs

@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats.Icon.Cur;
+namespace SixLabors.ImageSharp.Formats.Cur;
 
 /// <summary>
 /// Decoder for generating an image out of a ico encoded stream.

src/ImageSharp/Formats/Icon/Cur/CurDecoderCore.cs → src/ImageSharp/Formats/Cur/CurDecoderCore.cs

@@ -1,11 +1,10 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using SixLabors.ImageSharp.Formats.Icon;
 using SixLabors.ImageSharp.Metadata;
 
-// TODO: flatten namespace.
-// namespace SixLabors.ImageSharp.Formats.Cur;
-namespace SixLabors.ImageSharp.Formats.Icon.Cur;
+namespace SixLabors.ImageSharp.Formats.Cur;
 
 internal sealed class CurDecoderCore : IconDecoderCore
 {

src/ImageSharp/Formats/Icon/Cur/CurFormat.cs → src/ImageSharp/Formats/Cur/CurFormat.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Icon.Cur;
+namespace SixLabors.ImageSharp.Formats.Cur;
 
 /// <summary>
 /// Registers the image encoders, decoders and mime type detectors for the ICO format.

src/ImageSharp/Formats/Icon/Cur/CurFrameMetadata.cs → src/ImageSharp/Formats/Cur/CurFrameMetadata.cs

@@ -1,7 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Icon.Cur;
+using SixLabors.ImageSharp.Formats.Icon;
+
+namespace SixLabors.ImageSharp.Formats.Cur;
 
 /// <summary>
 /// IcoFrameMetadata.

src/ImageSharp/Formats/Icon/Cur/CurMetadata.cs → src/ImageSharp/Formats/Cur/CurMetadata.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Icon.Cur;
+namespace SixLabors.ImageSharp.Formats.Cur;
 
 /// <summary>
 /// Provides Ico specific metadata information for the image.

src/ImageSharp/Formats/Icon/Cur/MetadataExtensions.cs → src/ImageSharp/Formats/Cur/MetadataExtensions.cs

@@ -4,7 +4,7 @@
 using System.Diagnostics.CodeAnalysis;
 using SixLabors.ImageSharp.Metadata;
 
-namespace SixLabors.ImageSharp.Formats.Icon.Cur;
+namespace SixLabors.ImageSharp.Formats.Cur;
 
 /// <summary>
 /// Extension methods for the <see cref="ImageMetadata"/> type.

src/ImageSharp/Formats/Icon/Ico/IcoConfigurationModule.cs → src/ImageSharp/Formats/Ico/IcoConfigurationModule.cs

@@ -1,7 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Icon.Ico;
+using SixLabors.ImageSharp.Formats.Icon;
+
+namespace SixLabors.ImageSharp.Formats.Ico;
 
 /// <summary>
 /// Registers the image encoders, decoders and mime type detectors for the Ico format.

src/ImageSharp/Formats/Icon/Ico/IcoConstants.cs → src/ImageSharp/Formats/Ico/IcoConstants.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Icon.Ico;
+namespace SixLabors.ImageSharp.Formats.Ico;
 
 /// <summary>
 /// Defines constants relating to ICOs

src/ImageSharp/Formats/Icon/Ico/IcoDecoder.cs → src/ImageSharp/Formats/Ico/IcoDecoder.cs

@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats.Icon.Ico;
+namespace SixLabors.ImageSharp.Formats.Ico;
 
 /// <summary>
 /// Decoder for generating an image out of a ico encoded stream.

src/ImageSharp/Formats/Icon/Ico/IcoDecoderCore.cs → src/ImageSharp/Formats/Ico/IcoDecoderCore.cs

@@ -1,11 +1,10 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using SixLabors.ImageSharp.Formats.Icon;
 using SixLabors.ImageSharp.Metadata;
 
-// TODO: flatten namespace.
-// namespace SixLabors.ImageSharp.Formats.Ico;
-namespace SixLabors.ImageSharp.Formats.Icon.Ico;
+namespace SixLabors.ImageSharp.Formats.Ico;
 
 internal sealed class IcoDecoderCore : IconDecoderCore
 {

src/ImageSharp/Formats/Icon/Ico/IcoFormat.cs → src/ImageSharp/Formats/Ico/IcoFormat.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Icon.Ico;
+namespace SixLabors.ImageSharp.Formats.Ico;
 
 /// <summary>
 /// Registers the image encoders, decoders and mime type detectors for the ICO format.

src/ImageSharp/Formats/Icon/Ico/IcoFrameMetadata.cs → src/ImageSharp/Formats/Ico/IcoFrameMetadata.cs

@@ -1,7 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Icon.Ico;
+using SixLabors.ImageSharp.Formats.Icon;
+
+namespace SixLabors.ImageSharp.Formats.Ico;
 
 /// <summary>
 /// IcoFrameMetadata. TODO: Remove base class and merge into this class.

src/ImageSharp/Formats/Icon/Ico/IcoMetadata.cs → src/ImageSharp/Formats/Ico/IcoMetadata.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Icon.Ico;
+namespace SixLabors.ImageSharp.Formats.Ico;
 
 /// <summary>
 /// Provides Ico specific metadata information for the image.

src/ImageSharp/Formats/Icon/Ico/MetadataExtensions.cs → src/ImageSharp/Formats/Ico/MetadataExtensions.cs

@@ -4,7 +4,7 @@
 using System.Diagnostics.CodeAnalysis;
 using SixLabors.ImageSharp.Metadata;
 
-namespace SixLabors.ImageSharp.Formats.Icon.Ico;
+namespace SixLabors.ImageSharp.Formats.Ico;
 
 /// <summary>
 /// Extension methods for the <see cref="ImageMetadata"/> type.

tests/ImageSharp.Tests/Formats/Icon/Cur/CurDecoderTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.Formats.Icon.Cur;
+using SixLabors.ImageSharp.Formats.Cur;
 using SixLabors.ImageSharp.PixelFormats;
 using static SixLabors.ImageSharp.Tests.TestImages.Cur;
 
@@ -19,8 +19,6 @@ public class CurDecoderTests
 
         image.DebugSaveMultiFrame(provider, extension: "png");
 
-        image.DebugSaveMultiFrame(provider, extension: "png");
-
         // TODO: Assert metadata, frame count, etc
     }
 }

tests/ImageSharp.Tests/Formats/Icon/Ico/IcoDecoderTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.Formats.Icon.Ico;
+using SixLabors.ImageSharp.Formats.Ico;
 using SixLabors.ImageSharp.PixelFormats;
 using static SixLabors.ImageSharp.Tests.TestImages.Ico;