Merge pull request #322 from SixLabors/jpeg-lab

Reimplemented Jpeg postprocessor logic + fixed bugs in stream parsing
SixLabors · Sep 3, 2017 · 1799cd4 · 1799cd4
2 parents 452056f + 3f49e39
commit 1799cd4
Show file tree

Hide file tree

Showing 149 changed files with 7,300 additions and 5,064 deletions.
diff --git a/ImageSharp.sln.DotSettings b/ImageSharp.sln.DotSettings
@@ -342,6 +342,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/QualifiedUsingAtNestedScope/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AC/@EntryIndexedValue">AC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DC/@EntryIndexedValue">DC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DCT/@EntryIndexedValue">DCT</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EOF/@EntryIndexedValue">EOF</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FDCT/@EntryIndexedValue">FDCT</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IDCT/@EntryIndexedValue">IDCT</s:String>

diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs
@@ -77,6 +77,11 @@ public Configuration(params IConfigurationModule[] configurationModules)
         /// </summary>
         public ParallelOptions ParallelOptions { get; } = new ParallelOptions { MaxDegreeOfParallelism = Environment.ProcessorCount };
 
+        /// <summary>
+        /// Gets the currently registered <see cref="IImageFormat"/>s.
+        /// </summary>
+        public IEnumerable<IImageFormat> ImageFormats => this.imageFormats;
+
         /// <summary>
         /// Gets the maximum header size of all the formats.
         /// </summary>
@@ -97,11 +102,6 @@ public Configuration(params IConfigurationModule[] configurationModules)
         /// </summary>
         internal IEnumerable<KeyValuePair<IImageFormat, IImageEncoder>> ImageEncoders => this.mimeTypeEncoders;
 
-        /// <summary>
-        /// Gets the currently registered <see cref="IImageFormat"/>s.
-        /// </summary>
-        internal IEnumerable<IImageFormat> ImageFormats => this.imageFormats;
-
 #if !NETSTANDARD1_1
         /// <summary>
         /// Gets or sets the filesystem helper for accessing the local file system.
@@ -201,29 +201,12 @@ public void AddImageFormatDetector(IImageFormatDetector detector)
             this.SetMaxHeaderSize();
         }
 
-        /// <summary>
-        /// Creates the default instance with the following <see cref="IConfigurationModule"/>s preregistered:
-        /// <para><see cref="PngConfigurationModule"/></para>
-        /// <para><see cref="JpegConfigurationModule"/></para>
-        /// <para><see cref="GifConfigurationModule"/></para>
-        /// <para><see cref="BmpConfigurationModule"/></para>
-        /// </summary>
-        /// <returns>The default configuration of <see cref="Configuration"/></returns>
-        internal static Configuration CreateDefaultInstance()
-        {
-            return new Configuration(
-                new PngConfigurationModule(),
-                new JpegConfigurationModule(),
-                new GifConfigurationModule(),
-                new BmpConfigurationModule());
-        }
-
         /// <summary>
         /// For the specified mime type find the decoder.
         /// </summary>
         /// <param name="format">The format to discover</param>
         /// <returns>The <see cref="IImageDecoder"/> if found otherwise null</returns>
-        internal IImageDecoder FindDecoder(IImageFormat format)
+        public IImageDecoder FindDecoder(IImageFormat format)
         {
             Guard.NotNull(format, nameof(format));
             if (this.mimeTypeDecoders.TryGetValue(format, out IImageDecoder decoder))
@@ -239,7 +222,7 @@ internal IImageDecoder FindDecoder(IImageFormat format)
         /// </summary>
         /// <param name="format">The format to discover</param>
         /// <returns>The <see cref="IImageEncoder"/> if found otherwise null</returns>
-        internal IImageEncoder FindEncoder(IImageFormat format)
+        public IImageEncoder FindEncoder(IImageFormat format)
         {
             Guard.NotNull(format, nameof(format));
             if (this.mimeTypeEncoders.TryGetValue(format, out IImageEncoder encoder))
@@ -250,6 +233,23 @@ internal IImageEncoder FindEncoder(IImageFormat format)
             return null;
         }
 
+        /// <summary>
+        /// Creates the default instance with the following <see cref="IConfigurationModule"/>s preregistered:
+        /// <para><see cref="PngConfigurationModule"/></para>
+        /// <para><see cref="JpegConfigurationModule"/></para>
+        /// <para><see cref="GifConfigurationModule"/></para>
+        /// <para><see cref="BmpConfigurationModule"/></para>
+        /// </summary>
+        /// <returns>The default configuration of <see cref="Configuration"/></returns>
+        internal static Configuration CreateDefaultInstance()
+        {
+            return new Configuration(
+                new PngConfigurationModule(),
+                new JpegConfigurationModule(),
+                new GifConfigurationModule(),
+                new BmpConfigurationModule());
+        }
+
         /// <summary>
         /// Sets the max header size.
         /// </summary>