From 63da967c7f8e41467243993ef64cc45079f46b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=88=B0=E9=98=9F=E7=9A=84=E5=81=B6=E5=83=8F-=E5=B2=9B?= =?UTF-8?q?=E9=A3=8E=E9=85=B1!?= Date: Thu, 14 Dec 2023 14:13:57 +0800 Subject: [PATCH] Flatten namespace. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 舰队的偶像-岛风酱! --- src/ImageSharp/Configuration.cs | 4 ++-- .../Formats/{Icon => }/Cur/CurConfigurationModule.cs | 4 +++- src/ImageSharp/Formats/{Icon => }/Cur/CurConstants.cs | 2 +- src/ImageSharp/Formats/{Icon => }/Cur/CurDecoder.cs | 2 +- src/ImageSharp/Formats/{Icon => }/Cur/CurDecoderCore.cs | 5 ++--- src/ImageSharp/Formats/{Icon => }/Cur/CurFormat.cs | 2 +- src/ImageSharp/Formats/{Icon => }/Cur/CurFrameMetadata.cs | 4 +++- src/ImageSharp/Formats/{Icon => }/Cur/CurMetadata.cs | 2 +- src/ImageSharp/Formats/{Icon => }/Cur/MetadataExtensions.cs | 2 +- .../Formats/{Icon => }/Ico/IcoConfigurationModule.cs | 4 +++- src/ImageSharp/Formats/{Icon => }/Ico/IcoConstants.cs | 2 +- src/ImageSharp/Formats/{Icon => }/Ico/IcoDecoder.cs | 2 +- src/ImageSharp/Formats/{Icon => }/Ico/IcoDecoderCore.cs | 5 ++--- src/ImageSharp/Formats/{Icon => }/Ico/IcoFormat.cs | 2 +- src/ImageSharp/Formats/{Icon => }/Ico/IcoFrameMetadata.cs | 4 +++- src/ImageSharp/Formats/{Icon => }/Ico/IcoMetadata.cs | 2 +- src/ImageSharp/Formats/{Icon => }/Ico/MetadataExtensions.cs | 2 +- tests/ImageSharp.Tests/Formats/Icon/Cur/CurDecoderTests.cs | 4 +--- tests/ImageSharp.Tests/Formats/Icon/Ico/IcoDecoderTests.cs | 2 +- 19 files changed, 30 insertions(+), 26 deletions(-) rename src/ImageSharp/Formats/{Icon => }/Cur/CurConfigurationModule.cs (88%) rename src/ImageSharp/Formats/{Icon => }/Cur/CurConstants.cs (93%) rename src/ImageSharp/Formats/{Icon => }/Cur/CurDecoder.cs (96%) rename src/ImageSharp/Formats/{Icon => }/Cur/CurDecoderCore.cs (84%) rename src/ImageSharp/Formats/{Icon => }/Cur/CurFormat.cs (95%) rename src/ImageSharp/Formats/{Icon => }/Cur/CurFrameMetadata.cs (97%) rename src/ImageSharp/Formats/{Icon => }/Cur/CurMetadata.cs (89%) rename src/ImageSharp/Formats/{Icon => }/Cur/MetadataExtensions.cs (97%) rename src/ImageSharp/Formats/{Icon => }/Ico/IcoConfigurationModule.cs (88%) rename src/ImageSharp/Formats/{Icon => }/Ico/IcoConstants.cs (95%) rename src/ImageSharp/Formats/{Icon => }/Ico/IcoDecoder.cs (96%) rename src/ImageSharp/Formats/{Icon => }/Ico/IcoDecoderCore.cs (84%) rename src/ImageSharp/Formats/{Icon => }/Ico/IcoFormat.cs (95%) rename src/ImageSharp/Formats/{Icon => }/Ico/IcoFrameMetadata.cs (97%) rename src/ImageSharp/Formats/{Icon => }/Ico/IcoMetadata.cs (89%) rename src/ImageSharp/Formats/{Icon => }/Ico/MetadataExtensions.cs (97%) diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs index d6cfd480df..1d9f3bb85d 100644 --- a/src/ImageSharp/Configuration.cs +++ b/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; diff --git a/src/ImageSharp/Formats/Icon/Cur/CurConfigurationModule.cs b/src/ImageSharp/Formats/Cur/CurConfigurationModule.cs similarity index 88% rename from src/ImageSharp/Formats/Icon/Cur/CurConfigurationModule.cs rename to src/ImageSharp/Formats/Cur/CurConfigurationModule.cs index c975bc6099..1c7db4babb 100644 --- a/src/ImageSharp/Formats/Icon/Cur/CurConfigurationModule.cs +++ b/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; /// /// Registers the image encoders, decoders and mime type detectors for the Ico format. diff --git a/src/ImageSharp/Formats/Icon/Cur/CurConstants.cs b/src/ImageSharp/Formats/Cur/CurConstants.cs similarity index 93% rename from src/ImageSharp/Formats/Icon/Cur/CurConstants.cs rename to src/ImageSharp/Formats/Cur/CurConstants.cs index 701b40cf4a..6efd2817c7 100644 --- a/src/ImageSharp/Formats/Icon/Cur/CurConstants.cs +++ b/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; /// /// Defines constants relating to ICOs diff --git a/src/ImageSharp/Formats/Icon/Cur/CurDecoder.cs b/src/ImageSharp/Formats/Cur/CurDecoder.cs similarity index 96% rename from src/ImageSharp/Formats/Icon/Cur/CurDecoder.cs rename to src/ImageSharp/Formats/Cur/CurDecoder.cs index ceefdcaba7..cbe646c47b 100644 --- a/src/ImageSharp/Formats/Icon/Cur/CurDecoder.cs +++ b/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; /// /// Decoder for generating an image out of a ico encoded stream. diff --git a/src/ImageSharp/Formats/Icon/Cur/CurDecoderCore.cs b/src/ImageSharp/Formats/Cur/CurDecoderCore.cs similarity index 84% rename from src/ImageSharp/Formats/Icon/Cur/CurDecoderCore.cs rename to src/ImageSharp/Formats/Cur/CurDecoderCore.cs index 2ed89483a0..4c02246529 100644 --- a/src/ImageSharp/Formats/Icon/Cur/CurDecoderCore.cs +++ b/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 { diff --git a/src/ImageSharp/Formats/Icon/Cur/CurFormat.cs b/src/ImageSharp/Formats/Cur/CurFormat.cs similarity index 95% rename from src/ImageSharp/Formats/Icon/Cur/CurFormat.cs rename to src/ImageSharp/Formats/Cur/CurFormat.cs index 1e5758bc4c..af93382ec0 100644 --- a/src/ImageSharp/Formats/Icon/Cur/CurFormat.cs +++ b/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; /// /// Registers the image encoders, decoders and mime type detectors for the ICO format. diff --git a/src/ImageSharp/Formats/Icon/Cur/CurFrameMetadata.cs b/src/ImageSharp/Formats/Cur/CurFrameMetadata.cs similarity index 97% rename from src/ImageSharp/Formats/Icon/Cur/CurFrameMetadata.cs rename to src/ImageSharp/Formats/Cur/CurFrameMetadata.cs index 2d1c227768..e8f3cfe8ee 100644 --- a/src/ImageSharp/Formats/Icon/Cur/CurFrameMetadata.cs +++ b/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; /// /// IcoFrameMetadata. diff --git a/src/ImageSharp/Formats/Icon/Cur/CurMetadata.cs b/src/ImageSharp/Formats/Cur/CurMetadata.cs similarity index 89% rename from src/ImageSharp/Formats/Icon/Cur/CurMetadata.cs rename to src/ImageSharp/Formats/Cur/CurMetadata.cs index ed3c322b41..5c3486d4a2 100644 --- a/src/ImageSharp/Formats/Icon/Cur/CurMetadata.cs +++ b/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; /// /// Provides Ico specific metadata information for the image. diff --git a/src/ImageSharp/Formats/Icon/Cur/MetadataExtensions.cs b/src/ImageSharp/Formats/Cur/MetadataExtensions.cs similarity index 97% rename from src/ImageSharp/Formats/Icon/Cur/MetadataExtensions.cs rename to src/ImageSharp/Formats/Cur/MetadataExtensions.cs index 400ece6482..2b410a0f95 100644 --- a/src/ImageSharp/Formats/Icon/Cur/MetadataExtensions.cs +++ b/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; /// /// Extension methods for the type. diff --git a/src/ImageSharp/Formats/Icon/Ico/IcoConfigurationModule.cs b/src/ImageSharp/Formats/Ico/IcoConfigurationModule.cs similarity index 88% rename from src/ImageSharp/Formats/Icon/Ico/IcoConfigurationModule.cs rename to src/ImageSharp/Formats/Ico/IcoConfigurationModule.cs index 7074189c77..b27d914657 100644 --- a/src/ImageSharp/Formats/Icon/Ico/IcoConfigurationModule.cs +++ b/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; /// /// Registers the image encoders, decoders and mime type detectors for the Ico format. diff --git a/src/ImageSharp/Formats/Icon/Ico/IcoConstants.cs b/src/ImageSharp/Formats/Ico/IcoConstants.cs similarity index 95% rename from src/ImageSharp/Formats/Icon/Ico/IcoConstants.cs rename to src/ImageSharp/Formats/Ico/IcoConstants.cs index 3457117056..0b963a431b 100644 --- a/src/ImageSharp/Formats/Icon/Ico/IcoConstants.cs +++ b/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; /// /// Defines constants relating to ICOs diff --git a/src/ImageSharp/Formats/Icon/Ico/IcoDecoder.cs b/src/ImageSharp/Formats/Ico/IcoDecoder.cs similarity index 96% rename from src/ImageSharp/Formats/Icon/Ico/IcoDecoder.cs rename to src/ImageSharp/Formats/Ico/IcoDecoder.cs index 5d6137920f..a0c8a30752 100644 --- a/src/ImageSharp/Formats/Icon/Ico/IcoDecoder.cs +++ b/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; /// /// Decoder for generating an image out of a ico encoded stream. diff --git a/src/ImageSharp/Formats/Icon/Ico/IcoDecoderCore.cs b/src/ImageSharp/Formats/Ico/IcoDecoderCore.cs similarity index 84% rename from src/ImageSharp/Formats/Icon/Ico/IcoDecoderCore.cs rename to src/ImageSharp/Formats/Ico/IcoDecoderCore.cs index c7841ce399..859340fb48 100644 --- a/src/ImageSharp/Formats/Icon/Ico/IcoDecoderCore.cs +++ b/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 { diff --git a/src/ImageSharp/Formats/Icon/Ico/IcoFormat.cs b/src/ImageSharp/Formats/Ico/IcoFormat.cs similarity index 95% rename from src/ImageSharp/Formats/Icon/Ico/IcoFormat.cs rename to src/ImageSharp/Formats/Ico/IcoFormat.cs index 27b0525bfa..5f89ab7f28 100644 --- a/src/ImageSharp/Formats/Icon/Ico/IcoFormat.cs +++ b/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; /// /// Registers the image encoders, decoders and mime type detectors for the ICO format. diff --git a/src/ImageSharp/Formats/Icon/Ico/IcoFrameMetadata.cs b/src/ImageSharp/Formats/Ico/IcoFrameMetadata.cs similarity index 97% rename from src/ImageSharp/Formats/Icon/Ico/IcoFrameMetadata.cs rename to src/ImageSharp/Formats/Ico/IcoFrameMetadata.cs index 82e3c1db38..2a275d1a1d 100644 --- a/src/ImageSharp/Formats/Icon/Ico/IcoFrameMetadata.cs +++ b/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; /// /// IcoFrameMetadata. TODO: Remove base class and merge into this class. diff --git a/src/ImageSharp/Formats/Icon/Ico/IcoMetadata.cs b/src/ImageSharp/Formats/Ico/IcoMetadata.cs similarity index 89% rename from src/ImageSharp/Formats/Icon/Ico/IcoMetadata.cs rename to src/ImageSharp/Formats/Ico/IcoMetadata.cs index b227d0bd6a..f165bf9164 100644 --- a/src/ImageSharp/Formats/Icon/Ico/IcoMetadata.cs +++ b/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; /// /// Provides Ico specific metadata information for the image. diff --git a/src/ImageSharp/Formats/Icon/Ico/MetadataExtensions.cs b/src/ImageSharp/Formats/Ico/MetadataExtensions.cs similarity index 97% rename from src/ImageSharp/Formats/Icon/Ico/MetadataExtensions.cs rename to src/ImageSharp/Formats/Ico/MetadataExtensions.cs index fb5b4afe77..ba21d0abc5 100644 --- a/src/ImageSharp/Formats/Icon/Ico/MetadataExtensions.cs +++ b/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; /// /// Extension methods for the type. diff --git a/tests/ImageSharp.Tests/Formats/Icon/Cur/CurDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Icon/Cur/CurDecoderTests.cs index f78c04cdf2..d1587d35b6 100644 --- a/tests/ImageSharp.Tests/Formats/Icon/Cur/CurDecoderTests.cs +++ b/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 } } diff --git a/tests/ImageSharp.Tests/Formats/Icon/Ico/IcoDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Icon/Ico/IcoDecoderTests.cs index 86f8b003b1..56378653a2 100644 --- a/tests/ImageSharp.Tests/Formats/Icon/Ico/IcoDecoderTests.cs +++ b/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;