v0.11

saucecontrol · Jun 10, 2020 · 52ac410 · 52ac410
1 parent 47980ef
commit 52ac410
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 17 deletions.
diff --git a/doc/docfx.json b/doc/docfx.json
@@ -5,7 +5,7 @@
         {
           "src": "../",
           "files": [
-            "out/bin/MagicScaler/Dist/**\/PhotoSauce.MagicScaler.dll"
+            "out/bin/MagicScaler/Dist/netcoreapp3.0/PhotoSauce.MagicScaler.dll"
           ]
         }
       ],

diff --git a/src/MagicScaler/Core/Enums.cs b/src/MagicScaler/Core/Enums.cs
@@ -81,13 +81,13 @@ public enum FileFormat
 	public enum ColorProfileMode
 	{
 		/// <summary>Convert the input image to a well-known RGB color space during processing.  A minimal compatible color profile will be embedded unless the output image is in the the sRGB color space.</summary>
-		/// <include file='Docs/Remarks.xml' path='doc/member[@name="ColorProfileMode"]/*'/>
+		/// <include file='Docs/Remarks.xml' path='doc/member[@name="ColorProfileMode.Normalize"]/*'/>
 		Normalize,
 		/// <summary>Convert the input image to a well-known RGB color space during processing.  A minimal compatible color profile will be embedded for the output color space, including sRGB.</summary>
-		/// <include file='Docs/Remarks.xml' path='doc/member[@name="ColorProfileMode"]/*'/>
+		/// <include file='Docs/Remarks.xml' path='doc/member[@name="ColorProfileMode.Normalize"]/*'/>
 		NormalizeAndEmbed,
-		/// <summary>Preserve the input image color space during processing.  Embed the source image's ICC profile in the output image.  If the output format does not support embedded profiles, it will be discarded.</summary>
-		/// <ramarks>Be aware that the embedded profile may be very large -- in the case of thumbnails, often larger than the thumbnail image itself.</ramarks>
+		/// <summary>Preserve the input image color space during processing and embed the source image's ICC profile in the output image.  CMYK images will be converted to Adobe RGB.</summary>
+		/// <include file='Docs/Remarks.xml' path='doc/member[@name="ColorProfileMode.Preserve"]/*'/>
 		Preserve,
 		/// <summary>Convert the input image to the <a href="https://en.wikipedia.org/wiki/SRGB">sRGB color space</a> during processing.  Output an untagged sRGB image.</summary>
 		ConvertToSrgb,

diff --git a/src/MagicScaler/Docs/Remarks.xml b/src/MagicScaler/Docs/Remarks.xml
@@ -54,11 +54,17 @@
             or the <a href="https://docs.microsoft.com/en-us/windows/win32/wic/-wic-codec-metadataquerylanguage">Metadata Query Language Overview</a> for explicit path syntax.
             </remarks>
         </member>
-        <member name="ColorProfileMode">
+        <member name="ColorProfileMode.Normalize">
             <remarks>
             Possible output color spaces are <a href="https://en.wikipedia.org/wiki/SRGB">sRGB</a>, <a href="https://en.wikipedia.org/wiki/Adobe_RGB_color_space">Adobe RGB (1998)</a>,
             or <a href="https://en.wikipedia.org/wiki/Display_P3">Display P3</a>.
             An output color space other than sRGB will be used only if the input image is in an alternate color space and the output codec supports embedding an ICC profile.
             </remarks>
         </member>
+        <member name="ColorProfileMode.Preserve">
+            <remarks>
+            Be aware that the embedded profile may be very large -- in the case of thumbnails, often larger than the thumbnail image itself.
+            If the output format does not support embedded profiles, no color space conversion will be performed, and the profile will be discarded.
+            </remarks>
+        </member>
 </doc>
diff --git a/src/ManagedCodecs/ManagedCodecs.csproj b/src/ManagedCodecs/ManagedCodecs.csproj
@@ -2,19 +2,12 @@
 
 	<PropertyGroup>
 		<VersionPrefix>0.0.1</VersionPrefix>
-		<TargetFrameworks>net46;net472;netcoreapp2.1;netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks>net461;net472;netcoreapp2.1;netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\MagicScaler\MagicScaler.csproj" />
-	</ItemGroup>
-
-	<PropertyGroup>
-		<RestoreAdditionalProjectSources>https://www.myget.org/F/sixlabors/api/v3/index.json</RestoreAdditionalProjectSources>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-unstable*" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0002" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/ManagedCodecs/TargaCodec.cs b/src/ManagedCodecs/TargaCodec.cs
@@ -3,7 +3,6 @@
 using System.Runtime.CompilerServices;
 
 using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 
 using PhotoSauce.MagicScaler;

diff --git a/src/WebRSize/WebRSize.csproj b/src/WebRSize/WebRSize.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<VersionPrefix>0.5.2</VersionPrefix>
+		<VersionPrefix>0.6.0</VersionPrefix>
 		<TargetFrameworks>net461;net472</TargetFrameworks>
 	</PropertyGroup>