Merge pull request #1 from SixLabors/master

Update from SixLabors/ImageSharp

.editorconfig

@@ -1,20 +1,371 @@
-# top-most EditorConfig file
+###############################################################################
+# EditorConfig is awesome: http://EditorConfig.org
+###############################################################################
+
+###############################################################################
+# Top-most EditorConfig file
+###############################################################################
 root = true
 
-[*.cs]
+###############################################################################
+# Set default behavior to:
+#   a UTF-8 encoding,
+#   Unix-style line endings,
+#   a newline ending the file,
+#   4 space indentation, and
+#   trimming of trailing whitespace
+###############################################################################
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
 indent_style = space
 indent_size = 4
-csharp_style_var_for_built_in_types = false:warning
-csharp_style_var_elsewhere = false:warning
-csharp_style_var_when_type_is_apparent = true:warning
+trim_trailing_whitespace = true
+
+###############################################################################
+# Set file behavior to:
+#   2 space indentation
+###############################################################################
+[*.{cmd,config,csproj,json,props,ps1,resx,sh,targets}]
+indent_size = 2
+
+###############################################################################
+# Set file behavior to:
+#   Windows-style line endings, and
+#   tabular indentation
+###############################################################################
+[*.sln]
 end_of_line = crlf
+indent_style = tab
+
+###############################################################################
+# Set dotnet naming rules to:
+#    suggest async members be pascal case suffixed with Async
+#    suggest const declarations be pascal case
+#    suggest interfaces be pascal case prefixed with I
+#    suggest parameters be camel case
+#    suggest private and internal static fields be camel case
+#    suggest private and internal fields be camel case
+#    suggest public and protected declarations be pascal case
+#    suggest static readonly declarations be pascal case
+#    suggest type parameters be prefixed with T
+###############################################################################
+[*.cs]
+dotnet_naming_rule.async_members_should_be_pascal_case_suffixed_with_async.severity = suggestion
+dotnet_naming_rule.async_members_should_be_pascal_case_suffixed_with_async.style = pascal_case_suffixed_with_async
+dotnet_naming_rule.async_members_should_be_pascal_case_suffixed_with_async.symbols = async_members
+
+dotnet_naming_rule.const_declarations_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.const_declarations_should_be_pascal_case.style = pascal_case
+dotnet_naming_rule.const_declarations_should_be_pascal_case.symbols = const_declarations
+
+dotnet_naming_rule.interfaces_should_be_pascal_case_prefixed_with_i.severity = suggestion
+dotnet_naming_rule.interfaces_should_be_pascal_case_prefixed_with_i.style = pascal_case_prefixed_with_i
+dotnet_naming_rule.interfaces_should_be_pascal_case_prefixed_with_i.symbols = interfaces
+
+dotnet_naming_rule.parameters_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.parameters_should_be_camel_case.style = camel_case
+dotnet_naming_rule.parameters_should_be_camel_case.symbols = parameters
+
+dotnet_naming_rule.private_and_internal_static_fields_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.private_and_internal_static_fields_should_be_camel_case.style = camel_case
+dotnet_naming_rule.private_and_internal_static_fields_should_be_camel_case.symbols = private_and_internal_static_fields
+
+dotnet_naming_rule.private_and_internal_fields_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.private_and_internal_fields_should_be_camel_case.style = camel_case
+dotnet_naming_rule.private_and_internal_fields_should_be_camel_case.symbols = private_and_internal_fields
+
+dotnet_naming_rule.public_and_protected_declarations_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.public_and_protected_declarations_should_be_pascal_case.style = pascal_case
+dotnet_naming_rule.public_and_protected_declarations_should_be_pascal_case.symbols = public_and_protected_declarations
+
+dotnet_naming_rule.static_readonly_declarations_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.static_readonly_declarations_should_be_pascal_case.style = pascal_case
+dotnet_naming_rule.static_readonly_declarations_should_be_pascal_case.symbols = static_readonly_declarations
+
+dotnet_naming_rule.type_parameters_should_be_pascal_case_prefixed_with_t.severity = suggestion
+dotnet_naming_rule.type_parameters_should_be_pascal_case_prefixed_with_t.style = pascal_case_prefixed_with_t
+dotnet_naming_rule.type_parameters_should_be_pascal_case_prefixed_with_t.symbols = type_parameters
+
+###############################################################################
+# Set dotnet naming styles to define:
+#   camel case
+#   pascal case
+#   pascal case suffixed with Async
+#   pascal case prefixed with I
+#   pascal case prefixed with T
+###############################################################################
+[*.cs]
+dotnet_naming_style.camel_case.capitalization = camel_case
+
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case_suffixed_with_async.capitalization = pascal_case
+dotnet_naming_style.pascal_case_suffixed_with_async.required_suffix = Async
+
+dotnet_naming_style.pascal_case_prefixed_with_i.capitalization = pascal_case
+dotnet_naming_style.pascal_case_prefixed_with_i.required_prefix = I
+
+dotnet_naming_style.pascal_case_prefixed_with_t.capitalization = pascal_case
+dotnet_naming_style.pascal_case_prefixed_with_t.required_prefix = T
+
+###############################################################################
+# Set dotnet naming symbols to:
+#   async members
+#   const declarations
+#   interfaces
+#   private and internal fields
+#   private and internal static fields
+#   public and protected declarations
+#   static readonly declarations
+#   type parameters
+###############################################################################
+[*.cs]
+dotnet_naming_symbols.async_members.required_modifiers = async
+
+dotnet_naming_symbols.const_declarations.required_modifiers = const
+
+dotnet_naming_symbols.interfaces.applicable_kinds = interface
+
+dotnet_naming_symbols.parameters.applicable_kinds = parameter
+
+dotnet_naming_symbols.private_and_internal_fields.applicable_accessibilities = private, internal
+dotnet_naming_symbols.private_and_internal_fields.applicable_kinds = field
+
+dotnet_naming_symbols.private_and_internal_static_fields.applicable_accessibilities = private, internal
+dotnet_naming_symbols.private_and_internal_static_fields.applicable_kinds = field
+dotnet_naming_symbols.private_and_internal_static_fields.required_modifiers = static
+
+dotnet_naming_symbols.public_and_protected_declarations.applicable_accessibilities = public, protected
+
+dotnet_naming_symbols.static_readonly_declarations.required_modifiers = static, readonly
+
+dotnet_naming_symbols.type_parameters.applicable_kinds = type_parameter
+
+###############################################################################
+# Set dotnet sort options to:
+#   do not separate import directives into groups, and
+#   sort system directives first
+###############################################################################
+[*.cs]
+dotnet_separate_import_directive_groups = false
 dotnet_sort_system_directives_first = true
+
+###############################################################################
+# Set dotnet style options to:
+#   suggest null-coalescing expressions,
+#   suggest collection-initializers,
+#   suggest explicit tuple names,
+#   suggest null-propogation
+#   suggest object-initializers,
+#   generate parentheses in arithmetic binary operators for clarity,
+#   generate parentheses in other binary operators for clarity,
+#   don't generate parentheses in other operators if unnecessary,
+#   generate parentheses in relational binary operators for clarity,
+#   warn when not using predefined-types for locals, parameters, and members,
+#   generate predefined-types of type names for member access,
+#   generate auto properties,
+#   suggest compound assignment,
+#   generate conditional expression over assignment,
+#   generate conditional expression over return,
+#   suggest inferred anonymous types,
+#   suggest inferred tuple names,
+#   suggest 'is null' checks over '== null',
+#   don't generate 'this.' and 'Me.' for events,
+#   warn when not using 'this.' and 'Me.' for fields,
+#   warn when not using 'this.' and 'Me.' for methods,
+#   warn when not using 'this.' and 'Me.' for properties,
+#   suggest readonly fields, and
+#   generate accessibility modifiers for non interface members
+###############################################################################
+[*.cs]
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_object_initializer = true:suggestion
+
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+
 dotnet_style_predefined_type_for_locals_parameters_members = true:warning
-dotnet_style_predefined_type_for_member_access = true:warning
+dotnet_style_predefined_type_for_member_access = true:silent
+
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+
+dotnet_style_qualification_for_event = false:silent
 dotnet_style_qualification_for_field = true:warning
 dotnet_style_qualification_for_method = true:warning
 dotnet_style_qualification_for_property = true:warning
 
-[*.tt]
-indent_style = space
-indent_size = 4
+dotnet_style_readonly_field = true:suggestion
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+
+###############################################################################
+# Set dotnet style options to:
+#   suggest removing all unused parameters
+###############################################################################
+[*.cs]
+dotnet_code_quality_unused_parameters = all:suggestion
+
+###############################################################################
+# Set csharp indent options to:
+#   indent block contents,
+#   not indent braces,
+#   indent case contents,
+#   not indent case contents when block,
+#   indent labels one less than the current, and
+#   indent switch labels
+###############################################################################
+[*.cs]
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+###############################################################################
+# Set csharp new-line options to:
+#   insert a new-line before "catch",
+#   insert a new-line before "else",
+#   insert a new-line before "finally",
+#   insert a new-line before members in anonymous-types,
+#   insert a new-line before members in object-initializers, and
+#   insert a new-line before all open braces
+###############################################################################
+[*.cs]
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = true
+
+csharp_new_line_before_open_brace = all
+
+###############################################################################
+# Set csharp preserve options to:
+#   preserve single-line blocks, and
+#   preserve single-line statements
+###############################################################################
+[*.cs]
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+###############################################################################
+# Set csharp space options to:
+#   remove any space after a cast,
+#   add a space after the colon in an inheritance clause,
+#   add a space after a comma,
+#   remove any space after a dot,
+#   add a space after keywords in control flow statements,
+#   add a space after a semicolon in a "for" statement,
+#   add a space before and after binary operators,
+#   remove space around declaration statements,
+#   add a space before the colon in an inheritance clause,
+#   remove any space before a comma,
+#   remove any space before a dot,
+#   remove any space before an open square-bracket,
+#   remove any space before a semicolon in a "for" statement,
+#   remove any space between empty square-brackets,
+#   remove any space between a method call's empty parameter list parenthesis,
+#   remove any space between a method call's name and its opening parenthesis,
+#   remove any space between a method call's parameter list parenthesis,
+#   remove any space between a method declaration's empty parameter list parenthesis,
+#   remove any space between a method declaration's name and its openening parenthesis,
+#   remove any space between a method declaration's parameter list parenthesis,
+#   remove any space between parentheses, and
+#   remove any space between square brackets
+###############################################################################
+[*.cs]
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = do_not_ignore
+
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+###############################################################################
+# Set csharp style options to:
+#   generate braces,
+#   suggest simple default expressions,
+#   generate a preferred modifier order,
+#   suggest conditional delegate calls,
+#   suggest deconstructed variable declarations,
+#   generate expression-bodied accessors,
+#   don't generate expression-bodied constructors,
+#   generate expression-bodied indexers,
+#   generate expression-bodied lambdas,
+#   don't generate expression-bodied methods,
+#   don't generate expression-bodied operators,
+#   generate expression-bodied properties,
+#   suggest inlined variable declarations,
+#   suggest local over anonymous functions,
+#   suggest pattern-matching over "as" with "null" check,
+#   suggest pattern-matching over "is" with "cast" check,
+#   suggest throw expressions,
+#   generate a discard variable for unused value expression statements,
+#   suggest a discard variable for unused assignments,
+#   warn when using var for built-in types,
+#   warn when using var when the type is not apparent, and
+#   warn when not using var when the type is apparent
+###############################################################################
+[*.cs]
+csharp_prefer_braces = true:silent
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:silent
+
+csharp_style_conditional_delegate_call = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:suggestion
+
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+
+csharp_style_inlined_variable_declaration = true:suggestion
+
+csharp_style_pattern_local_over_anonymous_function = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+
+csharp_style_throw_expression = true:suggestion
+
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+
+csharp_style_var_for_built_in_types = false:warning
+csharp_style_var_elsewhere = false:warning
+csharp_style_var_when_type_is_apparent = true:warning

.gitattributes

@@ -1,49 +1,108 @@
-*.doc  diff=astextplain
-*.DOC	diff=astextplain
-*.docx	diff=astextplain
-*.DOCX	diff=astextplain
-*.dot	diff=astextplain
-*.DOT	diff=astextplain
-*.pdf	diff=astextplain
-*.PDF	diff=astextplain
-*.rtf	diff=astextplain
-*.RTF	diff=astextplain
+###############################################################################
+# Set default behavior to:
+#   treat as text and
+#   normalize to Unix-style line endings
+###############################################################################
+*           text        eol=lf
 
-*.jpg  	binary
-*.png 	binary
-*.gif 	binary
+###############################################################################
+# Set explicit file behavior to:
+#   treat as text and
+#   normalize to Unix-style line endings
+###############################################################################
+*.asm               text        eol=lf
+*.c                 text        eol=lf
+*.clj               text        eol=lf
+*.cmd               text        eol=lf
+*.cpp               text        eol=lf
+*.css               text        eol=lf
+*.cxx               text        eol=lf
+*.config            text        eol=lf
+*.DotSettings       text        eol=lf
+*.erl               text        eol=lf
+*.fs                text        eol=lf
+*.fsx               text        eol=lf
+*.h                 text        eol=lf
+*.htm               text        eol=lf
+*.html              text        eol=lf
+*.hs                text        eol=lf
+*.hxx               text        eol=lf
+*.java              text        eol=lf
+*.js                text        eol=lf
+*.json              text        eol=lf
+*.less              text        eol=lf
+*.lisp              text        eol=lf
+*.lua               text        eol=lf
+*.m                 text        eol=lf
+*.md                text        eol=lf
+*.php               text        eol=lf
+*.props             text        eol=lf
+*.ps1               text        eol=lf
+*.py                text        eol=lf
+*.rb                text        eol=lf
+*.resx              text        eol=lf
+*.runsettings       text        eol=lf
+*.ruleset           text        eol=lf
+*.sass              text        eol=lf
+*.scss              text        eol=lf
+*.sh                text        eol=lf
+*.sql               text        eol=lf
+*.svg               text        eol=lf
+*.targets           text        eol=lf
+*.tt                text        eol=lf
+*.ttinclude         text        eol=crlf
+*.txt               text        eol=lf
+*.vb                text        eol=lf
+*.yml               text        eol=lf
 
-*.cs text=auto diff=csharp 
-*.vb text=auto
-*.c text=auto
-*.cpp text=auto
-*.cxx text=auto
-*.h text=auto
-*.hxx text=auto
-*.py text=auto
-*.rb text=auto
-*.java text=auto
-*.html text=auto
-*.htm text=auto
-*.css text=auto
-*.scss text=auto
-*.sass text=auto
-*.less text=auto
-*.js text=auto
-*.lisp text=auto
-*.clj text=auto
-*.sql text=auto
-*.php text=auto
-*.lua text=auto
-*.m text=auto
-*.asm text=auto
-*.erl text=auto
-*.fs text=auto
-*.fsx text=auto
-*.hs text=auto
+###############################################################################
+# Set explicit file behavior to:
+#   treat as text
+#   normalize to Unix-style line endings and
+#   diff as csharp
+###############################################################################
+*.cs                text        eol=lf          diff=csharp
 
-*.csproj text=auto merge=union 
-*.vbproj text=auto merge=union 
-*.fsproj text=auto merge=union 
-*.dbproj text=auto merge=union 
-*.sln text=auto eol=crlf merge=union 
+###############################################################################
+# Set explicit file behavior to:
+#   treat as text
+#   normalize to Unix-style line endings and
+#   use a union merge when resoling conflicts
+###############################################################################
+*.csproj            text        eol=lf          merge=union
+*.dbproj            text        eol=lf          merge=union
+*.fsproj            text        eol=lf          merge=union
+*.ncrunchproject    text        eol=lf          merge=union
+*.vbproj            text        eol=lf          merge=union
+
+###############################################################################
+# Set explicit file behavior to:
+#   treat as text
+#   normalize to Windows-style line endings and
+#   use a union merge when resoling conflicts
+###############################################################################
+*.sln               text        eol=crlf        merge=union
+
+###############################################################################
+# Set explicit file behavior to:
+#   treat as binary
+###############################################################################
+*.bmp               binary
+*.dll               binary
+*.exe               binary
+*.gif               binary
+*.jpg               binary
+*.png               binary
+*.ttf               binary
+*.snk               binary
+
+###############################################################################
+# Set explicit file behavior to:
+#   diff as plain text
+###############################################################################
+*.doc               diff=astextplain
+*.docx              diff=astextplain
+*.dot               diff=astextplain
+*.pdf               diff=astextplain
+*.pptx              diff=astextplain
+*.rtf               diff=astextplain

.github/FUNDING.yml

@@ -0,0 +1 @@
+open_collective: imagesharp

.gitmodules

@@ -2,3 +2,6 @@
 	path = tests/Images/External
 	url = https://github.com/SixLabors/Imagesharp.Tests.Images.git
 	branch = master
+[submodule "standards"]
+	path = standards
+	url = https://github.com/SixLabors/Standards

.travis.yml

@@ -3,10 +3,10 @@ solution: ImageSharp.sln
 
 matrix:
   include:
-    - os: linux # Ubuntu 14.04
-      dist: trusty
+    - os: linux # Ubuntu 16.04
+      dist: xenial
       sudo: required
-      dotnet: 2.1.401
+      dotnet: 2.1.603
       mono: latest
 #    - os: osx # OSX 10.11
 #      osx_image: xcode7.3.1

Directory.Build.props

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <!--
+    Directory.Build.props is automatically picked up and imported by
+    Microsoft.Common.props. This file needs to exist, even if empty so that
+    files in the parent directory tree, with the same name, are not imported
+    instead. The import fairly early and only Sdk.props will have been imported
+    beforehand. We also don't need to add ourselves to MSBuildAllProjects, as
+    that is done by the file that imports us.
+  -->
+
+  <!-- Default settings that are used by other settings -->
+  <PropertyGroup>
+    <BaseArtifactsPath>$(MSBuildThisFileDirectory)artifacts/</BaseArtifactsPath>
+    <BaseArtifactsPathSuffix>$(ImageSharpProjectCategory)/$(MSBuildProjectName)</BaseArtifactsPathSuffix>
+    <RepositoryUrl>https://github.com/SixLabors/ImageSharp/</RepositoryUrl>
+  </PropertyGroup>
+
+  <!-- Default settings that explicitly differ from the Sdk.props defaults  -->
+  <PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <BaseIntermediateOutputPath>$(BaseArtifactsPath)obj/$(BaseArtifactsPathSuffix)/</BaseIntermediateOutputPath>
+    <DebugType>portable</DebugType>
+    <DebugType Condition="'$(codecov)' != ''">full</DebugType>
+    <NullableContextOptions>disable</NullableContextOptions>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <SignAssembly>false</SignAssembly>
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  
+  <!--TODO: Check what this is testing for and why does it fail?-->
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+  </PropertyGroup>
+
+  <!-- Default settings that explicitly differ from the Sdk.targets defaults-->
+  <PropertyGroup>
+    <Authors>Six Labors and contributors</Authors>
+    <BaseOutputPath>$(BaseArtifactsPath)bin/$(BaseArtifactsPathSuffix)/</BaseOutputPath>
+    <Company>Six Labors</Company>
+    <PackageOutputPath>$(BaseArtifactsPath)pkg/$(BaseArtifactsPathSuffix)/$(Configuration)/</PackageOutputPath>
+    <Product>SixLabors.ImageSharp</Product>
+    <VersionPrefix>0.0.1</VersionPrefix>
+    <VersionPrefix Condition="'$(packageversion)' != ''">$(PackageVersion)</VersionPrefix>
+    <VersionSuffix></VersionSuffix>
+  </PropertyGroup>
+
+  <!-- Default settings that are otherwise undefined -->
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)standards/SixLabors.snk</AssemblyOriginatorKeyFile>
+    <Copyright>Copyright © Six Labors and Contributors</Copyright>
+    <Features>strict;IOperation</Features>
+    <HighEntropyVA>true</HighEntropyVA>
+    <LangVersion>7.3</LangVersion>
+    <NeutralLanguage>en</NeutralLanguage>
+    <OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>
+    <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/imagesharp/sixlabors.imagesharp.128.png</PackageIconUrl>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
+    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+    <RepositoryType>git</RepositoryType>
+    <RestoreSources>
+      https://www.myget.org/F/sixlabors/api/v3/index.json;
+      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
+      https://api.nuget.org/v3/index.json;
+    </RestoreSources>
+    <SixLaborsPublicKey>002400000c8000009400000006020000002400005253413100040000010001000147e6fe6766715eec6cfed61f1e7dcdbf69748a3e355c67e9d8dfd953acab1d5e012ba34b23308166fdc61ee1d0390d5f36d814a6091dd4b5ed9eda5a26afced924c683b4bfb4b3d64b0586a57eff9f02b1f84e3cb0ddd518bd1697f2c84dcbb97eb8bb5c7801be12112ed0ec86db934b0e9a5171e6bb1384b6d2f7d54dfa97</SixLaborsPublicKey>
+    <UseSharedCompilation>true</UseSharedCompilation>
+  </PropertyGroup>
+
+  <!-- Package references which are consumed by all projects -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
+</Project>

Directory.Build.targets

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <!--
+    Directory.Build.targets is automatically picked up and imported by
+    Microsoft.Common.targets. This file needs to exist, even if empty so that
+    files in the parent directory tree, with the same name, are not imported
+    instead. The import fairly late and most other props/targets will have been
+    imported beforehand. We also don't need to add ourselves to
+    MSBuildAllProjects, as that is done by the file that imports us.
+  -->
+
+  <!-- Settings that append the existing setting value -->
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);$(OS)</DefineConstants>
+  </PropertyGroup>
+
+  <!-- Tool versions for tool references across all projects -->
+  <ItemGroup>
+    <DotNetCliToolReference Update="dotnet-xunit" Version="2.3.1" />
+  </ItemGroup>
+
+  <!-- Package versions for package references across all projects -->
+  <ItemGroup>
+    <PackageReference Update="BenchmarkDotNet" Version="0.11.5" />
+    <PackageReference Update="Colourful" Version="2.0.2" />
+    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.12.0" />
+    <PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.1.0" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Update="Moq" Version="4.10.0" />
+    <PackageReference Update="SixLabors.Core" Version="1.0.0-dev000101" />
+    <PackageReference Update="SixLabors.Fonts" Version="1.0.0-beta0008" />
+    <PackageReference Update="SixLabors.Shapes" Version="1.0.0-beta0008" />
+    <PackageReference Update="SixLabors.Shapes.Text" Version="1.0.0-beta0007" />
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+    <PackageReference Update="System.Drawing.Common" Version="4.5.1" />
+    <PackageReference Update="System.IO.Compression" Version="4.3.0" />
+    <PackageReference Update="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
+    <PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
+    <PackageReference Update="System.Threading.Tasks.Parallel" Version="4.3.0" />
+    <PackageReference Update="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Update="xunit" Version="2.3.1" />
+    <PackageReference Update="xunit.runner.console" Version="2.3.1" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.3.1" />
+  </ItemGroup>
+
+</Project>

ImageSharp.ruleset

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="ImageSharp" ToolsVersion="15.0">
-  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-    <Rule Id="AD0001" Action="None" />
-    <Rule Id="SA1413" Action="None" />
-   <!-- <Rule Id="SA1405" Action="None" />
-     temp remove the header requirement as stylecop is currently failing to read the stylecop.json file from 'dotnet build' 
-    <Rule Id="SA1636" Action="None" />-->
-    <Rule Id="SA1633" Action="None" />
-    <!--1.1.0-beta6 incorrectly throws a wobbler here for multiline matrices-->
-    <Rule Id="SA1500" Action="None" /> 
-    <!--Comments should end with a period. I like this but there's 3000+ errors to fix-->
-    <Rule Id="SA1629" Action="None" /> 
-  </Rules>
-</RuleSet>

ImageSharp.sln

@@ -1,46 +1,356 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.12
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28902.138
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		.gitmodules = .gitmodules
 		.travis.yml = .travis.yml
 		appveyor.yml = appveyor.yml
-		.github\ISSUE_TEMPLATE\ask-question.md = .github\ISSUE_TEMPLATE\ask-question.md
-		.github\ISSUE_TEMPLATE\bug-report.md = .github\ISSUE_TEMPLATE\bug-report.md
+		build.cmd = build.cmd
+		build.ps1 = build.ps1
 		codecov.yml = codecov.yml
 		CodeCoverage.runsettings = CodeCoverage.runsettings
-		.github\CONTRIBUTING.md = .github\CONTRIBUTING.md
-		.github\ISSUE_TEMPLATE\feature-request.md = .github\ISSUE_TEMPLATE\feature-request.md
-		features.md = features.md
-		ImageSharp.ruleset = ImageSharp.ruleset
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
 		ImageSharp.sln.DotSettings = ImageSharp.sln.DotSettings
-		NuGet.config = NuGet.config
-		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
+		LICENSE = LICENSE
 		README.md = README.md
 		run-tests.ps1 = run-tests.ps1
+		stylecop.json = stylecop.json
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{815C0625-CD3D-440F-9F80-2D83856AB7AE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1799C43E-5C54-4A8F-8D64-B1475241DB0D}"
 	ProjectSection(SolutionItems) = preProject
-		src\README.md = src\README.md
+		.github\CONTRIBUTING.md = .github\CONTRIBUTING.md
+		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{56801022-D71A-4FBE-BC5B-CBA08E2284EC}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{FBE8C1AD-5AEC-4514-9B64-091D8E145865}"
+	ProjectSection(SolutionItems) = preProject
+		.github\ISSUE_TEMPLATE\ask-question.md = .github\ISSUE_TEMPLATE\ask-question.md
+		.github\ISSUE_TEMPLATE\bug-report.md = .github\ISSUE_TEMPLATE\bug-report.md
+		.github\ISSUE_TEMPLATE\feature-request.md = .github\ISSUE_TEMPLATE\feature-request.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".vscode", ".vscode", "{0274D4CF-9932-47CC-8E89-54DC05B8F06E}"
+	ProjectSection(SolutionItems) = preProject
+		.vscode\launch.json = .vscode\launch.json
+		.vscode\tasks.json = .vscode\tasks.json
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E919DF0B-2607-4462-8FC0-5C98FE50F8C9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{9E574A07-F879-4811-9C41-5CBDC6BAFDB7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "icons", "icons", "{2B02E303-7CC6-4E15-97EE-DBE86B287553}"
 	ProjectSection(SolutionItems) = preProject
-		src\Shared\AssemblyInfo.Common.cs = src\Shared\AssemblyInfo.Common.cs
+		build\icons\imagesharp-logo-128.png = build\icons\imagesharp-logo-128.png
+		build\icons\imagesharp-logo-256.png = build\icons\imagesharp-logo-256.png
+		build\icons\imagesharp-logo-32.png = build\icons\imagesharp-logo-32.png
+		build\icons\imagesharp-logo-512.png = build\icons\imagesharp-logo-512.png
+		build\icons\imagesharp-logo-64.png = build\icons\imagesharp-logo-64.png
+		build\icons\imagesharp-logo.png = build\icons\imagesharp-logo.png
+		build\icons\imagesharp-logo.svg = build\icons\imagesharp-logo.svg
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{815C0625-CD3D-440F-9F80-2D83856AB7AE}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+		src\Directory.Build.targets = src\Directory.Build.targets
+		src\README.md = src\README.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp", "src\ImageSharp\ImageSharp.csproj", "{2AA31A1F-142C-43F4-8687-09ABCA4B3A26}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Drawing", "src\ImageSharp.Drawing\ImageSharp.Drawing.csproj", "{2E33181E-6E28-4662-A801-E2E7DC206029}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{56801022-D71A-4FBE-BC5B-CBA08E2284EC}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Directory.Build.props = tests\Directory.Build.props
+		tests\Directory.Build.targets = tests\Directory.Build.targets
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeCoverage", "CodeCoverage", "{D4C5EC58-F8E6-4636-B9EE-C99D2578E5C6}"
+	ProjectSection(SolutionItems) = preProject
+		tests\CodeCoverage\CodeCoverage.cmd = tests\CodeCoverage\CodeCoverage.cmd
+		tests\CodeCoverage\packages.config = tests\CodeCoverage\packages.config
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Images", "Images", "{FA55F5DE-11A6-487D-ABA4-BC93A02717DD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Input", "Input", "{9DA226A1-8656-49A8-A58A-A8B5C081AD66}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bmp", "Bmp", "{1A82C5F6-90E0-4E97-BE16-A825C046B493}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Images\Input\Bmp\BitmapCoreHeaderQR.bmp = tests\Images\Input\Bmp\BitmapCoreHeaderQR.bmp
+		tests\Images\Input\Bmp\BITMAPV5HEADER.bmp = tests\Images\Input\Bmp\BITMAPV5HEADER.bmp
+		tests\Images\Input\Bmp\Car.bmp = tests\Images\Input\Bmp\Car.bmp
+		tests\Images\Input\Bmp\F.bmp = tests\Images\Input\Bmp\F.bmp
+		tests\Images\Input\Bmp\issue735.bmp = tests\Images\Input\Bmp\issue735.bmp
+		tests\Images\Input\Bmp\neg_height.bmp = tests\Images\Input\Bmp\neg_height.bmp
+		tests\Images\Input\Bmp\pal1.bmp = tests\Images\Input\Bmp\pal1.bmp
+		tests\Images\Input\Bmp\pal1p1.bmp = tests\Images\Input\Bmp\pal1p1.bmp
+		tests\Images\Input\Bmp\pal4.bmp = tests\Images\Input\Bmp\pal4.bmp
+		tests\Images\Input\Bmp\pal4rle.bmp = tests\Images\Input\Bmp\pal4rle.bmp
+		tests\Images\Input\Bmp\pal8-0.bmp = tests\Images\Input\Bmp\pal8-0.bmp
+		tests\Images\Input\Bmp\pal8gs.bmp = tests\Images\Input\Bmp\pal8gs.bmp
+		tests\Images\Input\Bmp\pal8offs.bmp = tests\Images\Input\Bmp\pal8offs.bmp
+		tests\Images\Input\Bmp\pal8os2sp.bmp = tests\Images\Input\Bmp\pal8os2sp.bmp
+		tests\Images\Input\Bmp\pal8os2v1_winv2.bmp = tests\Images\Input\Bmp\pal8os2v1_winv2.bmp
+		tests\Images\Input\Bmp\pal8os2v2-16.bmp = tests\Images\Input\Bmp\pal8os2v2-16.bmp
+		tests\Images\Input\Bmp\pal8os2v2.bmp = tests\Images\Input\Bmp\pal8os2v2.bmp
+		tests\Images\Input\Bmp\pal8v4.bmp = tests\Images\Input\Bmp\pal8v4.bmp
+		tests\Images\Input\Bmp\pal8v5.bmp = tests\Images\Input\Bmp\pal8v5.bmp
+		tests\Images\Input\Bmp\rgb16-565.bmp = tests\Images\Input\Bmp\rgb16-565.bmp
+		tests\Images\Input\Bmp\rgb16-565pal.bmp = tests\Images\Input\Bmp\rgb16-565pal.bmp
+		tests\Images\Input\Bmp\rgb16.bmp = tests\Images\Input\Bmp\rgb16.bmp
+		tests\Images\Input\Bmp\rgb16bfdef.bmp = tests\Images\Input\Bmp\rgb16bfdef.bmp
+		tests\Images\Input\Bmp\rgb24.bmp = tests\Images\Input\Bmp\rgb24.bmp
+		tests\Images\Input\Bmp\rgb32.bmp = tests\Images\Input\Bmp\rgb32.bmp
+		tests\Images\Input\Bmp\rgb32bf.bmp = tests\Images\Input\Bmp\rgb32bf.bmp
+		tests\Images\Input\Bmp\rgb32bfdef.bmp = tests\Images\Input\Bmp\rgb32bfdef.bmp
+		tests\Images\Input\Bmp\rgba32-1010102.bmp = tests\Images\Input\Bmp\rgba32-1010102.bmp
+		tests\Images\Input\Bmp\rgba32.bmp = tests\Images\Input\Bmp\rgba32.bmp
+		tests\Images\Input\Bmp\rgba32abf.bmp = tests\Images\Input\Bmp\rgba32abf.bmp
+		tests\Images\Input\Bmp\rgba32h56.bmp = tests\Images\Input\Bmp\rgba32h56.bmp
+		tests\Images\Input\Bmp\RunLengthEncoded-inverted.bmp = tests\Images\Input\Bmp\RunLengthEncoded-inverted.bmp
+		tests\Images\Input\Bmp\RunLengthEncoded.bmp = tests\Images\Input\Bmp\RunLengthEncoded.bmp
+		tests\Images\Input\Bmp\test16-inverted.bmp = tests\Images\Input\Bmp\test16-inverted.bmp
+		tests\Images\Input\Bmp\test16.bmp = tests\Images\Input\Bmp\test16.bmp
+		tests\Images\Input\Bmp\test8-inverted.bmp = tests\Images\Input\Bmp\test8-inverted.bmp
+		tests\Images\Input\Bmp\test8.bmp = tests\Images\Input\Bmp\test8.bmp
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gif", "Gif", "{EE3FB0B3-1C31-41E9-93AB-BA800560A868}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Images\Input\Gif\base_1x4.gif = tests\Images\Input\Gif\base_1x4.gif
+		tests\Images\Input\Gif\base_4x1.gif = tests\Images\Input\Gif\base_4x1.gif
+		tests\Images\Input\Gif\cheers.gif = tests\Images\Input\Gif\cheers.gif
+		tests\Images\Input\Gif\giphy.gif = tests\Images\Input\Gif\giphy.gif
+		tests\Images\Input\Gif\kumin.gif = tests\Images\Input\Gif\kumin.gif
+		tests\Images\Input\Gif\leo.gif = tests\Images\Input\Gif\leo.gif
+		tests\Images\Input\Gif\rings.gif = tests\Images\Input\Gif\rings.gif
+		tests\Images\Input\Gif\trans.gif = tests\Images\Input\Gif\trans.gif
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "issues", "issues", "{BF8DFDC1-CEE5-4A37-B216-D3085360C776}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Images\Input\Gif\issues\issue403_baddescriptorwidth.gif = tests\Images\Input\Gif\issues\issue403_baddescriptorwidth.gif
+		tests\Images\Input\Gif\issues\issue405_badappextlength252-2.gif = tests\Images\Input\Gif\issues\issue405_badappextlength252-2.gif
+		tests\Images\Input\Gif\issues\issue405_badappextlength252.gif = tests\Images\Input\Gif\issues\issue405_badappextlength252.gif
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Jpg", "Jpg", "{DB21FED7-E8CB-4B00-9EB2-9144D32A590A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "baseline", "baseline", "{195BA3D3-3E9F-4BC5-AB40-5F9FEB638146}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Images\Input\Jpg\baseline\AsianCarvingLowContrast.jpg = tests\Images\Input\Jpg\baseline\AsianCarvingLowContrast.jpg
+		tests\Images\Input\Jpg\baseline\badeof.jpg = tests\Images\Input\Jpg\baseline\badeof.jpg
+		tests\Images\Input\Jpg\baseline\badrst.jpg = tests\Images\Input\Jpg\baseline\badrst.jpg
+		tests\Images\Input\Jpg\baseline\Calliphora.jpg = tests\Images\Input\Jpg\baseline\Calliphora.jpg
+		tests\Images\Input\Jpg\baseline\cmyk.jpg = tests\Images\Input\Jpg\baseline\cmyk.jpg
+		tests\Images\Input\Jpg\baseline\exif.jpg = tests\Images\Input\Jpg\baseline\exif.jpg
+		tests\Images\Input\Jpg\baseline\Floorplan.jpg = tests\Images\Input\Jpg\baseline\Floorplan.jpg
+		tests\Images\Input\Jpg\baseline\gamma_dalai_lama_gray.jpg = tests\Images\Input\Jpg\baseline\gamma_dalai_lama_gray.jpg
+		tests\Images\Input\Jpg\baseline\Hiyamugi.jpg = tests\Images\Input\Jpg\baseline\Hiyamugi.jpg
+		tests\Images\Input\Jpg\baseline\jpeg400jfif.jpg = tests\Images\Input\Jpg\baseline\jpeg400jfif.jpg
+		tests\Images\Input\Jpg\baseline\jpeg420exif.jpg = tests\Images\Input\Jpg\baseline\jpeg420exif.jpg
+		tests\Images\Input\Jpg\baseline\jpeg420small.jpg = tests\Images\Input\Jpg\baseline\jpeg420small.jpg
+		tests\Images\Input\Jpg\baseline\jpeg444.jpg = tests\Images\Input\Jpg\baseline\jpeg444.jpg
+		tests\Images\Input\Jpg\baseline\Lake.jpg = tests\Images\Input\Jpg\baseline\Lake.jpg
+		tests\Images\Input\Jpg\baseline\MultiScanBaselineCMYK.jpg = tests\Images\Input\Jpg\baseline\MultiScanBaselineCMYK.jpg
+		tests\Images\Input\Jpg\baseline\ratio-1x1.jpg = tests\Images\Input\Jpg\baseline\ratio-1x1.jpg
+		tests\Images\Input\Jpg\baseline\Snake.jpg = tests\Images\Input\Jpg\baseline\Snake.jpg
+		tests\Images\Input\Jpg\baseline\testimgint.jpg = tests\Images\Input\Jpg\baseline\testimgint.jpg
+		tests\Images\Input\Jpg\baseline\testorig.jpg = tests\Images\Input\Jpg\baseline\testorig.jpg
+		tests\Images\Input\Jpg\baseline\testorig12.jpg = tests\Images\Input\Jpg\baseline\testorig12.jpg
+		tests\Images\Input\Jpg\baseline\turtle.jpg = tests\Images\Input\Jpg\baseline\turtle.jpg
+		tests\Images\Input\Jpg\baseline\ycck-subsample-1222.jpg = tests\Images\Input\Jpg\baseline\ycck-subsample-1222.jpg
+		tests\Images\Input\Jpg\baseline\ycck.jpg = tests\Images\Input\Jpg\baseline\ycck.jpg
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JpegSnoopReports", "JpegSnoopReports", "{538F0EBD-4084-4EDB-93DD-6D35B733CA48}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\badeof.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\badeof.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\badrst.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\badrst.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Calliphora.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Calliphora.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\cmyk.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\cmyk.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\exif.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\exif.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Floorplan.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Floorplan.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\gamma_dalai_lama_gray.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\gamma_dalai_lama_gray.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Hiyamugi.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Hiyamugi.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg400jfif.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg400jfif.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg420exif.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg420exif.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg420small.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg420small.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg444.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg444.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Lake.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Lake.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\MultiScanBaselineCMYK.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\MultiScanBaselineCMYK.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\ratio-1x1.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\ratio-1x1.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Snake.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Snake.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\testimgint.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\testimgint.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\testorig.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\testorig.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\turtle.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\turtle.jpg.txt
+		tests\Images\Input\Jpg\baseline\JpegSnoopReports\ycck.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\ycck.jpg.txt
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "issues", "issues", "{5C9B689F-B96D-47BE-A208-C23B1B2A8570}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Images\Input\Jpg\issues\Issue159-MissingFF00-Progressive-Bedroom.jpg = tests\Images\Input\Jpg\issues\Issue159-MissingFF00-Progressive-Bedroom.jpg
+		tests\Images\Input\Jpg\issues\Issue159-MissingFF00-Progressive-Girl.jpg = tests\Images\Input\Jpg\issues\Issue159-MissingFF00-Progressive-Girl.jpg
+		tests\Images\Input\Jpg\issues\Issue178-BadCoeffsProgressive-Lemon.jpg = tests\Images\Input\Jpg\issues\Issue178-BadCoeffsProgressive-Lemon.jpg
+		tests\Images\Input\Jpg\issues\Issue214-CriticalEOF.jpg = tests\Images\Input\Jpg\issues\Issue214-CriticalEOF.jpg
+		tests\Images\Input\Jpg\issues\Issue385-BadZigZag-Progressive.jpg = tests\Images\Input\Jpg\issues\Issue385-BadZigZag-Progressive.jpg
+		tests\Images\Input\Jpg\issues\Issue394-MultiHuffmanBaseline-Speakers.jpg = tests\Images\Input\Jpg\issues\Issue394-MultiHuffmanBaseline-Speakers.jpg
+		tests\Images\Input\Jpg\issues\Issue517-No-EOI-Progressive.jpg = tests\Images\Input\Jpg\issues\Issue517-No-EOI-Progressive.jpg
+		tests\Images\Input\Jpg\issues\Issue518-Bad-RST-Progressive.jpg = tests\Images\Input\Jpg\issues\Issue518-Bad-RST-Progressive.jpg
+		tests\Images\Input\Jpg\issues\Issue520-InvalidCast.jpg = tests\Images\Input\Jpg\issues\Issue520-InvalidCast.jpg
+		tests\Images\Input\Jpg\issues\Issue624-DhtHasWrongLength-Progressive-N.jpg = tests\Images\Input\Jpg\issues\Issue624-DhtHasWrongLength-Progressive-N.jpg
+		tests\Images\Input\Jpg\issues\Issue694-Decode-Exif-OutOfRange.jpg = tests\Images\Input\Jpg\issues\Issue694-Decode-Exif-OutOfRange.jpg
+		tests\Images\Input\Jpg\issues\Issue695-Invalid-EOI.jpg = tests\Images\Input\Jpg\issues\Issue695-Invalid-EOI.jpg
+		tests\Images\Input\Jpg\issues\Issue696-Resize-Exif-OutOfRange.jpg = tests\Images\Input\Jpg\issues\Issue696-Resize-Exif-OutOfRange.jpg
+		tests\Images\Input\Jpg\issues\Issue721-InvalidAPP0.jpg = tests\Images\Input\Jpg\issues\Issue721-InvalidAPP0.jpg
+		tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-A.jpg = tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-A.jpg
+		tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-B.jpg = tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-B.jpg
+		tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-C.jpg = tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-C.jpg
+		tests\Images\Input\Jpg\issues\issue750-exif-load.jpg = tests\Images\Input\Jpg\issues\issue750-exif-load.jpg
+		tests\Images\Input\Jpg\issues\issue750-exif-tranform.jpg = tests\Images\Input\Jpg\issues\issue750-exif-tranform.jpg
+		tests\Images\Input\Jpg\issues\Issue845-Incorrect-Quality99.jpg = tests\Images\Input\Jpg\issues\Issue845-Incorrect-Quality99.jpg
+		tests\Images\Input\Jpg\issues\issue855-incorrect-colorspace.jpg = tests\Images\Input\Jpg\issues\issue855-incorrect-colorspace.jpg
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fuzz", "fuzz", "{516A3532-6AC2-417B-AD79-9BD5D0D378A0}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Images\Input\Jpg\issues\fuzz\Issue797-NullReferenceException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue797-NullReferenceException.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue798-AccessViolationException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue798-AccessViolationException.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue821-DivideByZeroException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue821-DivideByZeroException.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue822-DivideByZeroException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue822-DivideByZeroException.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue823-NullReferenceException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue823-NullReferenceException.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-A.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-A.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-B.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-B.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-C.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-C.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-D.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-D.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-E.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-E.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-F.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-F.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-G.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-G.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-H.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-H.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-A.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-A.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-B.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-B.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-C.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-C.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-D.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-D.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-A.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-A.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-B.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-B.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-C.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-C.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue827-AccessViolationException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue827-AccessViolationException.jpg
+		tests\Images\Input\Jpg\issues\fuzz\Issue839-ExecutionEngineException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue839-ExecutionEngineException.jpg
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JpegSnoopReports", "JpegSnoopReports", "{714CDEA1-9AE6-4F76-B8B1-A7DB8C1DB82F}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue159-MissingFF00-Progressive-Bedroom.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue159-MissingFF00-Progressive-Bedroom.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue159-MissingFF00-Progressive-Girl.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue159-MissingFF00-Progressive-Girl.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue178-BadCoeffsProgressive-Lemon.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue178-BadCoeffsProgressive-Lemon.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue214-CriticalEOF .jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue214-CriticalEOF .jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue385-BadZigZag-Progressive.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue385-BadZigZag-Progressive.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue394-MultiHuffmanBaseline-Speakers.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue394-MultiHuffmanBaseline-Speakers.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue517-No-EOI-Progressive.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue517-No-EOI-Progressive.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue518-Bad-RST-Progressive.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue518-Bad-RST-Progressive.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue520-InvalidCast.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue520-InvalidCast.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue624-DhtHasWrongLength-Progressive-N.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue624-DhtHasWrongLength-Progressive-N.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue694-Decode-Exif-OutOfRange.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue694-Decode-Exif-OutOfRange.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue695-Invalid-EOI.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue695-Invalid-EOI.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue696-Resize-Exif-OutOfRange.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue696-Resize-Exif-OutOfRange.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue721-InvalidAPP0.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue721-InvalidAPP0.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-A.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-A.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-B.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-B.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-C.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-C.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\issue750-exif-load.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\issue750-exif-load.jpg.txt
+		tests\Images\Input\Jpg\issues\JpegSnoopReports\issue750-exif-tranform.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\issue750-exif-tranform.jpg.txt
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "progressive", "progressive", "{6458AFCB-A159-47D5-8F2B-50C95C0915E0}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Images\Input\Jpg\progressive\BadEofProgressive.jpg = tests\Images\Input\Jpg\progressive\BadEofProgressive.jpg
+		tests\Images\Input\Jpg\progressive\ExifUndefType.jpg = tests\Images\Input\Jpg\progressive\ExifUndefType.jpg
+		tests\Images\Input\Jpg\progressive\fb.jpg = tests\Images\Input\Jpg\progressive\fb.jpg
+		tests\Images\Input\Jpg\progressive\Festzug.jpg = tests\Images\Input\Jpg\progressive\Festzug.jpg
+		tests\Images\Input\Jpg\progressive\progress.jpg = tests\Images\Input\Jpg\progressive\progress.jpg
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JpegSnoopReports", "JpegSnoopReports", "{39F5197B-CF6C-41A5-9739-7F97E78BB104}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Images\Input\Jpg\progressive\JpegSnoopReports\BadEofProgressive.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\BadEofProgressive.jpg.txt
+		tests\Images\Input\Jpg\progressive\JpegSnoopReports\ExifUndefType.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\ExifUndefType.jpg.txt
+		tests\Images\Input\Jpg\progressive\JpegSnoopReports\fb.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\fb.jpg.txt
+		tests\Images\Input\Jpg\progressive\JpegSnoopReports\Festzug.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\Festzug.jpg.txt
+		tests\Images\Input\Jpg\progressive\JpegSnoopReports\progress.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\progress.jpg.txt
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Png", "Png", "{E1C42A6F-913B-4A7B-B1A8-2BB62843B254}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Images\Input\Png\banner7-adam.png = tests\Images\Input\Png\banner7-adam.png
+		tests\Images\Input\Png\banner8-index.png = tests\Images\Input\Png\banner8-index.png
+		tests\Images\Input\Png\big-corrupted-chunk.png = tests\Images\Input\Png\big-corrupted-chunk.png
+		tests\Images\Input\Png\Bike.png = tests\Images\Input\Png\Bike.png
+		tests\Images\Input\Png\BikeGrayscale.png = tests\Images\Input\Png\BikeGrayscale.png
+		tests\Images\Input\Png\blur.png = tests\Images\Input\Png\blur.png
+		tests\Images\Input\Png\bpp1.png = tests\Images\Input\Png\bpp1.png
+		tests\Images\Input\Png\CalliphoraPartial.png = tests\Images\Input\Png\CalliphoraPartial.png
+		tests\Images\Input\Png\CalliphoraPartialGrayscale.png = tests\Images\Input\Png\CalliphoraPartialGrayscale.png
+		tests\Images\Input\Png\chunklength1.png = tests\Images\Input\Png\chunklength1.png
+		tests\Images\Input\Png\chunklength2.png = tests\Images\Input\Png\chunklength2.png
+		tests\Images\Input\Png\cross.png = tests\Images\Input\Png\cross.png
+		tests\Images\Input\Png\ducky.png = tests\Images\Input\Png\ducky.png
+		tests\Images\Input\Png\filter0.png = tests\Images\Input\Png\filter0.png
+		tests\Images\Input\Png\filter1.png = tests\Images\Input\Png\filter1.png
+		tests\Images\Input\Png\filter2.png = tests\Images\Input\Png\filter2.png
+		tests\Images\Input\Png\filter3.png = tests\Images\Input\Png\filter3.png
+		tests\Images\Input\Png\filter4.png = tests\Images\Input\Png\filter4.png
+		tests\Images\Input\Png\filterVar.png = tests\Images\Input\Png\filterVar.png
+		tests\Images\Input\Png\gray-1-trns.png = tests\Images\Input\Png\gray-1-trns.png
+		tests\Images\Input\Png\gray-16-tRNS-interlaced.png = tests\Images\Input\Png\gray-16-tRNS-interlaced.png
+		tests\Images\Input\Png\gray-16.png = tests\Images\Input\Png\gray-16.png
+		tests\Images\Input\Png\gray-2-tRNS.png = tests\Images\Input\Png\gray-2-tRNS.png
+		tests\Images\Input\Png\gray-4-tRNS.png = tests\Images\Input\Png\gray-4-tRNS.png
+		tests\Images\Input\Png\gray-8-tRNS.png = tests\Images\Input\Png\gray-8-tRNS.png
+		tests\Images\Input\Png\gray-alpha-16.png = tests\Images\Input\Png\gray-alpha-16.png
+		tests\Images\Input\Png\gray-alpha-8.png = tests\Images\Input\Png\gray-alpha-8.png
+		tests\Images\Input\Png\gray_4bpp.png = tests\Images\Input\Png\gray_4bpp.png
+		tests\Images\Input\Png\icon.png = tests\Images\Input\Png\icon.png
+		tests\Images\Input\Png\iftbbn0g01.png = tests\Images\Input\Png\iftbbn0g01.png
+		tests\Images\Input\Png\iftbbn0g02.png = tests\Images\Input\Png\iftbbn0g02.png
+		tests\Images\Input\Png\iftbbn0g04.png = tests\Images\Input\Png\iftbbn0g04.png
+		tests\Images\Input\Png\indexed.png = tests\Images\Input\Png\indexed.png
+		tests\Images\Input\Png\interlaced.png = tests\Images\Input\Png\interlaced.png
+		tests\Images\Input\Png\kaboom.png = tests\Images\Input\Png\kaboom.png
+		tests\Images\Input\Png\low-variance.png = tests\Images\Input\Png\low-variance.png
+		tests\Images\Input\Png\palette-8bpp.png = tests\Images\Input\Png\palette-8bpp.png
+		tests\Images\Input\Png\pd-dest.png = tests\Images\Input\Png\pd-dest.png
+		tests\Images\Input\Png\pd-source.png = tests\Images\Input\Png\pd-source.png
+		tests\Images\Input\Png\pd.png = tests\Images\Input\Png\pd.png
+		tests\Images\Input\Png\pl.png = tests\Images\Input\Png\pl.png
+		tests\Images\Input\Png\pp.png = tests\Images\Input\Png\pp.png
+		tests\Images\Input\Png\rainbow.png = tests\Images\Input\Png\rainbow.png
+		tests\Images\Input\Png\ratio-1x4.png = tests\Images\Input\Png\ratio-1x4.png
+		tests\Images\Input\Png\ratio-4x1.png = tests\Images\Input\Png\ratio-4x1.png
+		tests\Images\Input\Png\rgb-16-alpha.png = tests\Images\Input\Png\rgb-16-alpha.png
+		tests\Images\Input\Png\rgb-16-tRNS.png = tests\Images\Input\Png\rgb-16-tRNS.png
+		tests\Images\Input\Png\rgb-48bpp-interlaced.png = tests\Images\Input\Png\rgb-48bpp-interlaced.png
+		tests\Images\Input\Png\rgb-48bpp.png = tests\Images\Input\Png\rgb-48bpp.png
+		tests\Images\Input\Png\rgb-8-tRNS.png = tests\Images\Input\Png\rgb-8-tRNS.png
+		tests\Images\Input\Png\rollsroyce.png = tests\Images\Input\Png\rollsroyce.png
+		tests\Images\Input\Png\SnakeGame.png = tests\Images\Input\Png\SnakeGame.png
+		tests\Images\Input\Png\splash-interlaced.png = tests\Images\Input\Png\splash-interlaced.png
+		tests\Images\Input\Png\splash.png = tests\Images\Input\Png\splash.png
+		tests\Images\Input\Png\versioning-1_1.png = tests\Images\Input\Png\versioning-1_1.png
+		tests\Images\Input\Png\versioning-1_2.png = tests\Images\Input\Png\versioning-1_2.png
+		tests\Images\Input\Png\vim16x16_1.png = tests\Images\Input\Png\vim16x16_1.png
+		tests\Images\Input\Png\vim16x16_2.png = tests\Images\Input\Png\vim16x16_2.png
+		tests\Images\Input\Png\zlib-overflow.png = tests\Images\Input\Png\zlib-overflow.png
+	EndProjectSection
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Tests", "tests\ImageSharp.Tests\ImageSharp.Tests.csproj", "{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Benchmarks", "tests\ImageSharp.Benchmarks\ImageSharp.Benchmarks.csproj", "{2BF743D8-2A06-412D-96D7-F448F00C5EA5}"
@@ -122,9 +432,25 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{9E574A07-F879-4811-9C41-5CBDC6BAFDB7} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
+		{FBE8C1AD-5AEC-4514-9B64-091D8E145865} = {1799C43E-5C54-4A8F-8D64-B1475241DB0D}
+		{2B02E303-7CC6-4E15-97EE-DBE86B287553} = {E919DF0B-2607-4462-8FC0-5C98FE50F8C9}
 		{2AA31A1F-142C-43F4-8687-09ABCA4B3A26} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
 		{2E33181E-6E28-4662-A801-E2E7DC206029} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
+		{D4C5EC58-F8E6-4636-B9EE-C99D2578E5C6} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
+		{FA55F5DE-11A6-487D-ABA4-BC93A02717DD} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
+		{9DA226A1-8656-49A8-A58A-A8B5C081AD66} = {FA55F5DE-11A6-487D-ABA4-BC93A02717DD}
+		{1A82C5F6-90E0-4E97-BE16-A825C046B493} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
+		{EE3FB0B3-1C31-41E9-93AB-BA800560A868} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
+		{BF8DFDC1-CEE5-4A37-B216-D3085360C776} = {EE3FB0B3-1C31-41E9-93AB-BA800560A868}
+		{DB21FED7-E8CB-4B00-9EB2-9144D32A590A} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
+		{195BA3D3-3E9F-4BC5-AB40-5F9FEB638146} = {DB21FED7-E8CB-4B00-9EB2-9144D32A590A}
+		{538F0EBD-4084-4EDB-93DD-6D35B733CA48} = {195BA3D3-3E9F-4BC5-AB40-5F9FEB638146}
+		{5C9B689F-B96D-47BE-A208-C23B1B2A8570} = {DB21FED7-E8CB-4B00-9EB2-9144D32A590A}
+		{516A3532-6AC2-417B-AD79-9BD5D0D378A0} = {5C9B689F-B96D-47BE-A208-C23B1B2A8570}
+		{714CDEA1-9AE6-4F76-B8B1-A7DB8C1DB82F} = {5C9B689F-B96D-47BE-A208-C23B1B2A8570}
+		{6458AFCB-A159-47D5-8F2B-50C95C0915E0} = {DB21FED7-E8CB-4B00-9EB2-9144D32A590A}
+		{39F5197B-CF6C-41A5-9739-7F97E78BB104} = {6458AFCB-A159-47D5-8F2B-50C95C0915E0}
+		{E1C42A6F-913B-4A7B-B1A8-2BB62843B254} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
 		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
 		{2BF743D8-2A06-412D-96D7-F448F00C5EA5} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
 		{561B880A-D9EE-44EF-90F5-817C54A9D9AB} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}

ImageSharp.sln.DotSettings

@@ -382,9 +382,12 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Bgra/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Quantizer/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>

NuGet.config

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="myget.org sixlabors" value="https://www.myget.org/F/sixlabors/api/v3/index.json" />
-    <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
-  </packageSources>
-</configuration>

README.md

@@ -22,7 +22,7 @@ Designed to democratize image processing, ImageSharp brings you an incredibly po
 
 Compared to `System.Drawing` we have been able to develop something much more flexible, easier to code against, and much, much less prone to memory leaks. Gone are system-wide process-locks; ImageSharp images are thread-safe and fully supported in web environments.
 
-Built against .NET Standard 1.3 ImageSharp can be used in device, cloud, and embedded/IoT scenarios. 
+Built against .NET Standard 1.3, ImageSharp can be used in device, cloud, and embedded/IoT scenarios. 
 
 ### Documentation
 For all SixLabors projects, including ImageSharp:
@@ -41,15 +41,15 @@ Install stable releases via Nuget; development releases are available via MyGet.
 
 The **ImageSharp** library is made up of multiple packages:
 - **SixLabors.ImageSharp**
-  - Contains the generic `Image<TPixel>` class, PixelFormats, Primitives, Configuration, and other core functionality.
-  - The `IImageFormat` interface, Jpeg, Png, Bmp, and Gif formats.
-  - Transform methods like Resize, Crop, Skew, Rotate - Anything that alters the dimensions of the image.
-  - Non-transform methods like Gaussian Blur, Pixelate, Edge Detection - Anything that maintains the original image dimensions.
+  - Contains the generic `Image<TPixel>` class, PixelFormats, Primitives, Configuration, and other core functionality
+  - The `IImageFormat` interface, Jpeg, Png, Bmp, and Gif formats
+  - Transform methods like Resize, Crop, Skew, Rotate - anything that alters the dimensions of the image
+  - Non-transform methods like Gaussian Blur, Pixelate, Edge Detection - anything that maintains the original image dimensions
 
 - **SixLabors.ImageSharp.Drawing**
-  - Brushes and various drawing algorithms, including drawing images.
+  - Brushes and various drawing algorithms, including drawing images
   - Various vector drawing methods for drawing paths, polygons etc.
-  - Text drawing.
+  - Text drawing
 
 ### Build Status
 
@@ -72,6 +72,7 @@ On platforms supporting netstandard 1.3+
 ```csharp
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.PixelFormats;
 
 // Image.Load(string path) is a shortcut for our default type. 
 // Other pixel formats use Image.Load<TPixel>(string path))
@@ -117,12 +118,20 @@ Alternatively, you can work from command line and/or with a lightweight editor o
 - [Visual Studio Code](https://code.visualstudio.com/) with [C# Extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp)
 - [.NET Core](https://www.microsoft.com/net/core#linuxubuntu)
 
-To clone ImageSharp locally click the "Clone in Windows" button above or run the following git commands.
+To clone ImageSharp locally, click the "Clone in Windows" button above or run the following git commands:
 
 ```bash
 git clone https://github.com/SixLabors/ImageSharp
 ```
 
+### Submodules
+
+This repository contains [git submodules](https://blog.github.com/2016-02-01-working-with-submodules/). To add the submodules to the project, navigate to the repository root and type:
+
+``` bash
+git submodule update --init --recursive
+```
+
 ### How can you help?
 
 Please... Spread the word, contribute algorithms, submit performance improvements, unit tests, no input is too little. Make sure to read our [Contribution Guide](https://github.com/SixLabors/ImageSharp/blob/master/.github/CONTRIBUTING.md) before opening a PR.

src/Directory.Build.props

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <!--
+    Directory.Build.props is automatically picked up and imported by
+    Microsoft.Common.props. This file needs to exist, even if empty so that
+    files in the parent directory tree, with the same name, are not imported
+    instead. The import fairly early and only Sdk.props will have been
+    imported beforehand. We also don't need to add ourselves to
+    MSBuildAllProjects, as that is done by the file that imports us.
+  -->
+
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.props</MSBuildAllProjects>
+    <ImageSharpProjectCategory>src</ImageSharpProjectCategory>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
+
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\standards\SixLabors.ruleset</CodeAnalysisRuleSet>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)..\standards\stylecop.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" PublicKey="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2, PublicKeyToken=null" />
+    <InternalsVisibleTo Include="ImageSharp.Benchmarks" />
+    <InternalsVisibleTo Include="SixLabors.ImageSharp.Sandbox46" />
+    <InternalsVisibleTo Include="SixLabors.ImageSharp.Tests" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>

src/Directory.Build.targets

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <!--
+    Directory.Build.targets is automatically picked up and imported by
+    Microsoft.Common.targets. This file needs to exist, even if empty so that
+    files in the parent directory tree, with the same name, are not imported
+    instead. The import fairly late and most other props/targets will have
+    been imported beforehand. We also don't need to add ourselves to
+    MSBuildAllProjects, as that is done by the file that imports us.
+  -->
+
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.targets</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
+
+  <PropertyGroup>
+    <GeneratedInternalsVisibleToFile Condition="'$(GeneratedInternalsVisibleToFile)' == ''">$(IntermediateOutputPath)$(MSBuildProjectName).InternalsVisibleTo$(DefaultLanguageSourceExtension)</GeneratedInternalsVisibleToFile>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <InternalsVisibleTo>
+      <Visible>false</Visible>
+    </InternalsVisibleTo>
+  </ItemDefinitionGroup>
+
+  <Target Name="GenerateInternalsVisibleTo"
+          BeforeTargets="CoreCompile"
+          DependsOnTargets="PrepareForBuild;CoreGenerateInternalsVisibleTo"
+          Condition="'@(InternalsVisibleTo)' != ''" />
+
+  <Target Name="CoreGenerateInternalsVisibleTo"
+          Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'"
+          Inputs="$(MSBuildAllProjects)"
+          Outputs="$(GeneratedInternalsVisibleToFile)">
+    <CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleTo.Identity)" Condition="'%(InternalsVisibleTo.PublicKey)' == ''">
+      <Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
+    </CreateItem>
+    <CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleTo.Identity), PublicKey=%(InternalsVisibleTo.PublicKey)" Condition="'%(InternalsVisibleTo.PublicKey)' != ''">
+      <Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
+    </CreateItem>
+
+    <WriteCodeFragment AssemblyAttributes="@(InternalsVisibleToAttribute)" Language="$(Language)" OutputFile="$(GeneratedInternalsVisibleToFile)">
+      <Output TaskParameter="OutputFile" ItemName="Compile" />
+      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
+    </WriteCodeFragment>
+  </Target>
+
+  <!-- Empty target so that `dotnet test` will work on the solution -->
+  <!-- https://github.com/Microsoft/vstest/issues/411 -->
+  <Target Name="VSTest" />
+
+</Project>

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

@@ -1,50 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>      
-        <AssemblyTitle>SixLabors.ImageSharp.Drawing</AssemblyTitle>
-        <Authors>SixLabors and contributors</Authors>
-        <Company>Six Labors</Company>
-        <Copyright>Copyright (c) Six Labors and contributors.</Copyright>
-        <Product>SixLabors.ImageSharp</Product>
-        <Description>An extension to ImageSharp that allows the drawing of images, paths, and text.</Description>
-        <NeutralLanguage>en</NeutralLanguage>
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
 
-        <VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
-        <VersionPrefix Condition="$(packageversion) == ''">0.0.1</VersionPrefix>
-        <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
-        <LangVersion>7.3</LangVersion>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <AssemblyName>SixLabors.ImageSharp.Drawing</AssemblyName>
-        <PackageId>SixLabors.ImageSharp.Drawing</PackageId>
-        <PackageTags>Image Draw Shape Path Font</PackageTags>
-        <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/imagesharp/sixlabors.imagesharp.128.png</PackageIconUrl>
-        <PackageProjectUrl>https://github.com/SixLabors/ImageSharp</PackageProjectUrl>
-        <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
-        <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>https://github.com/SixLabors/ImageSharp</RepositoryUrl>
-        <DebugType Condition="$(codecov) != ''">full</DebugType>
-        <DebugType Condition="$(codecov) == ''">portable</DebugType>
-        <DebugSymbols>True</DebugSymbols>
-    </PropertyGroup>
-    <ItemGroup>
-        <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\ImageSharp\ImageSharp.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-        <AdditionalFiles Include="..\..\stylecop.json" />
-        <PackageReference Include="SixLabors.Fonts" Version="1.0.0-dev000119" />
-        <PackageReference Include="SixLabors.Shapes" Version="1.0.0-dev000102" />
-        <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta007">
-            <PrivateAssets>All</PrivateAssets>
-        </PackageReference>
-    </ItemGroup>
-    <PropertyGroup>
-        <CodeAnalysisRuleSet>..\..\ImageSharp.ruleset</CodeAnalysisRuleSet>
-        <RootNamespace>SixLabors.ImageSharp</RootNamespace>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    </PropertyGroup>
-</Project>
+  <PropertyGroup>
+    <AssemblyName>SixLabors.ImageSharp.Drawing</AssemblyName>
+    <AssemblyTitle>SixLabors.ImageSharp.Drawing</AssemblyTitle>
+    <Description>An extension to ImageSharp that allows the drawing of images, paths, and text.</Description>
+    <PackageId>SixLabors.ImageSharp.Drawing</PackageId>
+    <PackageTags>Image Draw Shape Path Font</PackageTags>
+    <RootNamespace>SixLabors.ImageSharp</RootNamespace>
+    <TargetFrameworks>netcoreapp2.1;netstandard1.3;netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="SixLabors.Fonts" />
+    <PackageReference Include="SixLabors.Shapes" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ImageSharp\ImageSharp.csproj" />
+  </ItemGroup>
+
+</Project>

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=processing_005Cextensions/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/ImageSharp.Drawing/Processing/BrushApplicator.cs

@@ -44,7 +44,7 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Gets the blend percentage
         /// </summary>
-        protected GraphicsOptions Options { get; private set; }
+        protected GraphicsOptions Options { get; }
 
         /// <summary>
         /// Gets the color for a single pixel.

src/ImageSharp.Drawing/Processing/Brushes.cs

@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// A collection of methods for creating generic brushes.
     /// </summary>
-    /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
+    /// <returns>A New <see cref="PatternBrush"/></returns>
     public static class Brushes
     {
         /// <summary>
@@ -94,163 +94,131 @@ namespace SixLabors.ImageSharp.Processing
         /// Create as brush that will paint a solid color
         /// </summary>
         /// <param name="color">The color.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static SolidBrush<TPixel> Solid<TPixel>(TPixel color)
-            where TPixel : struct, IPixel<TPixel>
-            => new SolidBrush<TPixel>(color);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static SolidBrush Solid(Color color) => new SolidBrush(color);
 
         /// <summary>
         /// Create as brush that will paint a Percent10 Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Percent10<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, Percent10Pattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Percent10(Color foreColor) =>
+            new PatternBrush(foreColor, Color.Transparent, Percent10Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Percent10 Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Percent10<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, Percent10Pattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Percent10(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, Percent10Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Percent20 Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Percent20<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, Percent20Pattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Percent20(Color foreColor) =>
+            new PatternBrush(foreColor, Color.Transparent, Percent20Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Percent20 Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Percent20<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, Percent20Pattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Percent20(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, Percent20Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Horizontal Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Horizontal<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, HorizontalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Horizontal(Color foreColor) =>
+            new PatternBrush(foreColor, Color.Transparent, HorizontalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Horizontal Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Horizontal<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, HorizontalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Horizontal(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, HorizontalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Min Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Min<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, MinPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Min(Color foreColor) => new PatternBrush(foreColor, Color.Transparent, MinPattern);
 
         /// <summary>
         /// Create as brush that will paint a Min Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Min<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, MinPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Min(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, MinPattern);
 
         /// <summary>
         /// Create as brush that will paint a Vertical Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Vertical<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, VerticalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Vertical(Color foreColor) =>
+            new PatternBrush(foreColor, Color.Transparent, VerticalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Vertical Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Vertical<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, VerticalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Vertical(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, VerticalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Forward Diagonal Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> ForwardDiagonal<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, ForwardDiagonalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush ForwardDiagonal(Color foreColor) =>
+            new PatternBrush(foreColor, Color.Transparent, ForwardDiagonalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Forward Diagonal Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> ForwardDiagonal<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, ForwardDiagonalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush ForwardDiagonal(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, ForwardDiagonalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Backward Diagonal Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> BackwardDiagonal<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, BackwardDiagonalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush BackwardDiagonal(Color foreColor) =>
+            new PatternBrush(foreColor, Color.Transparent, BackwardDiagonalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Backward Diagonal Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> BackwardDiagonal<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, BackwardDiagonalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush BackwardDiagonal(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, BackwardDiagonalPattern);
     }
 }

src/ImageSharp.Drawing/Processing/ColorStop{TPixel}.cs → src/ImageSharp.Drawing/Processing/ColorStop.cs

@@ -10,17 +10,15 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// A struct that defines a single color stop.
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [DebuggerDisplay("ColorStop({Ratio} -> {Color}")]
-    public struct ColorStop<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public readonly struct ColorStop
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ColorStop{TPixel}" /> struct.
+        /// Initializes a new instance of the <see cref="ColorStop" /> struct.
         /// </summary>
         /// <param name="ratio">Where should it be? 0 is at the start, 1 at the end of the Gradient.</param>
         /// <param name="color">What color should be used at that point?</param>
-        public ColorStop(float ratio, TPixel color)
+        public ColorStop(float ratio, in Color color)
         {
             this.Ratio = ratio;
             this.Color = color;
@@ -34,6 +32,6 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Gets the color to be used.
         /// </summary>
-        public TPixel Color { get; }
+        public Color Color { get; }
     }
 }

src/ImageSharp.Drawing/Processing/DrawImageExtensions.cs

@@ -1,137 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors.Drawing;
-using SixLabors.Primitives;
-
-namespace SixLabors.ImageSharp.Processing
-{
-    /// <summary>
-    /// Adds extensions that allow the drawing of images to the <see cref="Image{TPixel}"/> type.
-    /// </summary>
-    public static class DrawImageExtensions
-    {
-        /// <summary>
-        /// Draws the given image together with the current one by blending their pixels.
-        /// </summary>
-        /// <typeparam name="TPixelDst">The pixel format of the destination image.</typeparam>
-        /// <typeparam name="TPixelSrc">The pixel format of the source image.</typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="image">The image to blend with the currently processing image.</param>
-        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
-        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
-        public static IImageProcessingContext<TPixelDst> DrawImage<TPixelDst, TPixelSrc>(this IImageProcessingContext<TPixelDst> source, Image<TPixelSrc> image, float opacity)
-            where TPixelDst : struct, IPixel<TPixelDst>
-            where TPixelSrc : struct, IPixel<TPixelSrc>
-            => source.ApplyProcessor(new DrawImageProcessor<TPixelDst, TPixelSrc>(image, Point.Empty, GraphicsOptions.Default.ColorBlendingMode, GraphicsOptions.Default.AlphaCompositionMode, opacity));
-
-        /// <summary>
-        /// Draws the given image together with the current one by blending their pixels.
-        /// </summary>
-        /// <typeparam name="TPixelDst">The pixel format of the destination image.</typeparam>
-        /// <typeparam name="TPixelSrc">The pixel format of the source image.</typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="image">The image to blend with the currently processing image.</param>
-        /// <param name="colorBlending">The blending mode.</param>
-        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
-        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
-        public static IImageProcessingContext<TPixelDst> DrawImage<TPixelDst, TPixelSrc>(this IImageProcessingContext<TPixelDst> source, Image<TPixelSrc> image, PixelColorBlendingMode colorBlending, float opacity)
-            where TPixelDst : struct, IPixel<TPixelDst>
-            where TPixelSrc : struct, IPixel<TPixelSrc>
-            => source.ApplyProcessor(new DrawImageProcessor<TPixelDst, TPixelSrc>(image, Point.Empty, colorBlending, GraphicsOptions.Default.AlphaCompositionMode, opacity));
-
-        /// <summary>
-        /// Draws the given image together with the current one by blending their pixels.
-        /// </summary>
-        /// <typeparam name="TPixelDst">The pixel format of the destination image.</typeparam>
-        /// <typeparam name="TPixelSrc">The pixel format of the source image.</typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="image">The image to blend with the currently processing image.</param>
-        /// <param name="colorBlending">The color blending mode.</param>
-        /// <param name="alphaComposition">The alpha composition mode.</param>
-        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
-        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
-        public static IImageProcessingContext<TPixelDst> DrawImage<TPixelDst, TPixelSrc>(this IImageProcessingContext<TPixelDst> source, Image<TPixelSrc> image, PixelColorBlendingMode colorBlending, PixelAlphaCompositionMode alphaComposition, float opacity)
-            where TPixelDst : struct, IPixel<TPixelDst>
-            where TPixelSrc : struct, IPixel<TPixelSrc>
-            => source.ApplyProcessor(new DrawImageProcessor<TPixelDst, TPixelSrc>(image, Point.Empty, colorBlending, alphaComposition, opacity));
-
-        /// <summary>
-        /// Draws the given image together with the current one by blending their pixels.
-        /// </summary>
-        /// <typeparam name="TPixelDst">The pixel format of the destination image.</typeparam>
-        /// <typeparam name="TPixelSrc">The pixel format of the source image.</typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="image">The image to blend with the currently processing image.</param>
-        /// <param name="options">The options, including the blending type and blending amount.</param>
-        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
-        public static IImageProcessingContext<TPixelDst> DrawImage<TPixelDst, TPixelSrc>(this IImageProcessingContext<TPixelDst> source, Image<TPixelSrc> image, GraphicsOptions options)
-            where TPixelDst : struct, IPixel<TPixelDst>
-            where TPixelSrc : struct, IPixel<TPixelSrc>
-            => source.ApplyProcessor(new DrawImageProcessor<TPixelDst, TPixelSrc>(image, Point.Empty, options.ColorBlendingMode, options.AlphaCompositionMode, options.BlendPercentage));
-
-        /// <summary>
-        /// Draws the given image together with the current one by blending their pixels.
-        /// </summary>
-        /// <typeparam name="TPixelDst">The pixel format of the destination image.</typeparam>
-        /// <typeparam name="TPixelSrc">The pixel format of the source image.</typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="image">The image to blend with the currently processing image.</param>
-        /// <param name="location">The location to draw the blended image.</param>
-        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
-        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
-        public static IImageProcessingContext<TPixelDst> DrawImage<TPixelDst, TPixelSrc>(this IImageProcessingContext<TPixelDst> source, Image<TPixelSrc> image, Point location, float opacity)
-            where TPixelDst : struct, IPixel<TPixelDst>
-            where TPixelSrc : struct, IPixel<TPixelSrc>
-            => source.ApplyProcessor(new DrawImageProcessor<TPixelDst, TPixelSrc>(image, location, GraphicsOptions.Default.ColorBlendingMode, GraphicsOptions.Default.AlphaCompositionMode, opacity));
-
-        /// <summary>
-        /// Draws the given image together with the current one by blending their pixels.
-        /// </summary>
-        /// <typeparam name="TPixelDst">The pixel format of the destination image.</typeparam>
-        /// <typeparam name="TPixelSrc">The pixel format of the source image.</typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="image">The image to blend with the currently processing image.</param>
-        /// <param name="location">The location to draw the blended image.</param>
-        /// <param name="colorBlending">The color blending to apply.</param>
-        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
-        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
-        public static IImageProcessingContext<TPixelDst> DrawImage<TPixelDst, TPixelSrc>(this IImageProcessingContext<TPixelDst> source, Image<TPixelSrc> image, Point location, PixelColorBlendingMode colorBlending, float opacity)
-            where TPixelDst : struct, IPixel<TPixelDst>
-            where TPixelSrc : struct, IPixel<TPixelSrc>
-            => source.ApplyProcessor(new DrawImageProcessor<TPixelDst, TPixelSrc>(image, location, colorBlending, GraphicsOptions.Default.AlphaCompositionMode, opacity));
-
-        /// <summary>
-        /// Draws the given image together with the current one by blending their pixels.
-        /// </summary>
-        /// <typeparam name="TPixelDst">The pixel format of the destination image.</typeparam>
-        /// <typeparam name="TPixelSrc">The pixel format of the source image.</typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="image">The image to blend with the currently processing image.</param>
-        /// <param name="location">The location to draw the blended image.</param>
-        /// <param name="colorBlending">The color blending to apply.</param>
-        /// <param name="alphaComposition">The alpha composition mode.</param>
-        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
-        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
-        public static IImageProcessingContext<TPixelDst> DrawImage<TPixelDst, TPixelSrc>(this IImageProcessingContext<TPixelDst> source, Image<TPixelSrc> image, Point location, PixelColorBlendingMode colorBlending, PixelAlphaCompositionMode alphaComposition, float opacity)
-            where TPixelDst : struct, IPixel<TPixelDst>
-            where TPixelSrc : struct, IPixel<TPixelSrc>
-            => source.ApplyProcessor(new DrawImageProcessor<TPixelDst, TPixelSrc>(image, location, colorBlending, alphaComposition, opacity));
-
-        /// <summary>
-        /// Draws the given image together with the current one by blending their pixels.
-        /// </summary>
-        /// <typeparam name="TPixelDst">The pixel format of the destination image.</typeparam>
-        /// <typeparam name="TPixelSrc">The pixel format of the source image.</typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="image">The image to blend with the currently processing image.</param>
-        /// <param name="location">The location to draw the blended image.</param>
-        /// <param name="options">The options containing the blend mode and opacity.</param>
-        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
-        public static IImageProcessingContext<TPixelDst> DrawImage<TPixelDst, TPixelSrc>(this IImageProcessingContext<TPixelDst> source, Image<TPixelSrc> image, Point location, GraphicsOptions options)
-            where TPixelDst : struct, IPixel<TPixelDst>
-            where TPixelSrc : struct, IPixel<TPixelSrc>
-            => source.ApplyProcessor(new DrawImageProcessor<TPixelDst, TPixelSrc>(image, location, options.ColorBlendingMode, options.AlphaCompositionMode, options.BlendPercentage));
-    }
-}

src/ImageSharp.Drawing/Processing/DrawingHelpers.cs

@@ -0,0 +1,22 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Primitives;
+
+namespace SixLabors.ImageSharp.Processing
+{
+    internal static class DrawingHelpers
+    {
+        /// <summary>
+        /// Convert a <see cref="DenseMatrix{Color}"/> to a <see cref="DenseMatrix{T}"/> of the given pixel type.
+        /// </summary>
+        public static DenseMatrix<TPixel> ToPixelMatrix<TPixel>(this DenseMatrix<Color> colorMatrix, Configuration configuration)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            DenseMatrix<TPixel> result = new DenseMatrix<TPixel>(colorMatrix.Columns, colorMatrix.Rows);
+            Color.ToPixel(configuration, colorMatrix.Span, result.Span);
+            return result;
+        }
+    }
+}

src/ImageSharp.Drawing/Processing/EllipticGradientBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/EllipticGradientBrush.cs

@@ -14,17 +14,15 @@ namespace SixLabors.ImageSharp.Processing
     /// a point on the longest extension of the ellipse and
     /// the ratio between longest and shortest extension.
     /// </summary>
-    /// <typeparam name="TPixel">The Pixel format that is used.</typeparam>
-    public sealed class EllipticGradientBrush<TPixel> : GradientBrushBase<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public sealed class EllipticGradientBrush : GradientBrush
     {
-        private readonly Point center;
+        private readonly PointF center;
 
-        private readonly Point referenceAxisEnd;
+        private readonly PointF referenceAxisEnd;
 
         private readonly float axisRatio;
 
-        /// <inheritdoc cref="GradientBrushBase{TPixel}" />
+        /// <inheritdoc cref="GradientBrush" />
         /// <param name="center">The center of the elliptical gradient and 0 for the color stops.</param>
         /// <param name="referenceAxisEnd">The end point of the reference axis of the ellipse.</param>
         /// <param name="axisRatio">
@@ -35,11 +33,11 @@ namespace SixLabors.ImageSharp.Processing
         /// <param name="repetitionMode">Defines how the colors of the gradients are repeated.</param>
         /// <param name="colorStops">the color stops as defined in base class.</param>
         public EllipticGradientBrush(
-            Point center,
-            Point referenceAxisEnd,
+            PointF center,
+            PointF referenceAxisEnd,
             float axisRatio,
             GradientRepetitionMode repetitionMode,
-            params ColorStop<TPixel>[] colorStops)
+            params ColorStop[] colorStops)
             : base(repetitionMode, colorStops)
         {
             this.center = center;
@@ -47,12 +45,12 @@ namespace SixLabors.ImageSharp.Processing
             this.axisRatio = axisRatio;
         }
 
-        /// <inheritdoc cref="CreateApplicator" />
-        public override BrushApplicator<TPixel> CreateApplicator(
+        /// <inheritdoc />
+        public override BrushApplicator<TPixel> CreateApplicator<TPixel>(
             ImageFrame<TPixel> source,
             RectangleF region,
             GraphicsOptions options) =>
-            new RadialGradientBrushApplicator(
+            new RadialGradientBrushApplicator<TPixel>(
                 source,
                 options,
                 this.center,
@@ -62,11 +60,12 @@ namespace SixLabors.ImageSharp.Processing
                 this.RepetitionMode);
 
         /// <inheritdoc />
-        private sealed class RadialGradientBrushApplicator : GradientBrushApplicatorBase
+        private sealed class RadialGradientBrushApplicator<TPixel> : GradientBrushApplicator<TPixel>
+            where TPixel : struct, IPixel<TPixel>
         {
-            private readonly Point center;
+            private readonly PointF center;
 
-            private readonly Point referenceAxisEnd;
+            private readonly PointF referenceAxisEnd;
 
             private readonly float axisRatio;
 
@@ -85,7 +84,7 @@ namespace SixLabors.ImageSharp.Processing
             private readonly float referenceRadiusSquared;
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="RadialGradientBrushApplicator" /> class.
+            /// Initializes a new instance of the <see cref="RadialGradientBrushApplicator{TPixel}" /> class.
             /// </summary>
             /// <param name="target">The target image</param>
             /// <param name="options">The options</param>
@@ -99,10 +98,10 @@ namespace SixLabors.ImageSharp.Processing
             public RadialGradientBrushApplicator(
                 ImageFrame<TPixel> target,
                 GraphicsOptions options,
-                Point center,
-                Point referenceAxisEnd,
+                PointF center,
+                PointF referenceAxisEnd,
                 float axisRatio,
-                ColorStop<TPixel>[] colorStops,
+                ColorStop[] colorStops,
                 GradientRepetitionMode repetitionMode)
                 : base(target, options, colorStops, repetitionMode)
             {
@@ -129,7 +128,7 @@ namespace SixLabors.ImageSharp.Processing
             }
 
             /// <inheritdoc />
-            protected override float PositionOnGradient(int xt, int yt)
+            protected override float PositionOnGradient(float xt, float yt)
             {
                 float x0 = xt - this.center.X;
                 float y0 = yt - this.center.Y;
@@ -150,8 +149,7 @@ namespace SixLabors.ImageSharp.Processing
             {
                 var vA = a - junction;
                 var vB = b - junction;
-                return (float)(Math.Atan2(vB.Y, vB.X)
-                       - Math.Atan2(vA.Y, vA.X));
+                return MathF.Atan2(vB.Y, vB.X) - MathF.Atan2(vA.Y, vA.X);
             }
 
             private float DistanceBetween(
@@ -163,7 +161,7 @@ namespace SixLabors.ImageSharp.Processing
 
                 float dY = p1.Y - p2.Y;
                 float dYsquared = dY * dY;
-                return (float)Math.Sqrt(dXsquared + dYsquared);
+                return MathF.Sqrt(dXsquared + dYsquared);
             }
         }
     }

src/ImageSharp.Drawing/Processing/DrawBezierExtensions.cs → src/ImageSharp.Drawing/Processing/Extensions/DrawBezierExtensions.cs

@@ -15,80 +15,93 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Draws the provided points as an open Bezier path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawBeziers<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IBrush<TPixel> brush, float thickness, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(options, new Pen<TPixel>(brush, thickness), new Path(new CubicBezierLineSegment(points)));
+        public static IImageProcessingContext DrawBeziers(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IBrush brush,
+            float thickness,
+            params PointF[] points) =>
+            source.Draw(options, new Pen(brush, thickness), new Path(new CubicBezierLineSegment(points)));
 
         /// <summary>
         /// Draws the provided points as an open Bezier path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawBeziers<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, float thickness, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(new Pen<TPixel>(brush, thickness), new Path(new CubicBezierLineSegment(points)));
+        public static IImageProcessingContext DrawBeziers(
+            this IImageProcessingContext source,
+            IBrush brush,
+            float thickness,
+            params PointF[] points) =>
+            source.Draw(new Pen(brush, thickness), new Path(new CubicBezierLineSegment(points)));
 
         /// <summary>
         /// Draws the provided points as an open Bezier path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawBeziers<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, float thickness, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.DrawBeziers(new SolidBrush<TPixel>(color), thickness, points);
+        public static IImageProcessingContext DrawBeziers(
+            this IImageProcessingContext source,
+            Color color,
+            float thickness,
+            params PointF[] points) =>
+            source.DrawBeziers(new SolidBrush(color), thickness, points);
 
         /// <summary>
         /// Draws the provided points as an open Bezier path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawBeziers<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, TPixel color, float thickness, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.DrawBeziers(options, new SolidBrush<TPixel>(color), thickness, points);
+        public static IImageProcessingContext DrawBeziers(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            Color color,
+            float thickness,
+            params PointF[] points) =>
+            source.DrawBeziers(options, new SolidBrush(color), thickness, points);
 
         /// <summary>
         /// Draws the provided points as an open Bezier path with the supplied pen
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawBeziers<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IPen<TPixel> pen, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(options, pen, new Path(new CubicBezierLineSegment(points)));
+        public static IImageProcessingContext DrawBeziers(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IPen pen,
+            params PointF[] points) =>
+            source.Draw(options, pen, new Path(new CubicBezierLineSegment(points)));
 
         /// <summary>
         /// Draws the provided points as an open Bezier path with the supplied pen
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawBeziers<TPixel>(this IImageProcessingContext<TPixel> source, IPen<TPixel> pen, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(pen, new Path(new CubicBezierLineSegment(points)));
+        public static IImageProcessingContext DrawBeziers(
+            this IImageProcessingContext source,
+            IPen pen,
+            params PointF[] points) =>
+            source.Draw(pen, new Path(new CubicBezierLineSegment(points)));
     }
 }

src/ImageSharp.Drawing/Processing/Extensions/DrawImageExtensions.cs

@@ -0,0 +1,175 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing.Processors.Drawing;
+using SixLabors.Primitives;
+
+namespace SixLabors.ImageSharp.Processing
+{
+    /// <summary>
+    /// Adds extensions that allow the drawing of images to the <see cref="Image{TPixel}"/> type.
+    /// </summary>
+    public static class DrawImageExtensions
+    {
+        /// <summary>
+        /// Draws the given image together with the current one by blending their pixels.
+        /// </summary>
+        /// <param name="source">The image this method extends.</param>
+        /// <param name="image">The image to blend with the currently processing image.</param>
+        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
+        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
+        public static IImageProcessingContext DrawImage(
+            this IImageProcessingContext source,
+            Image image,
+            float opacity) =>
+            source.ApplyProcessor(
+                new DrawImageProcessor(
+                    image,
+                    Point.Empty,
+                    GraphicsOptions.Default.ColorBlendingMode,
+                    GraphicsOptions.Default.AlphaCompositionMode,
+                    opacity));
+
+        /// <summary>
+        /// Draws the given image together with the current one by blending their pixels.
+        /// </summary>
+        /// <param name="source">The image this method extends.</param>
+        /// <param name="image">The image to blend with the currently processing image.</param>
+        /// <param name="colorBlending">The blending mode.</param>
+        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
+        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
+        public static IImageProcessingContext DrawImage(
+            this IImageProcessingContext source,
+            Image image,
+            PixelColorBlendingMode colorBlending,
+            float opacity) =>
+            source.ApplyProcessor(
+                new DrawImageProcessor(
+                    image,
+                    Point.Empty,
+                    colorBlending,
+                    GraphicsOptions.Default.AlphaCompositionMode,
+                    opacity));
+
+        /// <summary>
+        /// Draws the given image together with the current one by blending their pixels.
+        /// </summary>
+        /// <param name="source">The image this method extends.</param>
+        /// <param name="image">The image to blend with the currently processing image.</param>
+        /// <param name="colorBlending">The color blending mode.</param>
+        /// <param name="alphaComposition">The alpha composition mode.</param>
+        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
+        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
+        public static IImageProcessingContext DrawImage(
+            this IImageProcessingContext source,
+            Image image,
+            PixelColorBlendingMode colorBlending,
+            PixelAlphaCompositionMode alphaComposition,
+            float opacity) =>
+            source.ApplyProcessor(new DrawImageProcessor(image, Point.Empty, colorBlending, alphaComposition, opacity));
+
+        /// <summary>
+        /// Draws the given image together with the current one by blending their pixels.
+        /// </summary>
+        /// <param name="source">The image this method extends.</param>
+        /// <param name="image">The image to blend with the currently processing image.</param>
+        /// <param name="options">The options, including the blending type and blending amount.</param>
+        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
+        public static IImageProcessingContext DrawImage(
+            this IImageProcessingContext source,
+            Image image,
+            GraphicsOptions options) =>
+            source.ApplyProcessor(
+                new DrawImageProcessor(
+                    image,
+                    Point.Empty,
+                    options.ColorBlendingMode,
+                    options.AlphaCompositionMode,
+                    options.BlendPercentage));
+
+        /// <summary>
+        /// Draws the given image together with the current one by blending their pixels.
+        /// </summary>
+        /// <param name="source">The image this method extends.</param>
+        /// <param name="image">The image to blend with the currently processing image.</param>
+        /// <param name="location">The location to draw the blended image.</param>
+        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
+        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
+        public static IImageProcessingContext DrawImage(
+            this IImageProcessingContext source,
+            Image image,
+            Point location,
+            float opacity) =>
+            source.ApplyProcessor(
+                new DrawImageProcessor(
+                    image,
+                    location,
+                    GraphicsOptions.Default.ColorBlendingMode,
+                    GraphicsOptions.Default.AlphaCompositionMode,
+                    opacity));
+
+        /// <summary>
+        /// Draws the given image together with the current one by blending their pixels.
+        /// </summary>
+        /// <param name="source">The image this method extends.</param>
+        /// <param name="image">The image to blend with the currently processing image.</param>
+        /// <param name="location">The location to draw the blended image.</param>
+        /// <param name="colorBlending">The color blending to apply.</param>
+        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
+        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
+        public static IImageProcessingContext DrawImage(
+            this IImageProcessingContext source,
+            Image image,
+            Point location,
+            PixelColorBlendingMode colorBlending,
+            float opacity) =>
+            source.ApplyProcessor(
+                new DrawImageProcessor(
+                    image,
+                    location,
+                    colorBlending,
+                    GraphicsOptions.Default.AlphaCompositionMode,
+                    opacity));
+
+        /// <summary>
+        /// Draws the given image together with the current one by blending their pixels.
+        /// </summary>
+        /// <param name="source">The image this method extends.</param>
+        /// <param name="image">The image to blend with the currently processing image.</param>
+        /// <param name="location">The location to draw the blended image.</param>
+        /// <param name="colorBlending">The color blending to apply.</param>
+        /// <param name="alphaComposition">The alpha composition mode.</param>
+        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
+        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
+        public static IImageProcessingContext DrawImage(
+            this IImageProcessingContext source,
+            Image image,
+            Point location,
+            PixelColorBlendingMode colorBlending,
+            PixelAlphaCompositionMode alphaComposition,
+            float opacity) =>
+            source.ApplyProcessor(new DrawImageProcessor(image, location, colorBlending, alphaComposition, opacity));
+
+        /// <summary>
+        /// Draws the given image together with the current one by blending their pixels.
+        /// </summary>
+        /// <param name="source">The image this method extends.</param>
+        /// <param name="image">The image to blend with the currently processing image.</param>
+        /// <param name="location">The location to draw the blended image.</param>
+        /// <param name="options">The options containing the blend mode and opacity.</param>
+        /// <returns>The <see cref="Image{TPixelDst}"/>.</returns>
+        public static IImageProcessingContext DrawImage(
+            this IImageProcessingContext source,
+            Image image,
+            Point location,
+            GraphicsOptions options) =>
+            source.ApplyProcessor(
+                new DrawImageProcessor(
+                    image,
+                    location,
+                    options.ColorBlendingMode,
+                    options.AlphaCompositionMode,
+                    options.BlendPercentage));
+    }
+}

src/ImageSharp.Drawing/Processing/DrawLineExtensions.cs → src/ImageSharp.Drawing/Processing/Extensions/DrawLineExtensions.cs

@@ -15,80 +15,93 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Draws the provided Points as an open Linear path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawLines<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IBrush<TPixel> brush, float thickness, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(options, new Pen<TPixel>(brush, thickness), new Path(new LinearLineSegment(points)));
+        public static IImageProcessingContext DrawLines(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IBrush brush,
+            float thickness,
+            params PointF[] points) =>
+            source.Draw(options, new Pen(brush, thickness), new Path(new LinearLineSegment(points)));
 
         /// <summary>
         /// Draws the provided Points as an open Linear path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawLines<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, float thickness, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(new Pen<TPixel>(brush, thickness), new Path(new LinearLineSegment(points)));
+        public static IImageProcessingContext DrawLines(
+            this IImageProcessingContext source,
+            IBrush brush,
+            float thickness,
+            params PointF[] points) =>
+            source.Draw(new Pen(brush, thickness), new Path(new LinearLineSegment(points)));
 
         /// <summary>
         /// Draws the provided Points as an open Linear path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawLines<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, float thickness, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.DrawLines(new SolidBrush<TPixel>(color), thickness, points);
+        public static IImageProcessingContext DrawLines(
+            this IImageProcessingContext source,
+            Color color,
+            float thickness,
+            params PointF[] points) =>
+            source.DrawLines(new SolidBrush(color), thickness, points);
 
         /// <summary>
         /// Draws the provided Points as an open Linear path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>>
-        public static IImageProcessingContext<TPixel> DrawLines<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, TPixel color, float thickness, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.DrawLines(options, new SolidBrush<TPixel>(color), thickness, points);
+        public static IImageProcessingContext DrawLines(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            Color color,
+            float thickness,
+            params PointF[] points) =>
+            source.DrawLines(options, new SolidBrush(color), thickness, points);
 
         /// <summary>
         /// Draws the provided Points as an open Linear path with the supplied pen
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawLines<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IPen<TPixel> pen, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(options, pen, new Path(new LinearLineSegment(points)));
+        public static IImageProcessingContext DrawLines(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IPen pen,
+            params PointF[] points) =>
+            source.Draw(options, pen, new Path(new LinearLineSegment(points)));
 
         /// <summary>
         /// Draws the provided Points as an open Linear path with the supplied pen
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawLines<TPixel>(this IImageProcessingContext<TPixel> source, IPen<TPixel> pen, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(pen, new Path(new LinearLineSegment(points)));
+        public static IImageProcessingContext DrawLines(
+            this IImageProcessingContext source,
+            IPen pen,
+            params PointF[] points) =>
+            source.Draw(pen, new Path(new LinearLineSegment(points)));
     }
 }

src/ImageSharp.Drawing/Processing/DrawPathCollectionExtensions.cs → src/ImageSharp.Drawing/Processing/Extensions/DrawPathCollectionExtensions.cs

@@ -14,14 +14,16 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Draws the outline of the polygon with the provided pen.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="paths">The paths.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IPen<TPixel> pen, IPathCollection paths)
-           where TPixel : struct, IPixel<TPixel>
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IPen pen,
+            IPathCollection paths)
         {
             foreach (IPath path in paths)
             {
@@ -34,67 +36,76 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Draws the outline of the polygon with the provided pen.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="paths">The paths.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, IPen<TPixel> pen, IPathCollection paths)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(GraphicsOptions.Default, pen, paths);
+        public static IImageProcessingContext
+            Draw(this IImageProcessingContext source, IPen pen, IPathCollection paths) =>
+            source.Draw(GraphicsOptions.Default, pen, paths);
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="paths">The shapes.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IBrush<TPixel> brush, float thickness, IPathCollection paths)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(options, new Pen<TPixel>(brush, thickness), paths);
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IBrush brush,
+            float thickness,
+            IPathCollection paths) =>
+            source.Draw(options, new Pen(brush, thickness), paths);
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="paths">The paths.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, float thickness, IPathCollection paths)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(new Pen<TPixel>(brush, thickness), paths);
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            IBrush brush,
+            float thickness,
+            IPathCollection paths) =>
+            source.Draw(new Pen(brush, thickness), paths);
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="paths">The paths.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, TPixel color, float thickness, IPathCollection paths)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(options, new SolidBrush<TPixel>(color), thickness, paths);
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            Color color,
+            float thickness,
+            IPathCollection paths) =>
+            source.Draw(options, new SolidBrush(color), thickness, paths);
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="paths">The paths.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, float thickness, IPathCollection paths)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(new SolidBrush<TPixel>(color), thickness, paths);
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            Color color,
+            float thickness,
+            IPathCollection paths) =>
+            source.Draw(new SolidBrush(color), thickness, paths);
     }
 }

src/ImageSharp.Drawing/Processing/DrawPathExtensions.cs → src/ImageSharp.Drawing/Processing/Extensions/DrawPathExtensions.cs

@@ -15,80 +15,90 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Draws the outline of the polygon with the provided pen.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IPen<TPixel> pen, IPath path)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(options, pen.StrokeFill, new ShapePath(path, pen));
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IPen pen,
+            IPath path) =>
+            source.Fill(options, pen.StrokeFill, new ShapePath(path, pen));
 
         /// <summary>
         /// Draws the outline of the polygon with the provided pen.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, IPen<TPixel> pen, IPath path)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(GraphicsOptions.Default, pen, path);
+        public static IImageProcessingContext Draw(this IImageProcessingContext source, IPen pen, IPath path) =>
+            source.Draw(GraphicsOptions.Default, pen, path);
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="path">The shape.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IBrush<TPixel> brush, float thickness, IPath path)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(options, new Pen<TPixel>(brush, thickness), path);
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IBrush brush,
+            float thickness,
+            IPath path) =>
+            source.Draw(options, new Pen(brush, thickness), path);
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, float thickness, IPath path)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(new Pen<TPixel>(brush, thickness), path);
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            IBrush brush,
+            float thickness,
+            IPath path) =>
+            source.Draw(new Pen(brush, thickness), path);
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, TPixel color, float thickness, IPath path)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(options, new SolidBrush<TPixel>(color), thickness, path);
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            Color color,
+            float thickness,
+            IPath path) =>
+            source.Draw(options, new SolidBrush(color), thickness, path);
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, float thickness, IPath path)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(new SolidBrush<TPixel>(color), thickness, path);
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            Color color,
+            float thickness,
+            IPath path) =>
+            source.Draw(new SolidBrush(color), thickness, path);
     }
 }

src/ImageSharp.Drawing/Processing/DrawPolygonExtensions.cs → src/ImageSharp.Drawing/Processing/Extensions/DrawPolygonExtensions.cs

@@ -15,80 +15,93 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawPolygon<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IBrush<TPixel> brush, float thickness, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(options, new Pen<TPixel>(brush, thickness), new Polygon(new LinearLineSegment(points)));
+        public static IImageProcessingContext DrawPolygon(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IBrush brush,
+            float thickness,
+            params PointF[] points) =>
+            source.Draw(options, new Pen(brush, thickness), new Polygon(new LinearLineSegment(points)));
 
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawPolygon<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, float thickness, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(new Pen<TPixel>(brush, thickness), new Polygon(new LinearLineSegment(points)));
+        public static IImageProcessingContext DrawPolygon(
+            this IImageProcessingContext source,
+            IBrush brush,
+            float thickness,
+            params PointF[] points) =>
+            source.Draw(new Pen(brush, thickness), new Polygon(new LinearLineSegment(points)));
 
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawPolygon<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, float thickness, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.DrawPolygon(new SolidBrush<TPixel>(color), thickness, points);
+        public static IImageProcessingContext DrawPolygon(
+            this IImageProcessingContext source,
+            Color color,
+            float thickness,
+            params PointF[] points) =>
+            source.DrawPolygon(new SolidBrush(color), thickness, points);
 
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawPolygon<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, TPixel color, float thickness, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.DrawPolygon(options, new SolidBrush<TPixel>(color), thickness, points);
+        public static IImageProcessingContext DrawPolygon(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            Color color,
+            float thickness,
+            params PointF[] points) =>
+            source.DrawPolygon(options, new SolidBrush(color), thickness, points);
 
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided Pen.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawPolygon<TPixel>(this IImageProcessingContext<TPixel> source, IPen<TPixel> pen, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(GraphicsOptions.Default, pen, new Polygon(new LinearLineSegment(points)));
+        public static IImageProcessingContext DrawPolygon(
+            this IImageProcessingContext source,
+            IPen pen,
+            params PointF[] points) =>
+            source.Draw(GraphicsOptions.Default, pen, new Polygon(new LinearLineSegment(points)));
 
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided Pen.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> DrawPolygon<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IPen<TPixel> pen, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(options, pen, new Polygon(new LinearLineSegment(points)));
+        public static IImageProcessingContext DrawPolygon(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IPen pen,
+            params PointF[] points) =>
+            source.Draw(options, pen, new Polygon(new LinearLineSegment(points)));
     }
 }

src/ImageSharp.Drawing/Processing/DrawRectangleExtensions.cs → src/ImageSharp.Drawing/Processing/Extensions/DrawRectangleExtensions.cs

@@ -15,80 +15,90 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Draws the outline of the rectangle with the provided pen.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="shape">The shape.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IPen<TPixel> pen, RectangleF shape)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(options, pen, new RectangularPolygon(shape.X, shape.Y, shape.Width, shape.Height));
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IPen pen,
+            RectangleF shape) =>
+            source.Draw(options, pen, new RectangularPolygon(shape.X, shape.Y, shape.Width, shape.Height));
 
         /// <summary>
         /// Draws the outline of the rectangle with the provided pen.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="shape">The shape.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, IPen<TPixel> pen, RectangleF shape)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(GraphicsOptions.Default, pen, shape);
+        public static IImageProcessingContext Draw(this IImageProcessingContext source, IPen pen, RectangleF shape) =>
+            source.Draw(GraphicsOptions.Default, pen, shape);
 
         /// <summary>
         /// Draws the outline of the rectangle with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="shape">The shape.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IBrush<TPixel> brush, float thickness, RectangleF shape)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(options, new Pen<TPixel>(brush, thickness), shape);
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IBrush brush,
+            float thickness,
+            RectangleF shape) =>
+            source.Draw(options, new Pen(brush, thickness), shape);
 
         /// <summary>
         /// Draws the outline of the rectangle with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="shape">The shape.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, float thickness, RectangleF shape)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(new Pen<TPixel>(brush, thickness), shape);
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            IBrush brush,
+            float thickness,
+            RectangleF shape) =>
+            source.Draw(new Pen(brush, thickness), shape);
 
         /// <summary>
         /// Draws the outline of the rectangle with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="shape">The shape.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, TPixel color, float thickness, RectangleF shape)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(options, new SolidBrush<TPixel>(color), thickness, shape);
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            Color color,
+            float thickness,
+            RectangleF shape) =>
+            source.Draw(options, new SolidBrush(color), thickness, shape);
 
         /// <summary>
         /// Draws the outline of the rectangle with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="shape">The shape.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Draw<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, float thickness, RectangleF shape)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Draw(new SolidBrush<TPixel>(color), thickness, shape);
+        public static IImageProcessingContext Draw(
+            this IImageProcessingContext source,
+            Color color,
+            float thickness,
+            RectangleF shape) =>
+            source.Draw(new SolidBrush(color), thickness, shape);
     }
 }

src/ImageSharp.Drawing/Processing/DrawTextExtensions.cs → src/ImageSharp.Drawing/Processing/Extensions/DrawTextExtensions.cs

@@ -16,7 +16,6 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Draws the text onto the the image filled via the brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="text">The text.</param>
         /// <param name="font">The font.</param>
@@ -25,14 +24,17 @@ namespace SixLabors.ImageSharp.Processing
         /// <returns>
         /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static IImageProcessingContext<TPixel> DrawText<TPixel>(this IImageProcessingContext<TPixel> source, string text, Font font, TPixel color, PointF location)
-            where TPixel : struct, IPixel<TPixel>
-            => source.DrawText(TextGraphicsOptions.Default, text, font, color, location);
+        public static IImageProcessingContext DrawText(
+            this IImageProcessingContext source,
+            string text,
+            Font font,
+            Color color,
+            PointF location) =>
+            source.DrawText(TextGraphicsOptions.Default, text, font, color, location);
 
         /// <summary>
         /// Draws the text onto the the image filled via the brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="text">The text.</param>
@@ -42,14 +44,18 @@ namespace SixLabors.ImageSharp.Processing
         /// <returns>
         /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static IImageProcessingContext<TPixel> DrawText<TPixel>(this IImageProcessingContext<TPixel> source, TextGraphicsOptions options, string text, Font font, TPixel color, PointF location)
-            where TPixel : struct, IPixel<TPixel>
-            => source.DrawText(options, text, font, Brushes.Solid(color), null, location);
+        public static IImageProcessingContext DrawText(
+            this IImageProcessingContext source,
+            TextGraphicsOptions options,
+            string text,
+            Font font,
+            Color color,
+            PointF location) =>
+            source.DrawText(options, text, font, Brushes.Solid(color), null, location);
 
         /// <summary>
         /// Draws the text onto the the image filled via the brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="text">The text.</param>
         /// <param name="font">The font.</param>
@@ -58,14 +64,17 @@ namespace SixLabors.ImageSharp.Processing
         /// <returns>
         /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static IImageProcessingContext<TPixel> DrawText<TPixel>(this IImageProcessingContext<TPixel> source, string text, Font font, IBrush<TPixel> brush, PointF location)
-            where TPixel : struct, IPixel<TPixel>
-            => source.DrawText(TextGraphicsOptions.Default, text, font, brush, location);
+        public static IImageProcessingContext DrawText(
+            this IImageProcessingContext source,
+            string text,
+            Font font,
+            IBrush brush,
+            PointF location) =>
+            source.DrawText(TextGraphicsOptions.Default, text, font, brush, location);
 
         /// <summary>
         /// Draws the text onto the the image filled via the brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="text">The text.</param>
@@ -75,14 +84,18 @@ namespace SixLabors.ImageSharp.Processing
         /// <returns>
         /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static IImageProcessingContext<TPixel> DrawText<TPixel>(this IImageProcessingContext<TPixel> source, TextGraphicsOptions options, string text, Font font, IBrush<TPixel> brush, PointF location)
-            where TPixel : struct, IPixel<TPixel>
-            => source.DrawText(options, text, font, brush, null, location);
+        public static IImageProcessingContext DrawText(
+            this IImageProcessingContext source,
+            TextGraphicsOptions options,
+            string text,
+            Font font,
+            IBrush brush,
+            PointF location) =>
+            source.DrawText(options, text, font, brush, null, location);
 
         /// <summary>
         /// Draws the text onto the the image outlined via the pen.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="text">The text.</param>
         /// <param name="font">The font.</param>
@@ -91,14 +104,17 @@ namespace SixLabors.ImageSharp.Processing
         /// <returns>
         /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static IImageProcessingContext<TPixel> DrawText<TPixel>(this IImageProcessingContext<TPixel> source, string text, Font font, IPen<TPixel> pen, PointF location)
-            where TPixel : struct, IPixel<TPixel>
-            => source.DrawText(TextGraphicsOptions.Default, text, font, pen, location);
+        public static IImageProcessingContext DrawText(
+            this IImageProcessingContext source,
+            string text,
+            Font font,
+            IPen pen,
+            PointF location) =>
+            source.DrawText(TextGraphicsOptions.Default, text, font, pen, location);
 
         /// <summary>
         /// Draws the text onto the the image outlined via the pen.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="text">The text.</param>
@@ -108,14 +124,18 @@ namespace SixLabors.ImageSharp.Processing
         /// <returns>
         /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static IImageProcessingContext<TPixel> DrawText<TPixel>(this IImageProcessingContext<TPixel> source, TextGraphicsOptions options, string text, Font font, IPen<TPixel> pen, PointF location)
-            where TPixel : struct, IPixel<TPixel>
-            => source.DrawText(options, text, font, null, pen, location);
+        public static IImageProcessingContext DrawText(
+            this IImageProcessingContext source,
+            TextGraphicsOptions options,
+            string text,
+            Font font,
+            IPen pen,
+            PointF location) =>
+            source.DrawText(options, text, font, null, pen, location);
 
         /// <summary>
         /// Draws the text onto the the image filled via the brush then outlined via the pen.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="text">The text.</param>
         /// <param name="font">The font.</param>
@@ -125,14 +145,18 @@ namespace SixLabors.ImageSharp.Processing
         /// <returns>
         /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static IImageProcessingContext<TPixel> DrawText<TPixel>(this IImageProcessingContext<TPixel> source, string text, Font font, IBrush<TPixel> brush, IPen<TPixel> pen, PointF location)
-            where TPixel : struct, IPixel<TPixel>
-            => source.DrawText(TextGraphicsOptions.Default, text, font, brush, pen, location);
+        public static IImageProcessingContext DrawText(
+            this IImageProcessingContext source,
+            string text,
+            Font font,
+            IBrush brush,
+            IPen pen,
+            PointF location) =>
+            source.DrawText(TextGraphicsOptions.Default, text, font, brush, pen, location);
 
         /// <summary>
         /// Draws the text using the default resolution of <value>72dpi</value> onto the the image filled via the brush then outlined via the pen.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="text">The text.</param>
@@ -143,8 +167,14 @@ namespace SixLabors.ImageSharp.Processing
         /// <returns>
         /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static IImageProcessingContext<TPixel> DrawText<TPixel>(this IImageProcessingContext<TPixel> source, TextGraphicsOptions options, string text, Font font, IBrush<TPixel> brush, IPen<TPixel> pen, PointF location)
-           where TPixel : struct, IPixel<TPixel>
-            => source.ApplyProcessor(new DrawTextProcessor<TPixel>(options, text, font, brush, pen, location));
+        public static IImageProcessingContext DrawText(
+            this IImageProcessingContext source,
+            TextGraphicsOptions options,
+            string text,
+            Font font,
+            IBrush brush,
+            IPen pen,
+            PointF location) =>
+            source.ApplyProcessor(new DrawTextProcessor(options, text, font, brush, pen, location));
     }
 }

src/ImageSharp.Drawing/Processing/FillPathBuilderExtensions.cs → src/ImageSharp.Drawing/Processing/Extensions/FillPathBuilderExtensions.cs

@@ -15,14 +15,16 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The graphics options.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="path">The shape.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IBrush<TPixel> brush, Action<PathBuilder> path)
-          where TPixel : struct, IPixel<TPixel>
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IBrush brush,
+            Action<PathBuilder> path)
         {
             var pb = new PathBuilder();
             path(pb);
@@ -33,38 +35,42 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, Action<PathBuilder> path)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(GraphicsOptions.Default, brush, path);
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            IBrush brush,
+            Action<PathBuilder> path) =>
+            source.Fill(GraphicsOptions.Default, brush, path);
 
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="color">The color.</param>
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, TPixel color, Action<PathBuilder> path)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(options, new SolidBrush<TPixel>(color), path);
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            Color color,
+            Action<PathBuilder> path) =>
+            source.Fill(options, new SolidBrush(color), path);
 
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, Action<PathBuilder> path)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(new SolidBrush<TPixel>(color), path);
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            Color color,
+            Action<PathBuilder> path) =>
+            source.Fill(new SolidBrush(color), path);
     }
 }

src/ImageSharp.Drawing/Processing/FillPathCollectionExtensions.cs → src/ImageSharp.Drawing/Processing/Extensions/FillPathCollectionExtensions.cs

@@ -14,14 +14,16 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The graphics options.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="paths">The shapes.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IBrush<TPixel> brush, IPathCollection paths)
-          where TPixel : struct, IPixel<TPixel>
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IBrush brush,
+            IPathCollection paths)
         {
             foreach (IPath s in paths)
             {
@@ -34,38 +36,42 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="paths">The paths.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, IPathCollection paths)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(GraphicsOptions.Default, brush, paths);
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            IBrush brush,
+            IPathCollection paths) =>
+            source.Fill(GraphicsOptions.Default, brush, paths);
 
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="color">The color.</param>
         /// <param name="paths">The paths.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, TPixel color, IPathCollection paths)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(options, new SolidBrush<TPixel>(color), paths);
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            Color color,
+            IPathCollection paths) =>
+            source.Fill(options, new SolidBrush(color), paths);
 
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="paths">The paths.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, IPathCollection paths)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(new SolidBrush<TPixel>(color), paths);
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            Color color,
+            IPathCollection paths) =>
+            source.Fill(new SolidBrush(color), paths);
     }
 }

src/ImageSharp.Drawing/Processing/FillPathExtensions.cs → src/ImageSharp.Drawing/Processing/Extensions/FillPathExtensions.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 using SixLabors.Shapes;
 
@@ -15,51 +14,51 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The graphics options.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="path">The shape.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IBrush<TPixel> brush, IPath path)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(options, brush, new ShapeRegion(path));
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IBrush brush,
+            IPath path) =>
+            source.Fill(options, brush, new ShapeRegion(path));
 
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, IPath path)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(GraphicsOptions.Default, brush, new ShapeRegion(path));
+        public static IImageProcessingContext Fill(this IImageProcessingContext source, IBrush brush, IPath path) =>
+            source.Fill(GraphicsOptions.Default, brush, new ShapeRegion(path));
 
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush..
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="color">The color.</param>
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, TPixel color, IPath path)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(options, new SolidBrush<TPixel>(color), path);
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            Color color,
+            IPath path) =>
+            source.Fill(options, new SolidBrush(color), path);
 
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush..
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, IPath path)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(new SolidBrush<TPixel>(color), path);
+        public static IImageProcessingContext Fill(this IImageProcessingContext source, Color color, IPath path) =>
+            source.Fill(new SolidBrush(color), path);
     }
 }

src/ImageSharp.Drawing/Processing/FillPolygonExtensions.cs → src/ImageSharp.Drawing/Processing/Extensions/FillPolygonExtensions.cs

@@ -15,51 +15,57 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Flood fills the image in the shape of a Linear polygon described by the points
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> FillPolygon<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IBrush<TPixel> brush, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(options, brush, new Polygon(new LinearLineSegment(points)));
+        public static IImageProcessingContext FillPolygon(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IBrush brush,
+            params PointF[] points) =>
+            source.Fill(options, brush, new Polygon(new LinearLineSegment(points)));
 
         /// <summary>
         /// Flood fills the image in the shape of a Linear polygon described by the points
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> FillPolygon<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(brush, new Polygon(new LinearLineSegment(points)));
+        public static IImageProcessingContext FillPolygon(
+            this IImageProcessingContext source,
+            IBrush brush,
+            params PointF[] points) =>
+            source.Fill(brush, new Polygon(new LinearLineSegment(points)));
 
         /// <summary>
         /// Flood fills the image in the shape of a Linear polygon described by the points
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="color">The color.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> FillPolygon<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, TPixel color, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(options, new SolidBrush<TPixel>(color), new Polygon(new LinearLineSegment(points)));
+        public static IImageProcessingContext FillPolygon(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            Color color,
+            params PointF[] points) =>
+            source.Fill(options, new SolidBrush(color), new Polygon(new LinearLineSegment(points)));
 
         /// <summary>
         /// Flood fills the image in the shape of a Linear polygon described by the points
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> FillPolygon<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, params PointF[] points)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(new SolidBrush<TPixel>(color), new Polygon(new LinearLineSegment(points)));
+        public static IImageProcessingContext FillPolygon(
+            this IImageProcessingContext source,
+            Color color,
+            params PointF[] points) =>
+            source.Fill(new SolidBrush(color), new Polygon(new LinearLineSegment(points)));
     }
 }

src/ImageSharp.Drawing/Processing/FillRectangleExtensions.cs → src/ImageSharp.Drawing/Processing/Extensions/FillRectangleExtensions.cs

@@ -15,51 +15,53 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Flood fills the image in the shape of the provided rectangle with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="shape">The shape.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IBrush<TPixel> brush, RectangleF shape)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(options, brush, new RectangularPolygon(shape.X, shape.Y, shape.Width, shape.Height));
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IBrush brush,
+            RectangleF shape) =>
+            source.Fill(options, brush, new RectangularPolygon(shape.X, shape.Y, shape.Width, shape.Height));
 
         /// <summary>
         /// Flood fills the image in the shape of the provided rectangle with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="shape">The shape.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, RectangleF shape)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(brush, new RectangularPolygon(shape.X, shape.Y, shape.Width, shape.Height));
+        public static IImageProcessingContext
+            Fill(this IImageProcessingContext source, IBrush brush, RectangleF shape) =>
+            source.Fill(brush, new RectangularPolygon(shape.X, shape.Y, shape.Width, shape.Height));
 
         /// <summary>
         /// Flood fills the image in the shape of the provided rectangle with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="color">The color.</param>
         /// <param name="shape">The shape.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, TPixel color, RectangleF shape)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(options, new SolidBrush<TPixel>(color), shape);
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            Color color,
+            RectangleF shape) =>
+            source.Fill(options, new SolidBrush(color), shape);
 
         /// <summary>
         /// Flood fills the image in the shape of the provided rectangle with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="shape">The shape.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, RectangleF shape)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(new SolidBrush<TPixel>(color), shape);
+        public static IImageProcessingContext
+            Fill(this IImageProcessingContext source, Color color, RectangleF shape) =>
+            source.Fill(new SolidBrush(color), shape);
     }
 }

src/ImageSharp.Drawing/Processing/FillRegionExtensions.cs → src/ImageSharp.Drawing/Processing/Extensions/FillRegionExtensions.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 using SixLabors.ImageSharp.Processing.Processors.Drawing;
 
@@ -15,85 +14,82 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Flood fills the image with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The details how to fill the region of interest.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(GraphicsOptions.Default, brush);
+        public static IImageProcessingContext Fill(this IImageProcessingContext source, IBrush brush) =>
+            source.Fill(GraphicsOptions.Default, brush);
 
         /// <summary>
         /// Flood fills the image with the specified color.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(new SolidBrush<TPixel>(color));
+        public static IImageProcessingContext Fill(this IImageProcessingContext source, Color color) =>
+            source.Fill(new SolidBrush(color));
 
         /// <summary>
         /// Flood fills the image with in the region with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="region">The region.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, IBrush<TPixel> brush, Region region)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(GraphicsOptions.Default, brush, region);
+        public static IImageProcessingContext Fill(this IImageProcessingContext source, IBrush brush, Region region) =>
+            source.Fill(GraphicsOptions.Default, brush, region);
 
         /// <summary>
         /// Flood fills the image with in the region with the specified color.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
         /// <param name="color">The color.</param>
         /// <param name="region">The region.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, TPixel color, Region region)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(options, new SolidBrush<TPixel>(color), region);
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            Color color,
+            Region region) =>
+            source.Fill(options, new SolidBrush(color), region);
 
         /// <summary>
         /// Flood fills the image with in the region with the specified color.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="region">The region.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, TPixel color, Region region)
-            where TPixel : struct, IPixel<TPixel>
-            => source.Fill(new SolidBrush<TPixel>(color), region);
+        public static IImageProcessingContext Fill(this IImageProcessingContext source, Color color, Region region) =>
+            source.Fill(new SolidBrush(color), region);
 
         /// <summary>
         /// Flood fills the image with in the region with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The graphics options.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="region">The region.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IBrush<TPixel> brush, Region region)
-            where TPixel : struct, IPixel<TPixel>
-            => source.ApplyProcessor(new FillRegionProcessor<TPixel>(brush, region, options));
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IBrush brush,
+            Region region) =>
+            source.ApplyProcessor(new FillRegionProcessor(brush, region, options));
 
         /// <summary>
         /// Flood fills the image with the specified brush.
         /// </summary>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The graphics options.</param>
         /// <param name="brush">The details how to fill the region of interest.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Fill<TPixel>(this IImageProcessingContext<TPixel> source, GraphicsOptions options, IBrush<TPixel> brush)
-            where TPixel : struct, IPixel<TPixel>
-            => source.ApplyProcessor(new FillProcessor<TPixel>(brush, options));
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            GraphicsOptions options,
+            IBrush brush) =>
+            source.ApplyProcessor(new FillProcessor(brush, options));
     }
 }

src/ImageSharp.Drawing/Processing/GradientBrushBase{TPixel}.cs → src/ImageSharp.Drawing/Processing/GradientBrush.cs

@@ -13,16 +13,14 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// Base class for Gradient brushes
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format</typeparam>
-    public abstract class GradientBrushBase<TPixel> : IBrush<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public abstract class GradientBrush : IBrush
     {
-        /// <inheritdoc cref="IBrush{TPixel}"/>
+        /// <inheritdoc cref="IBrush"/>
         /// <param name="repetitionMode">Defines how the colors are repeated beyond the interval [0..1]</param>
         /// <param name="colorStops">The gradient colors.</param>
-        protected GradientBrushBase(
+        protected GradientBrush(
             GradientRepetitionMode repetitionMode,
-            params ColorStop<TPixel>[] colorStops)
+            params ColorStop[] colorStops)
         {
             this.RepetitionMode = repetitionMode;
             this.ColorStops = colorStops;
@@ -36,34 +34,38 @@ namespace SixLabors.ImageSharp.Processing
         /// <summary>
         /// Gets the list of color stops for this gradient.
         /// </summary>
-        protected ColorStop<TPixel>[] ColorStops { get; }
+        protected ColorStop[] ColorStops { get; }
 
-        /// <inheritdoc cref="IBrush{TPixel}" />
-        public abstract BrushApplicator<TPixel> CreateApplicator(
+        /// <inheritdoc />
+        public abstract BrushApplicator<TPixel> CreateApplicator<TPixel>(
             ImageFrame<TPixel> source,
             RectangleF region,
-            GraphicsOptions options);
+            GraphicsOptions options)
+            where TPixel : struct, IPixel<TPixel>;
 
         /// <summary>
         /// Base class for gradient brush applicators
         /// </summary>
-        protected abstract class GradientBrushApplicatorBase : BrushApplicator<TPixel>
+        internal abstract class GradientBrushApplicator<TPixel> : BrushApplicator<TPixel>
+            where TPixel : struct, IPixel<TPixel>
         {
-            private readonly ColorStop<TPixel>[] colorStops;
+            private static readonly TPixel Transparent = Color.Transparent.ToPixel<TPixel>();
+
+            private readonly ColorStop[] colorStops;
 
             private readonly GradientRepetitionMode repetitionMode;
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="GradientBrushApplicatorBase"/> class.
+            /// Initializes a new instance of the <see cref="GradientBrushApplicator{TPixel}"/> class.
             /// </summary>
             /// <param name="target">The target.</param>
             /// <param name="options">The options.</param>
             /// <param name="colorStops">An array of color stops sorted by their position.</param>
             /// <param name="repetitionMode">Defines if and how the gradient should be repeated.</param>
-            protected GradientBrushApplicatorBase(
+            protected GradientBrushApplicator(
                 ImageFrame<TPixel> target,
                 GraphicsOptions options,
-                ColorStop<TPixel>[] colorStops,
+                ColorStop[] colorStops,
                 GradientRepetitionMode repetitionMode)
                 : base(target, options)
             {
@@ -81,7 +83,7 @@ namespace SixLabors.ImageSharp.Processing
             {
                 get
                 {
-                    float positionOnCompleteGradient = this.PositionOnGradient(x, y);
+                    float positionOnCompleteGradient = this.PositionOnGradient(x + 0.5f, y + 0.5f);
 
                     switch (this.repetitionMode)
                     {
@@ -103,7 +105,7 @@ namespace SixLabors.ImageSharp.Processing
                         case GradientRepetitionMode.DontFill:
                             if (positionOnCompleteGradient > 1 || positionOnCompleteGradient < 0)
                             {
-                                return NamedColors<TPixel>.Transparent;
+                                return Transparent;
                             }
 
                             break;
@@ -111,17 +113,17 @@ namespace SixLabors.ImageSharp.Processing
                             throw new ArgumentOutOfRangeException();
                     }
 
-                    (ColorStop<TPixel> from, ColorStop<TPixel> to) = this.GetGradientSegment(positionOnCompleteGradient);
+                    (ColorStop from, ColorStop to) = this.GetGradientSegment(positionOnCompleteGradient);
 
                     if (from.Color.Equals(to.Color))
                     {
-                        return from.Color;
+                        return from.Color.ToPixel<TPixel>();
                     }
                     else
                     {
                         var fromAsVector = from.Color.ToVector4();
                         var toAsVector = to.Color.ToVector4();
-                        float onLocalGradient = (positionOnCompleteGradient - from.Ratio) / to.Ratio;
+                        float onLocalGradient = (positionOnCompleteGradient - from.Ratio) / (to.Ratio - from.Ratio);
 
                         // TODO: this should be changeble for different gradienting functions
                         Vector4 result = PorterDuffFunctions.NormalSrcOver(
@@ -137,27 +139,27 @@ namespace SixLabors.ImageSharp.Processing
             }
 
             /// <summary>
-            /// calculates the position on the gradient for a given pixel.
+            /// calculates the position on the gradient for a given point.
             /// This method is abstract as it's content depends on the shape of the gradient.
             /// </summary>
-            /// <param name="x">The x coordinate of the pixel</param>
-            /// <param name="y">The y coordinate of the pixel</param>
+            /// <param name="x">The x coordinate of the point</param>
+            /// <param name="y">The y coordinate of the point</param>
             /// <returns>
-            /// The position the given pixel has on the gradient.
+            /// The position the given point has on the gradient.
             /// The position is not bound to the [0..1] interval.
             /// Values outside of that interval may be treated differently,
             /// e.g. for the <see cref="GradientRepetitionMode" /> enum.
             /// </returns>
-            protected abstract float PositionOnGradient(int x, int y);
+            protected abstract float PositionOnGradient(float x, float y);
 
-            private (ColorStop<TPixel> from, ColorStop<TPixel> to) GetGradientSegment(
+            private (ColorStop from, ColorStop to) GetGradientSegment(
                 float positionOnCompleteGradient)
             {
-                ColorStop<TPixel> localGradientFrom = this.colorStops[0];
-                ColorStop<TPixel> localGradientTo = default;
+                ColorStop localGradientFrom = this.colorStops[0];
+                ColorStop localGradientTo = default;
 
                 // TODO: ensure colorStops has at least 2 items (technically 1 would be okay, but that's no gradient)
-                foreach (ColorStop<TPixel> colorStop in this.colorStops)
+                foreach (ColorStop colorStop in this.colorStops)
                 {
                     localGradientTo = colorStop;
 

src/ImageSharp.Drawing/Processing/GradientRepetitionMode.cs

@@ -21,16 +21,16 @@ namespace SixLabors.ImageSharp.Processing
 
         /// <summary>
         /// Reflect the gradient.
-        /// Similar to <see cref="Repeat"/>, but each other repetition uses inverse order of <see cref="ColorStop{TPixel}"/>s.
+        /// Similar to <see cref="Repeat"/>, but each other repetition uses inverse order of <see cref="ColorStop"/>s.
         /// Used on a Black-White gradient, Reflect leads to Black->{gray}->White->{gray}->White...
         /// </summary>
         Reflect,
 
         /// <summary>
         /// With DontFill a gradient does not touch any pixel beyond it's borders.
-        /// For the <see cref="LinearGradientBrush{TPixel}" /> this is beyond the orthogonal through start and end,
+        /// For the <see cref="LinearGradientBrush" /> this is beyond the orthogonal through start and end,
         /// TODO For the cref="PolygonalGradientBrush" it's outside the polygon,
-        /// For <see cref="RadialGradientBrush{TPixel}" /> and <see cref="EllipticGradientBrush{TPixel}" /> it's beyond 1.0.
+        /// For <see cref="RadialGradientBrush" /> and <see cref="EllipticGradientBrush" /> it's beyond 1.0.
         /// </summary>
         DontFill
     }

src/ImageSharp.Drawing/Processing/IBrush.cs

@@ -9,17 +9,16 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// Brush represents a logical configuration of a brush which can be used to source pixel colors
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
     /// <remarks>
     /// A brush is a simple class that will return an <see cref="BrushApplicator{TPixel}" /> that will perform the
-    /// logic for converting a pixel location to a <typeparamref name="TPixel"/>.
+    /// logic for retrieving pixel values for specific locations.
     /// </remarks>
-    public interface IBrush<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public interface IBrush
     {
         /// <summary>
         /// Creates the applicator for this brush.
         /// </summary>
+        /// <typeparam name="TPixel">The pixel type.</typeparam>
         /// <param name="source">The source image.</param>
         /// <param name="region">The region the brush will be applied to.</param>
         /// <param name="options">The graphic options</param>
@@ -30,6 +29,10 @@ namespace SixLabors.ImageSharp.Processing
         /// The <paramref name="region" /> when being applied to things like shapes would usually be the
         /// bounding box of the shape not necessarily the bounds of the whole image
         /// </remarks>
-        BrushApplicator<TPixel> CreateApplicator(ImageFrame<TPixel> source, RectangleF region, GraphicsOptions options);
+        BrushApplicator<TPixel> CreateApplicator<TPixel>(
+            ImageFrame<TPixel> source,
+            RectangleF region,
+            GraphicsOptions options)
+            where TPixel : struct, IPixel<TPixel>;
     }
 }

src/ImageSharp.Drawing/Processing/IPen.cs

@@ -2,28 +2,21 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
-    /// Interface representing a Pen
+    /// Interface representing the pattern and size of the stroke to apply with a Pen.
     /// </summary>
-    /// <typeparam name="TPixel">The type of the color.</typeparam>
-    public interface IPen<TPixel> : IPen
-            where TPixel : struct, IPixel<TPixel>
+    public interface IPen
     {
         /// <summary>
         /// Gets the stroke fill.
         /// </summary>
-        IBrush<TPixel> StrokeFill { get; }
-    }
+        IBrush StrokeFill { get; }
 
-    /// <summary>
-    /// Interface representing the pattern and size of the stroke to apply with a Pen.
-    /// </summary>
-    public interface IPen
-    {
         /// <summary>
         /// Gets the width to apply to the stroke
         /// </summary>
@@ -34,4 +27,4 @@ namespace SixLabors.ImageSharp.Processing
         /// </summary>
         ReadOnlySpan<float> StrokePattern { get; }
     }
-}
+}

src/ImageSharp.Drawing/Processing/ImageBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/ImageBrush.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Buffers;
+
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
@@ -14,46 +15,50 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// Provides an implementation of an image brush for painting images within areas.
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
-    public class ImageBrush<TPixel> : IBrush<TPixel>
-    where TPixel : struct, IPixel<TPixel>
+    public class ImageBrush : IBrush
     {
         /// <summary>
         /// The image to paint.
         /// </summary>
-        private readonly ImageFrame<TPixel> image;
+        private readonly Image image;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBrush{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="ImageBrush"/> class.
         /// </summary>
         /// <param name="image">The image.</param>
-        public ImageBrush(ImageFrame<TPixel> image)
+        public ImageBrush(Image image)
         {
             this.image = image;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBrush{TPixel}"/> class.
-        /// </summary>
-        /// <param name="image">The image.</param>
-        public ImageBrush(Image<TPixel> image)
-            : this(image.Frames.RootFrame)
+        /// <inheritdoc />
+        public BrushApplicator<TPixel> CreateApplicator<TPixel>(
+            ImageFrame<TPixel> source,
+            RectangleF region,
+            GraphicsOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
-        }
+            if (this.image is Image<TPixel> specificImage)
+            {
+                return new ImageBrushApplicator<TPixel>(source, specificImage, region, options, false);
+            }
 
-        /// <inheritdoc />
-        public BrushApplicator<TPixel> CreateApplicator(ImageFrame<TPixel> source, RectangleF region, GraphicsOptions options)
-            => new ImageBrushApplicator(source, this.image, region, options);
+            specificImage = this.image.CloneAs<TPixel>();
+
+            return new ImageBrushApplicator<TPixel>(source, specificImage, region, options, true);
+        }
 
         /// <summary>
         /// The image brush applicator.
         /// </summary>
-        private class ImageBrushApplicator : BrushApplicator<TPixel>
+        private class ImageBrushApplicator<TPixel> : BrushApplicator<TPixel>
+            where TPixel : struct, IPixel<TPixel>
         {
-            /// <summary>
-            /// The source image.
-            /// </summary>
-            private readonly ImageFrame<TPixel> source;
+            private ImageFrame<TPixel> sourceFrame;
+
+            private Image<TPixel> sourceImage;
+
+            private readonly bool shouldDisposeImage;
 
             /// <summary>
             /// The y-length.
@@ -76,16 +81,24 @@ namespace SixLabors.ImageSharp.Processing
             private readonly int offsetX;
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="ImageBrushApplicator"/> class.
+            /// Initializes a new instance of the <see cref="ImageBrushApplicator{TPixel}"/> class.
             /// </summary>
             /// <param name="target">The target image.</param>
             /// <param name="image">The image.</param>
             /// <param name="region">The region.</param>
             /// <param name="options">The options</param>
-            public ImageBrushApplicator(ImageFrame<TPixel> target, ImageFrame<TPixel> image, RectangleF region, GraphicsOptions options)
+            /// <param name="shouldDisposeImage">Whether to dispose the image on disposal of the applicator.</param>
+            public ImageBrushApplicator(
+                ImageFrame<TPixel> target,
+                Image<TPixel> image,
+                RectangleF region,
+                GraphicsOptions options,
+                bool shouldDisposeImage)
                 : base(target, options)
             {
-                this.source = image;
+                this.sourceImage = image;
+                this.sourceFrame = image.Frames.RootFrame;
+                this.shouldDisposeImage = shouldDisposeImage;
                 this.xLength = image.Width;
                 this.yLength = image.Height;
                 this.offsetY = (int)MathF.Max(MathF.Floor(region.Top), 0);
@@ -106,14 +119,19 @@ namespace SixLabors.ImageSharp.Processing
                 {
                     int srcX = (x - this.offsetX) % this.xLength;
                     int srcY = (y - this.offsetY) % this.yLength;
-                    return this.source[srcX, srcY];
+                    return this.sourceFrame[srcX, srcY];
                 }
             }
 
             /// <inheritdoc />
             public override void Dispose()
             {
-                this.source.Dispose();
+                if (this.shouldDisposeImage)
+                {
+                    this.sourceImage?.Dispose();
+                    this.sourceImage = null;
+                    this.sourceFrame = null;
+                }
             }
 
             /// <inheritdoc />
@@ -128,7 +146,7 @@ namespace SixLabors.ImageSharp.Processing
 
                     int sourceY = (y - this.offsetY) % this.yLength;
                     int offsetX = x - this.offsetX;
-                    Span<TPixel> sourceRow = this.source.GetPixelRowSpan(sourceY);
+                    Span<TPixel> sourceRow = this.sourceFrame.GetPixelRowSpan(sourceY);
 
                     for (int i = 0; i < scanline.Length; i++)
                     {
@@ -141,7 +159,7 @@ namespace SixLabors.ImageSharp.Processing
 
                     Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
                     this.Blender.Blend(
-                        this.source.Configuration,
+                        this.sourceFrame.Configuration,
                         destinationRow,
                         destinationRow,
                         overlaySpan,

src/ImageSharp.Drawing/Processing/LinearGradientBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/LinearGradientBrush.cs

@@ -13,26 +13,24 @@ namespace SixLabors.ImageSharp.Processing
     /// Supported right now:
     /// - a set of colors in relative distances to each other.
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format</typeparam>
-    public sealed class LinearGradientBrush<TPixel> : GradientBrushBase<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public sealed class LinearGradientBrush : GradientBrush
     {
-        private readonly Point p1;
+        private readonly PointF p1;
 
-        private readonly Point p2;
+        private readonly PointF p2;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="LinearGradientBrush{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="LinearGradientBrush"/> class.
         /// </summary>
         /// <param name="p1">Start point</param>
         /// <param name="p2">End point</param>
         /// <param name="repetitionMode">defines how colors are repeated.</param>
         /// <param name="colorStops"><inheritdoc /></param>
         public LinearGradientBrush(
-            Point p1,
-            Point p2,
+            PointF p1,
+            PointF p2,
             GradientRepetitionMode repetitionMode,
-            params ColorStop<TPixel>[] colorStops)
+            params ColorStop[] colorStops)
             : base(repetitionMode, colorStops)
         {
             this.p1 = p1;
@@ -40,17 +38,27 @@ namespace SixLabors.ImageSharp.Processing
         }
 
         /// <inheritdoc />
-        public override BrushApplicator<TPixel> CreateApplicator(ImageFrame<TPixel> source, RectangleF region, GraphicsOptions options)
-            => new LinearGradientBrushApplicator(source, this.p1, this.p2, this.ColorStops, this.RepetitionMode, options);
+        public override BrushApplicator<TPixel> CreateApplicator<TPixel>(
+            ImageFrame<TPixel> source,
+            RectangleF region,
+            GraphicsOptions options) =>
+            new LinearGradientBrushApplicator<TPixel>(
+                source,
+                this.p1,
+                this.p2,
+                this.ColorStops,
+                this.RepetitionMode,
+                options);
 
         /// <summary>
         /// The linear gradient brush applicator.
         /// </summary>
-        private sealed class LinearGradientBrushApplicator : GradientBrushApplicatorBase
+        private sealed class LinearGradientBrushApplicator<TPixel> : GradientBrushApplicator<TPixel>
+            where TPixel : struct, IPixel<TPixel>
         {
-            private readonly Point start;
+            private readonly PointF start;
 
-            private readonly Point end;
+            private readonly PointF end;
 
             /// <summary>
             /// the vector along the gradient, x component
@@ -83,7 +91,7 @@ namespace SixLabors.ImageSharp.Processing
             private readonly float length;
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="LinearGradientBrushApplicator" /> class.
+            /// Initializes a new instance of the <see cref="LinearGradientBrushApplicator{TPixel}" /> class.
             /// </summary>
             /// <param name="source">The source</param>
             /// <param name="start">start point of the gradient</param>
@@ -93,9 +101,9 @@ namespace SixLabors.ImageSharp.Processing
             /// <param name="options">the graphics options</param>
             public LinearGradientBrushApplicator(
                 ImageFrame<TPixel> source,
-                Point start,
-                Point end,
-                ColorStop<TPixel>[] colorStops,
+                PointF start,
+                PointF end,
+                ColorStop[] colorStops,
                 GradientRepetitionMode repetitionMode,
                 GraphicsOptions options)
                 : base(source, options, colorStops, repetitionMode)
@@ -113,18 +121,18 @@ namespace SixLabors.ImageSharp.Processing
 
                 // some helpers:
                 this.alongsSquared = (this.alongX * this.alongX) + (this.alongY * this.alongY);
-                this.length = (float)Math.Sqrt(this.alongsSquared);
+                this.length = MathF.Sqrt(this.alongsSquared);
             }
 
-            protected override float PositionOnGradient(int x, int y)
+            protected override float PositionOnGradient(float x, float y)
             {
                 if (this.acrossX == 0)
                 {
-                    return (x - this.start.X) / (float)(this.end.X - this.start.X);
+                    return (x - this.start.X) / (this.end.X - this.start.X);
                 }
                 else if (this.acrossY == 0)
                 {
-                    return (y - this.start.Y) / (float)(this.end.Y - this.start.Y);
+                    return (y - this.start.Y) / (this.end.Y - this.start.Y);
                 }
                 else
                 {
@@ -137,9 +145,7 @@ namespace SixLabors.ImageSharp.Processing
                     float y4 = y + (k * this.alongX);
 
                     // get distance from (x4,y4) to start
-                    float distance = (float)Math.Sqrt(
-                        Math.Pow(x4 - this.start.X, 2)
-                        + Math.Pow(y4 - this.start.Y, 2));
+                    float distance = MathF.Sqrt(MathF.Pow(x4 - this.start.X, 2) + MathF.Pow(y4 - this.start.Y, 2));
 
                     // get and return ratio
                     float ratio = distance / this.length;

src/ImageSharp.Drawing/Processing/PatternBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/PatternBrush.cs

@@ -34,38 +34,36 @@ namespace SixLabors.ImageSharp.Processing
     ///  0
     /// </para>
     /// </remarks>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
-    public class PatternBrush<TPixel> : IBrush<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public class PatternBrush : IBrush
     {
         /// <summary>
         /// The pattern.
         /// </summary>
-        private readonly DenseMatrix<TPixel> pattern;
+        private readonly DenseMatrix<Color> pattern;
         private readonly DenseMatrix<Vector4> patternVector;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PatternBrush{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="PatternBrush"/> class.
         /// </summary>
         /// <param name="foreColor">Color of the fore.</param>
         /// <param name="backColor">Color of the back.</param>
         /// <param name="pattern">The pattern.</param>
-        public PatternBrush(TPixel foreColor, TPixel backColor, bool[,] pattern)
+        public PatternBrush(Color foreColor, Color backColor, bool[,] pattern)
             : this(foreColor, backColor, new DenseMatrix<bool>(pattern))
         {
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PatternBrush{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="PatternBrush"/> class.
         /// </summary>
         /// <param name="foreColor">Color of the fore.</param>
         /// <param name="backColor">Color of the back.</param>
         /// <param name="pattern">The pattern.</param>
-        internal PatternBrush(TPixel foreColor, TPixel backColor, DenseMatrix<bool> pattern)
+        internal PatternBrush(Color foreColor, Color backColor, in DenseMatrix<bool> pattern)
         {
             var foreColorVector = foreColor.ToVector4();
             var backColorVector = backColor.ToVector4();
-            this.pattern = new DenseMatrix<TPixel>(pattern.Columns, pattern.Rows);
+            this.pattern = new DenseMatrix<Color>(pattern.Columns, pattern.Rows);
             this.patternVector = new DenseMatrix<Vector4>(pattern.Columns, pattern.Rows);
             for (int i = 0; i < pattern.Data.Length; i++)
             {
@@ -83,25 +81,32 @@ namespace SixLabors.ImageSharp.Processing
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PatternBrush{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="PatternBrush"/> class.
         /// </summary>
         /// <param name="brush">The brush.</param>
-        internal PatternBrush(PatternBrush<TPixel> brush)
+        internal PatternBrush(PatternBrush brush)
         {
             this.pattern = brush.pattern;
             this.patternVector = brush.patternVector;
         }
 
         /// <inheritdoc />
-        public BrushApplicator<TPixel> CreateApplicator(ImageFrame<TPixel> source, RectangleF region, GraphicsOptions options)
-        {
-            return new PatternBrushApplicator(source, this.pattern, this.patternVector, options);
-        }
+        public BrushApplicator<TPixel> CreateApplicator<TPixel>(
+            ImageFrame<TPixel> source,
+            RectangleF region,
+            GraphicsOptions options)
+            where TPixel : struct, IPixel<TPixel> =>
+            new PatternBrushApplicator<TPixel>(
+                source,
+                this.pattern.ToPixelMatrix<TPixel>(source.Configuration),
+                this.patternVector,
+                options);
 
         /// <summary>
         /// The pattern brush applicator.
         /// </summary>
-        private class PatternBrushApplicator : BrushApplicator<TPixel>
+        private class PatternBrushApplicator<TPixel> : BrushApplicator<TPixel>
+            where TPixel : struct, IPixel<TPixel>
         {
             /// <summary>
             /// The pattern.
@@ -110,13 +115,13 @@ namespace SixLabors.ImageSharp.Processing
             private readonly DenseMatrix<Vector4> patternVector;
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="PatternBrushApplicator" /> class.
+            /// Initializes a new instance of the <see cref="PatternBrushApplicator{TPixel}" /> class.
             /// </summary>
             /// <param name="source">The source image.</param>
             /// <param name="pattern">The pattern.</param>
             /// <param name="patternVector">The patternVector.</param>
             /// <param name="options">The options</param>
-            public PatternBrushApplicator(ImageFrame<TPixel> source, DenseMatrix<TPixel> pattern, DenseMatrix<Vector4> patternVector, GraphicsOptions options)
+            public PatternBrushApplicator(ImageFrame<TPixel> source, in DenseMatrix<TPixel> pattern, DenseMatrix<Vector4> patternVector, GraphicsOptions options)
                 : base(source, options)
             {
                 this.pattern = pattern;

src/ImageSharp.Drawing/Processing/Pen{TPixel}.cs → src/ImageSharp.Drawing/Processing/Pen.cs

@@ -9,7 +9,6 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// Provides a pen that can apply a pattern to a line with a set brush and thickness
     /// </summary>
-    /// <typeparam name="TPixel">The type of the color.</typeparam>
     /// <remarks>
     /// The pattern will be in to the form of new float[]{ 1f, 2f, 0.5f} this will be
     /// converted into a pattern that is 3.5 times longer that the width with 3 sections
@@ -18,29 +17,28 @@ namespace SixLabors.ImageSharp.Processing
     /// section 3 will be width/2 long and will be filled
     /// the the pattern will immediately repeat without gap.
     /// </remarks>
-    public class Pen<TPixel> : IPen<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public class Pen : IPen
     {
         private readonly float[] pattern;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
         /// <param name="pattern">The pattern.</param>
-        public Pen(TPixel color, float width, float[] pattern)
-            : this(new SolidBrush<TPixel>(color), width, pattern)
+        public Pen(Color color, float width, float[] pattern)
+            : this(new SolidBrush(color), width, pattern)
         {
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen"/> class.
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
         /// <param name="pattern">The pattern.</param>
-        public Pen(IBrush<TPixel> brush, float width, float[] pattern)
+        public Pen(IBrush brush, float width, float[] pattern)
         {
             this.StrokeFill = brush;
             this.StrokeWidth = width;
@@ -48,27 +46,27 @@ namespace SixLabors.ImageSharp.Processing
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
-        public Pen(TPixel color, float width)
-            : this(new SolidBrush<TPixel>(color), width)
+        public Pen(Color color, float width)
+            : this(new SolidBrush(color), width)
         {
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen"/> class.
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
-        public Pen(IBrush<TPixel> brush, float width)
+        public Pen(IBrush brush, float width)
             : this(brush, width, Pens.EmptyPattern)
         {
         }
 
         /// <inheritdoc/>
-        public IBrush<TPixel> StrokeFill { get; }
+        public IBrush StrokeFill { get; }
 
         /// <inheritdoc/>
         public float StrokeWidth { get; }

src/ImageSharp.Drawing/Processing/Pens.cs

@@ -21,109 +21,79 @@ namespace SixLabors.ImageSharp.Processing
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <returns>The Pen</returns>
-        public static Pen<TPixel> Solid<TPixel>(TPixel color, float width)
-            where TPixel : struct, IPixel<TPixel>
-            => new Pen<TPixel>(color, width);
+        public static Pen Solid(Color color, float width) => new Pen(color, width);
 
         /// <summary>
         /// Create a solid pen with out any drawing patterns
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <returns>The Pen</returns>
-        public static Pen<TPixel> Solid<TPixel>(IBrush<TPixel> brush, float width)
-            where TPixel : struct, IPixel<TPixel>
-            => new Pen<TPixel>(brush, width);
+        public static Pen Solid(IBrush brush, float width) => new Pen(brush, width);
 
         /// <summary>
         /// Create a pen with a 'Dash' drawing patterns
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <returns>The Pen</returns>
-        public static Pen<TPixel> Dash<TPixel>(TPixel color, float width)
-            where TPixel : struct, IPixel<TPixel>
-            => new Pen<TPixel>(color, width, DashedPattern);
+        public static Pen Dash(Color color, float width) => new Pen(color, width, DashedPattern);
 
         /// <summary>
         /// Create a pen with a 'Dash' drawing patterns
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <returns>The Pen</returns>
-        public static Pen<TPixel> Dash<TPixel>(IBrush<TPixel> brush, float width)
-            where TPixel : struct, IPixel<TPixel>
-            => new Pen<TPixel>(brush, width, DashedPattern);
+        public static Pen Dash(IBrush brush, float width) => new Pen(brush, width, DashedPattern);
 
         /// <summary>
         /// Create a pen with a 'Dot' drawing patterns
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <returns>The Pen</returns>
-        public static Pen<TPixel> Dot<TPixel>(TPixel color, float width)
-            where TPixel : struct, IPixel<TPixel>
-            => new Pen<TPixel>(color, width, DottedPattern);
+        public static Pen Dot(Color color, float width) => new Pen(color, width, DottedPattern);
 
         /// <summary>
         /// Create a pen with a 'Dot' drawing patterns
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <returns>The Pen</returns>
-        public static Pen<TPixel> Dot<TPixel>(IBrush<TPixel> brush, float width)
-            where TPixel : struct, IPixel<TPixel>
-            => new Pen<TPixel>(brush, width, DottedPattern);
+        public static Pen Dot(IBrush brush, float width) => new Pen(brush, width, DottedPattern);
 
         /// <summary>
         /// Create a pen with a 'Dash Dot' drawing patterns
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <returns>The Pen</returns>
-        public static Pen<TPixel> DashDot<TPixel>(TPixel color, float width)
-            where TPixel : struct, IPixel<TPixel>
-            => new Pen<TPixel>(color, width, DashDotPattern);
+        public static Pen DashDot(Color color, float width) => new Pen(color, width, DashDotPattern);
 
         /// <summary>
         /// Create a pen with a 'Dash Dot' drawing patterns
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <returns>The Pen</returns>
-        public static Pen<TPixel> DashDot<TPixel>(IBrush<TPixel> brush, float width)
-            where TPixel : struct, IPixel<TPixel>
-            => new Pen<TPixel>(brush, width, DashDotPattern);
+        public static Pen DashDot(IBrush brush, float width) => new Pen(brush, width, DashDotPattern);
 
         /// <summary>
         /// Create a pen with a 'Dash Dot Dot' drawing patterns
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <returns>The Pen</returns>
-        public static Pen<TPixel> DashDotDot<TPixel>(TPixel color, float width)
-            where TPixel : struct, IPixel<TPixel>
-            => new Pen<TPixel>(color, width, DashDotDotPattern);
+        public static Pen DashDotDot(Color color, float width) => new Pen(color, width, DashDotDotPattern);
 
         /// <summary>
         /// Create a pen with a 'Dash Dot Dot' drawing patterns
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
-        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <returns>The Pen</returns>
-        public static Pen<TPixel> DashDotDot<TPixel>(IBrush<TPixel> brush, float width)
-            where TPixel : struct, IPixel<TPixel>
-            => new Pen<TPixel>(brush, width, DashDotDotPattern);
+        public static Pen DashDotDot(IBrush brush, float width) => new Pen(brush, width, DashDotDotPattern);
     }
 }

src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor.cs

@@ -1,12 +1,10 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
 using System.Buffers;
 using System.Threading.Tasks;
-using SixLabors.ImageSharp.Advanced;
+
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 using SixLabors.Primitives;
@@ -16,84 +14,86 @@ namespace SixLabors.ImageSharp.Processing.Processors.Drawing
     /// <summary>
     /// Combines two images together by blending the pixels.
     /// </summary>
-    /// <typeparam name="TPixelDst">The pixel format of destination image.</typeparam>
-    /// <typeparam name="TPixelSrc">The pixel format of source image.</typeparam>
-    internal class DrawImageProcessor<TPixelDst, TPixelSrc> : ImageProcessor<TPixelDst>
-        where TPixelDst : struct, IPixel<TPixelDst>
-        where TPixelSrc : struct, IPixel<TPixelSrc>
+    public class DrawImageProcessor : IImageProcessor
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="DrawImageProcessor{TPixelDst, TPixelSrc}"/> class.
+        /// Initializes a new instance of the <see cref="DrawImageProcessor"/> class.
         /// </summary>
-        /// <param name="image">The image to blend with the currently processing image.</param>
+        /// <param name="image">The image to blend.</param>
         /// <param name="location">The location to draw the blended image.</param>
         /// <param name="colorBlendingMode">The blending mode to use when drawing the image.</param>
         /// <param name="alphaCompositionMode">The Alpha blending mode to use when drawing the image.</param>
-        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
-        public DrawImageProcessor(Image<TPixelSrc> image, Point location, PixelColorBlendingMode colorBlendingMode, PixelAlphaCompositionMode alphaCompositionMode, float opacity)
+        /// <param name="opacity">The opacity of the image to blend.</param>
+        public DrawImageProcessor(
+            Image image,
+            Point location,
+            PixelColorBlendingMode colorBlendingMode,
+            PixelAlphaCompositionMode alphaCompositionMode,
+            float opacity)
         {
-            Guard.MustBeBetweenOrEqualTo(opacity, 0, 1, nameof(opacity));
-
             this.Image = image;
-            this.Opacity = opacity;
-            this.Blender = PixelOperations<TPixelDst>.Instance.GetPixelBlender(colorBlendingMode, alphaCompositionMode);
             this.Location = location;
+            this.ColorBlendingMode = colorBlendingMode;
+            this.AlphaCompositionMode = alphaCompositionMode;
+            this.Opacity = opacity;
         }
 
         /// <summary>
-        /// Gets the image to blend
+        /// Gets the image to blend.
         /// </summary>
-        public Image<TPixelSrc> Image { get; }
+        public Image Image { get; }
 
         /// <summary>
-        /// Gets the opacity of the image to blend
+        /// Gets the location to draw the blended image.
         /// </summary>
-        public float Opacity { get; }
+        public Point Location { get; }
 
         /// <summary>
-        /// Gets the pixel blender
+        /// Gets the blending mode to use when drawing the image.
         /// </summary>
-        public PixelBlender<TPixelDst> Blender { get; }
+        public PixelColorBlendingMode ColorBlendingMode { get; }
 
         /// <summary>
-        /// Gets the location to draw the blended image
+        /// Gets the Alpha blending mode to use when drawing the image.
         /// </summary>
-        public Point Location { get; }
+        public PixelAlphaCompositionMode AlphaCompositionMode { get; }
 
-        /// <inheritdoc/>
-        protected override void OnFrameApply(ImageFrame<TPixelDst> source, Rectangle sourceRectangle, Configuration configuration)
-        {
-            Image<TPixelSrc> targetImage = this.Image;
-            PixelBlender<TPixelDst> blender = this.Blender;
-            int locationY = this.Location.Y;
-
-            // Align start/end positions.
-            Rectangle bounds = targetImage.Bounds();
+        /// <summary>
+        /// Gets the opacity of the image to blend.
+        /// </summary>
+        public float Opacity { get; }
 
-            int minX = Math.Max(this.Location.X, sourceRectangle.X);
-            int maxX = Math.Min(this.Location.X + bounds.Width, sourceRectangle.Width);
-            int targetX = minX - this.Location.X;
+        /// <inheritdoc />
+        public IImageProcessor<TPixelBg> CreatePixelSpecificProcessor<TPixelBg>()
+            where TPixelBg : struct, IPixel<TPixelBg>
+        {
+            var visitor = new ProcessorFactoryVisitor<TPixelBg>(this);
+            this.Image.AcceptVisitor(visitor);
+            return visitor.Result;
+        }
 
-            int minY = Math.Max(this.Location.Y, sourceRectangle.Y);
-            int maxY = Math.Min(this.Location.Y + bounds.Height, sourceRectangle.Bottom);
+        private class ProcessorFactoryVisitor<TPixelBg> : IImageVisitor
+            where TPixelBg : struct, IPixel<TPixelBg>
+        {
+            private readonly DrawImageProcessor definition;
 
-            int width = maxX - minX;
+            public ProcessorFactoryVisitor(DrawImageProcessor definition)
+            {
+                this.definition = definition;
+            }
 
-            var workingRect = Rectangle.FromLTRB(minX, minY, maxX, maxY);
+            public IImageProcessor<TPixelBg> Result { get; private set; }
 
-            ParallelHelper.IterateRows(
-                workingRect,
-                configuration,
-                rows =>
-                    {
-                        for (int y = rows.Min; y < rows.Max; y++)
-                        {
-                            Span<TPixelDst> background = source.GetPixelRowSpan(y).Slice(minX, width);
-                            Span<TPixelSrc> foreground =
-                                targetImage.GetPixelRowSpan(y - locationY).Slice(targetX, width);
-                            blender.Blend<TPixelSrc>(configuration, background, background, foreground, this.Opacity);
-                        }
-                    });
+            public void Visit<TPixelFg>(Image<TPixelFg> image)
+                where TPixelFg : struct, IPixel<TPixelFg>
+            {
+                this.Result = new DrawImageProcessor<TPixelBg, TPixelFg>(
+                    image,
+                    this.definition.Location,
+                    this.definition.ColorBlendingMode,
+                    this.definition.AlphaCompositionMode,
+                    this.definition.Opacity);
+            }
         }
     }
 }

src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor{TPixelBg,TPixelFg}.cs

@@ -0,0 +1,111 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+
+using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.ParallelUtils;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Primitives;
+
+namespace SixLabors.ImageSharp.Processing.Processors.Drawing
+{
+    /// <summary>
+    /// Combines two images together by blending the pixels.
+    /// </summary>
+    /// <typeparam name="TPixelBg">The pixel format of destination image.</typeparam>
+    /// <typeparam name="TPixelFg">The pixel format of source image.</typeparam>
+    internal class DrawImageProcessor<TPixelBg, TPixelFg> : ImageProcessor<TPixelBg>
+        where TPixelBg : struct, IPixel<TPixelBg>
+        where TPixelFg : struct, IPixel<TPixelFg>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DrawImageProcessor{TPixelDst, TPixelSrc}"/> class.
+        /// </summary>
+        /// <param name="image">The image to blend with the currently processing image.</param>
+        /// <param name="location">The location to draw the blended image.</param>
+        /// <param name="colorBlendingMode">The blending mode to use when drawing the image.</param>
+        /// <param name="alphaCompositionMode">The Alpha blending mode to use when drawing the image.</param>
+        /// <param name="opacity">The opacity of the image to blend. Must be between 0 and 1.</param>
+        public DrawImageProcessor(
+            Image<TPixelFg> image,
+            Point location,
+            PixelColorBlendingMode colorBlendingMode,
+            PixelAlphaCompositionMode alphaCompositionMode,
+            float opacity)
+        {
+            Guard.MustBeBetweenOrEqualTo(opacity, 0, 1, nameof(opacity));
+
+            this.Image = image;
+            this.Opacity = opacity;
+            this.Blender = PixelOperations<TPixelBg>.Instance.GetPixelBlender(colorBlendingMode, alphaCompositionMode);
+            this.Location = location;
+        }
+
+        /// <summary>
+        /// Gets the image to blend
+        /// </summary>
+        public Image<TPixelFg> Image { get; }
+
+        /// <summary>
+        /// Gets the opacity of the image to blend
+        /// </summary>
+        public float Opacity { get; }
+
+        /// <summary>
+        /// Gets the pixel blender
+        /// </summary>
+        public PixelBlender<TPixelBg> Blender { get; }
+
+        /// <summary>
+        /// Gets the location to draw the blended image
+        /// </summary>
+        public Point Location { get; }
+
+        /// <inheritdoc/>
+        protected override void OnFrameApply(
+            ImageFrame<TPixelBg> source,
+            Rectangle sourceRectangle,
+            Configuration configuration)
+        {
+            Image<TPixelFg> targetImage = this.Image;
+            PixelBlender<TPixelBg> blender = this.Blender;
+            int locationY = this.Location.Y;
+
+            // Align start/end positions.
+            Rectangle bounds = targetImage.Bounds();
+
+            int minX = Math.Max(this.Location.X, sourceRectangle.X);
+            int maxX = Math.Min(this.Location.X + bounds.Width, sourceRectangle.Right);
+            int targetX = minX - this.Location.X;
+
+            int minY = Math.Max(this.Location.Y, sourceRectangle.Y);
+            int maxY = Math.Min(this.Location.Y + bounds.Height, sourceRectangle.Bottom);
+
+            int width = maxX - minX;
+
+            var workingRect = Rectangle.FromLTRB(minX, minY, maxX, maxY);
+
+            // not a valid operation because rectangle does not overlap with this image.
+            if (workingRect.Width <= 0 || workingRect.Height <= 0)
+            {
+                throw new ImageProcessingException(
+                    "Cannot draw image because the source image does not overlap the target image.");
+            }
+
+            ParallelHelper.IterateRows(
+                workingRect,
+                configuration,
+                rows =>
+                    {
+                        for (int y = rows.Min; y < rows.Max; y++)
+                        {
+                            Span<TPixelBg> background = source.GetPixelRowSpan(y).Slice(minX, width);
+                            Span<TPixelFg> foreground =
+                                targetImage.GetPixelRowSpan(y - locationY).Slice(targetX, width);
+                            blender.Blend<TPixelFg>(configuration, background, background, foreground, this.Opacity);
+                        }
+                    });
+        }
+    }
+}

src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor.cs

@@ -1,124 +1,45 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Buffers;
 using System.Threading.Tasks;
-using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
+
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
-using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Processing.Processors.Drawing
 {
     /// <summary>
-    /// Using the brush as a source of pixels colors blends the brush color with source.
+    /// Defines a processor to fill an <see cref="Image"/> with the given <see cref="IBrush"/>
+    /// using blending defined by the given <see cref="GraphicsOptions"/>.
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
-    internal class FillProcessor<TPixel> : ImageProcessor<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public class FillProcessor : IImageProcessor
     {
         /// <summary>
-        /// The brush.
+        /// Initializes a new instance of the <see cref="FillProcessor"/> class.
         /// </summary>
-        private readonly IBrush<TPixel> brush;
-        private readonly GraphicsOptions options;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FillProcessor{TPixel}"/> class.
-        /// </summary>
-        /// <param name="brush">The brush to source pixel colors from.</param>
-        /// <param name="options">The options</param>
-        public FillProcessor(IBrush<TPixel> brush, GraphicsOptions options)
+        /// <param name="brush">The brush to use for filling.</param>
+        /// <param name="options">The <see cref="GraphicsOptions"/> defining how to blend the brush pixels over the image pixels.</param>
+        public FillProcessor(IBrush brush, GraphicsOptions options)
         {
-            this.brush = brush;
-            this.options = options;
+            this.Brush = brush;
+            this.Options = options;
         }
 
-        /// <inheritdoc/>
-        protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
-        {
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-            int startY = sourceRectangle.Y;
-            int endY = sourceRectangle.Bottom;
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            int width = maxX - minX;
-
-            var workingRect = Rectangle.FromLTRB(minX, minY, maxX, maxY);
-
-            // If there's no reason for blending, then avoid it.
-            if (this.IsSolidBrushWithoutBlending(out SolidBrush<TPixel> solidBrush))
-            {
-                ParallelExecutionSettings parallelSettings = configuration.GetParallelSettings().MultiplyMinimumPixelsPerTask(4);
-
-                ParallelHelper.IterateRows(
-                    workingRect,
-                    parallelSettings,
-                    rows =>
-                        {
-                            for (int y = rows.Min; y < rows.Max; y++)
-                            {
-                                source.GetPixelRowSpan(y).Slice(minX, width).Fill(solidBrush.Color);
-                            }
-                        });
-            }
-            else
-            {
-                // Reset offset if necessary.
-                if (minX > 0)
-                {
-                    startX = 0;
-                }
-
-                if (minY > 0)
-                {
-                    startY = 0;
-                }
-
-                using (IMemoryOwner<float> amount = source.MemoryAllocator.Allocate<float>(width))
-                using (BrushApplicator<TPixel> applicator = this.brush.CreateApplicator(
-                    source,
-                    sourceRectangle,
-                    this.options))
-                {
-                    amount.GetSpan().Fill(1f);
-
-                    ParallelHelper.IterateRows(
-                        workingRect,
-                        configuration,
-                        rows =>
-                            {
-                                for (int y = rows.Min; y < rows.Max; y++)
-                                {
-                                    int offsetY = y - startY;
-                                    int offsetX = minX - startX;
+        /// <summary>
+        /// Gets the <see cref="IBrush"/> used for filling the destination image.
+        /// </summary>
+        public IBrush Brush { get; }
 
-                                    applicator.Apply(amount.GetSpan(), offsetX, offsetY);
-                                }
-                            });
-                }
-            }
-        }
+        /// <summary>
+        /// Gets the <see cref="GraphicsOptions"/> defining how to blend the brush pixels over the image pixels.
+        /// </summary>
+        public GraphicsOptions Options { get; }
 
-        private bool IsSolidBrushWithoutBlending(out SolidBrush<TPixel> solidBrush)
+        /// <inheritdoc />
+        public IImageProcessor<TPixel> CreatePixelSpecificProcessor<TPixel>()
+            where TPixel : struct, IPixel<TPixel>
         {
-            solidBrush = this.brush as SolidBrush<TPixel>;
-
-            if (solidBrush == null)
-            {
-                return false;
-            }
-
-            return this.options.IsOpaqueColorWithoutBlending(solidBrush.Color);
+            return new FillProcessor<TPixel>(this);
         }
     }
 }

src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor{TPixel}.cs

@@ -0,0 +1,118 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Buffers;
+
+using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Memory;
+using SixLabors.ImageSharp.ParallelUtils;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Primitives;
+
+namespace SixLabors.ImageSharp.Processing.Processors.Drawing
+{
+    /// <summary>
+    /// Using the brush as a source of pixels colors blends the brush color with source.
+    /// </summary>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class FillProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
+    {
+        private readonly FillProcessor definition;
+
+        public FillProcessor(FillProcessor definition)
+        {
+            this.definition = definition;
+        }
+
+        /// <inheritdoc/>
+        protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
+        {
+            int startX = sourceRectangle.X;
+            int endX = sourceRectangle.Right;
+            int startY = sourceRectangle.Y;
+            int endY = sourceRectangle.Bottom;
+
+            // Align start/end positions.
+            int minX = Math.Max(0, startX);
+            int maxX = Math.Min(source.Width, endX);
+            int minY = Math.Max(0, startY);
+            int maxY = Math.Min(source.Height, endY);
+
+            int width = maxX - minX;
+
+            var workingRect = Rectangle.FromLTRB(minX, minY, maxX, maxY);
+
+            IBrush brush = this.definition.Brush;
+            GraphicsOptions options = this.definition.Options;
+
+            // If there's no reason for blending, then avoid it.
+            if (this.IsSolidBrushWithoutBlending(out SolidBrush solidBrush))
+            {
+                ParallelExecutionSettings parallelSettings = configuration.GetParallelSettings().MultiplyMinimumPixelsPerTask(4);
+
+                TPixel colorPixel = solidBrush.Color.ToPixel<TPixel>();
+
+                ParallelHelper.IterateRows(
+                    workingRect,
+                    parallelSettings,
+                    rows =>
+                        {
+                            for (int y = rows.Min; y < rows.Max; y++)
+                            {
+                                source.GetPixelRowSpan(y).Slice(minX, width).Fill(colorPixel);
+                            }
+                        });
+            }
+            else
+            {
+                // Reset offset if necessary.
+                if (minX > 0)
+                {
+                    startX = 0;
+                }
+
+                if (minY > 0)
+                {
+                    startY = 0;
+                }
+
+                using (IMemoryOwner<float> amount = source.MemoryAllocator.Allocate<float>(width))
+                using (BrushApplicator<TPixel> applicator = brush.CreateApplicator(
+                    source,
+                    sourceRectangle,
+                    options))
+                {
+                    amount.GetSpan().Fill(1f);
+
+                    ParallelHelper.IterateRows(
+                        workingRect,
+                        configuration,
+                        rows =>
+                            {
+                                for (int y = rows.Min; y < rows.Max; y++)
+                                {
+                                    int offsetY = y - startY;
+                                    int offsetX = minX - startX;
+
+                                    applicator.Apply(amount.GetSpan(), offsetX, offsetY);
+                                }
+                            });
+                }
+            }
+        }
+
+        private bool IsSolidBrushWithoutBlending(out SolidBrush solidBrush)
+        {
+            solidBrush = this.definition.Brush as SolidBrush;
+
+            if (solidBrush == null)
+            {
+                return false;
+            }
+
+            return this.definition.Options.IsOpaqueColorWithoutBlending(solidBrush.Color);
+        }
+    }
+}

src/ImageSharp.Drawing/Processing/Processors/Drawing/FillRegionProcessor.cs

@@ -1,36 +1,25 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Buffers;
-using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Utils;
 using SixLabors.Memory;
-using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Processing.Processors.Drawing
 {
     /// <summary>
-    /// Using a brush and a shape fills shape with contents of brush the
+    /// Defines a processor to fill <see cref="Image"/> pixels withing a given <see cref="Region"/>
+    /// with the given <see cref="IBrush"/> and blending defined by the given <see cref="GraphicsOptions"/>.
     /// </summary>
-    /// <typeparam name="TPixel">The type of the color.</typeparam>
-    /// <seealso cref="ImageProcessor{TPixel}" />
-    internal class FillRegionProcessor<TPixel> : ImageProcessor<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public class FillRegionProcessor : IImageProcessor
     {
-        private const float AntialiasFactor = 1f;
-        private const int DrawPadding = 1;
-
         /// <summary>
-        /// Initializes a new instance of the <see cref="FillRegionProcessor{TPixel}" /> class.
+        /// Initializes a new instance of the <see cref="FillRegionProcessor" /> class.
         /// </summary>
         /// <param name="brush">The details how to fill the region of interest.</param>
         /// <param name="region">The region of interest to be filled.</param>
         /// <param name="options">The configuration options.</param>
-        public FillRegionProcessor(IBrush<TPixel> brush, Region region, GraphicsOptions options)
+        public FillRegionProcessor(IBrush brush, Region region, GraphicsOptions options)
         {
             this.Region = region;
             this.Brush = brush;
@@ -38,9 +27,9 @@ namespace SixLabors.ImageSharp.Processing.Processors.Drawing
         }
 
         /// <summary>
-        /// Gets the brush.
+        /// Gets the <see cref="IBrush"/> used for filling the destination image.
         /// </summary>
-        public IBrush<TPixel> Brush { get; }
+        public IBrush Brush { get; }
 
         /// <summary>
         /// Gets the region that this processor applies to.
@@ -48,172 +37,15 @@ namespace SixLabors.ImageSharp.Processing.Processors.Drawing
         public Region Region { get; }
 
         /// <summary>
-        /// Gets the options.
+        /// Gets the <see cref="GraphicsOptions"/> defining how to blend the brush pixels over the image pixels.
         /// </summary>
-        /// <value>
-        /// The options.
-        /// </value>
         public GraphicsOptions Options { get; }
 
-        /// <inheritdoc/>
-        protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
-        {
-            Region region = this.Region;
-            Rectangle rect = region.Bounds;
-
-            // Align start/end positions.
-            int minX = Math.Max(0, rect.Left);
-            int maxX = Math.Min(source.Width, rect.Right);
-            int minY = Math.Max(0, rect.Top);
-            int maxY = Math.Min(source.Height, rect.Bottom);
-            if (minX >= maxX)
-            {
-                return; // no effect inside image;
-            }
-
-            if (minY >= maxY)
-            {
-                return; // no effect inside image;
-            }
-
-            int maxIntersections = region.MaxIntersections;
-            float subpixelCount = 4;
-
-            // we need to offset the pixel grid to account for when we outline a path.
-            // basically if the line is [1,2] => [3,2] then when outlining at 1 we end up with a region of [0.5,1.5],[1.5, 1.5],[3.5,2.5],[2.5,2.5]
-            // and this can cause missed fills when not using antialiasing.so we offset the pixel grid by 0.5 in the x & y direction thus causing the#
-            // region to align with the pixel grid.
-            float offset = 0.5f;
-            if (this.Options.Antialias)
-            {
-                offset = 0f; // we are antialiasing skip offsetting as real antialiasing should take care of offset.
-                subpixelCount = this.Options.AntialiasSubpixelDepth;
-                if (subpixelCount < 4)
-                {
-                    subpixelCount = 4;
-                }
-            }
-
-            using (BrushApplicator<TPixel> applicator = this.Brush.CreateApplicator(source, rect, this.Options))
-            {
-                int scanlineWidth = maxX - minX;
-                using (IMemoryOwner<float> bBuffer = source.MemoryAllocator.Allocate<float>(maxIntersections))
-                using (IMemoryOwner<float> bScanline = source.MemoryAllocator.Allocate<float>(scanlineWidth))
-                {
-                    bool scanlineDirty = true;
-                    float subpixelFraction = 1f / subpixelCount;
-                    float subpixelFractionPoint = subpixelFraction / subpixelCount;
-
-                    Span<float> buffer = bBuffer.GetSpan();
-                    Span<float> scanline = bScanline.GetSpan();
-
-                    bool isSolidBrushWithoutBlending = this.IsSolidBrushWithoutBlending(out SolidBrush<TPixel> solidBrush);
-
-                    for (int y = minY; y < maxY; y++)
-                    {
-                        if (scanlineDirty)
-                        {
-                            scanline.Clear();
-                            scanlineDirty = false;
-                        }
-
-                        float yPlusOne = y + 1;
-                        for (float subPixel = (float)y; subPixel < yPlusOne; subPixel += subpixelFraction)
-                        {
-                            int pointsFound = region.Scan(subPixel + offset, buffer, configuration);
-                            if (pointsFound == 0)
-                            {
-                                // nothing on this line, skip
-                                continue;
-                            }
-
-                            QuickSort.Sort(buffer.Slice(0, pointsFound));
-
-                            for (int point = 0; point < pointsFound; point += 2)
-                            {
-                                // points will be paired up
-                                float scanStart = buffer[point] - minX;
-                                float scanEnd = buffer[point + 1] - minX;
-                                int startX = (int)MathF.Floor(scanStart + offset);
-                                int endX = (int)MathF.Floor(scanEnd + offset);
-
-                                if (startX >= 0 && startX < scanline.Length)
-                                {
-                                    for (float x = scanStart; x < startX + 1; x += subpixelFraction)
-                                    {
-                                        scanline[startX] += subpixelFractionPoint;
-                                        scanlineDirty = true;
-                                    }
-                                }
-
-                                if (endX >= 0 && endX < scanline.Length)
-                                {
-                                    for (float x = endX; x < scanEnd; x += subpixelFraction)
-                                    {
-                                        scanline[endX] += subpixelFractionPoint;
-                                        scanlineDirty = true;
-                                    }
-                                }
-
-                                int nextX = startX + 1;
-                                endX = Math.Min(endX, scanline.Length); // reduce to end to the right edge
-                                nextX = Math.Max(nextX, 0);
-                                for (int x = nextX; x < endX; x++)
-                                {
-                                    scanline[x] += subpixelFraction;
-                                    scanlineDirty = true;
-                                }
-                            }
-                        }
-
-                        if (scanlineDirty)
-                        {
-                            if (!this.Options.Antialias)
-                            {
-                                bool hasOnes = false;
-                                bool hasZeros = false;
-                                for (int x = 0; x < scanlineWidth; x++)
-                                {
-                                    if (scanline[x] >= 0.5)
-                                    {
-                                        scanline[x] = 1;
-                                        hasOnes = true;
-                                    }
-                                    else
-                                    {
-                                        scanline[x] = 0;
-                                        hasZeros = true;
-                                    }
-                                }
-
-                                if (isSolidBrushWithoutBlending && hasOnes != hasZeros)
-                                {
-                                    if (hasOnes)
-                                    {
-                                        source.GetPixelRowSpan(y).Slice(minX, scanlineWidth).Fill(solidBrush.Color);
-                                    }
-
-                                    continue;
-                                }
-                            }
-
-                            applicator.Apply(scanline, minX, y);
-                        }
-                    }
-                }
-            }
-        }
-
-        private bool IsSolidBrushWithoutBlending(out SolidBrush<TPixel> solidBrush)
+        /// <inheritdoc />
+        public IImageProcessor<TPixel> CreatePixelSpecificProcessor<TPixel>()
+            where TPixel : struct, IPixel<TPixel>
         {
-            solidBrush = this.Brush as SolidBrush<TPixel>;
-
-            if (solidBrush == null)
-            {
-                return false;
-            }
-
-            return this.Options.IsOpaqueColorWithoutBlending(solidBrush.Color);
+            return new FillRegionProcessor<TPixel>(this);
         }
     }
 }

src/ImageSharp.Drawing/Processing/Processors/Drawing/FillRegionProcessor{TPixel}.cs

@@ -0,0 +1,195 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Buffers;
+
+using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Memory;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Primitives;
+using SixLabors.ImageSharp.Utils;
+using SixLabors.Primitives;
+
+namespace SixLabors.ImageSharp.Processing.Processors.Drawing
+{
+    /// <summary>
+    /// Using a brush and a shape fills shape with contents of brush the
+    /// </summary>
+    /// <typeparam name="TPixel">The type of the color.</typeparam>
+    /// <seealso cref="ImageProcessor{TPixel}" />
+    internal class FillRegionProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
+    {
+        private readonly FillRegionProcessor definition;
+
+        public FillRegionProcessor(FillRegionProcessor definition)
+        {
+            this.definition = definition;
+        }
+
+        /// <inheritdoc/>
+        protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
+        {
+            GraphicsOptions options = this.definition.Options;
+            IBrush brush = this.definition.Brush;
+            Region region = this.definition.Region;
+            Rectangle rect = region.Bounds;
+
+            // Align start/end positions.
+            int minX = Math.Max(0, rect.Left);
+            int maxX = Math.Min(source.Width, rect.Right);
+            int minY = Math.Max(0, rect.Top);
+            int maxY = Math.Min(source.Height, rect.Bottom);
+            if (minX >= maxX)
+            {
+                return; // no effect inside image;
+            }
+
+            if (minY >= maxY)
+            {
+                return; // no effect inside image;
+            }
+
+            int maxIntersections = region.MaxIntersections;
+            float subpixelCount = 4;
+
+            // we need to offset the pixel grid to account for when we outline a path.
+            // basically if the line is [1,2] => [3,2] then when outlining at 1 we end up with a region of [0.5,1.5],[1.5, 1.5],[3.5,2.5],[2.5,2.5]
+            // and this can cause missed fills when not using antialiasing.so we offset the pixel grid by 0.5 in the x & y direction thus causing the#
+            // region to align with the pixel grid.
+            float offset = 0.5f;
+            if (options.Antialias)
+            {
+                offset = 0f; // we are antialiasing skip offsetting as real antialiasing should take care of offset.
+                subpixelCount = options.AntialiasSubpixelDepth;
+                if (subpixelCount < 4)
+                {
+                    subpixelCount = 4;
+                }
+            }
+
+            using (BrushApplicator<TPixel> applicator = brush.CreateApplicator(source, rect, options))
+            {
+                int scanlineWidth = maxX - minX;
+                using (IMemoryOwner<float> bBuffer = source.MemoryAllocator.Allocate<float>(maxIntersections))
+                using (IMemoryOwner<float> bScanline = source.MemoryAllocator.Allocate<float>(scanlineWidth))
+                {
+                    bool scanlineDirty = true;
+                    float subpixelFraction = 1f / subpixelCount;
+                    float subpixelFractionPoint = subpixelFraction / subpixelCount;
+
+                    Span<float> buffer = bBuffer.GetSpan();
+                    Span<float> scanline = bScanline.GetSpan();
+
+                    bool isSolidBrushWithoutBlending = this.IsSolidBrushWithoutBlending(out SolidBrush solidBrush);
+                    TPixel solidBrushColor = isSolidBrushWithoutBlending ? solidBrush.Color.ToPixel<TPixel>() : default;
+
+                    for (int y = minY; y < maxY; y++)
+                    {
+                        if (scanlineDirty)
+                        {
+                            scanline.Clear();
+                            scanlineDirty = false;
+                        }
+
+                        float yPlusOne = y + 1;
+                        for (float subPixel = (float)y; subPixel < yPlusOne; subPixel += subpixelFraction)
+                        {
+                            int pointsFound = region.Scan(subPixel + offset, buffer, configuration);
+                            if (pointsFound == 0)
+                            {
+                                // nothing on this line, skip
+                                continue;
+                            }
+
+                            QuickSort.Sort(buffer.Slice(0, pointsFound));
+
+                            for (int point = 0; point < pointsFound; point += 2)
+                            {
+                                // points will be paired up
+                                float scanStart = buffer[point] - minX;
+                                float scanEnd = buffer[point + 1] - minX;
+                                int startX = (int)MathF.Floor(scanStart + offset);
+                                int endX = (int)MathF.Floor(scanEnd + offset);
+
+                                if (startX >= 0 && startX < scanline.Length)
+                                {
+                                    for (float x = scanStart; x < startX + 1; x += subpixelFraction)
+                                    {
+                                        scanline[startX] += subpixelFractionPoint;
+                                        scanlineDirty = true;
+                                    }
+                                }
+
+                                if (endX >= 0 && endX < scanline.Length)
+                                {
+                                    for (float x = endX; x < scanEnd; x += subpixelFraction)
+                                    {
+                                        scanline[endX] += subpixelFractionPoint;
+                                        scanlineDirty = true;
+                                    }
+                                }
+
+                                int nextX = startX + 1;
+                                endX = Math.Min(endX, scanline.Length); // reduce to end to the right edge
+                                nextX = Math.Max(nextX, 0);
+                                for (int x = nextX; x < endX; x++)
+                                {
+                                    scanline[x] += subpixelFraction;
+                                    scanlineDirty = true;
+                                }
+                            }
+                        }
+
+                        if (scanlineDirty)
+                        {
+                            if (!options.Antialias)
+                            {
+                                bool hasOnes = false;
+                                bool hasZeros = false;
+                                for (int x = 0; x < scanlineWidth; x++)
+                                {
+                                    if (scanline[x] >= 0.5)
+                                    {
+                                        scanline[x] = 1;
+                                        hasOnes = true;
+                                    }
+                                    else
+                                    {
+                                        scanline[x] = 0;
+                                        hasZeros = true;
+                                    }
+                                }
+
+                                if (isSolidBrushWithoutBlending && hasOnes != hasZeros)
+                                {
+                                    if (hasOnes)
+                                    {
+                                        source.GetPixelRowSpan(y).Slice(minX, scanlineWidth).Fill(solidBrushColor);
+                                    }
+
+                                    continue;
+                                }
+                            }
+
+                            applicator.Apply(scanline, minX, y);
+                        }
+                    }
+                }
+            }
+        }
+
+        private bool IsSolidBrushWithoutBlending(out SolidBrush solidBrush)
+        {
+            solidBrush = this.definition.Brush as SolidBrush;
+
+            if (solidBrush == null)
+            {
+                return false;
+            }
+
+            return this.definition.Options.IsOpaqueColorWithoutBlending(solidBrush.Color);
+        }
+    }
+}

src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor.cs

@@ -2,30 +2,20 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Buffers;
-using System.Collections.Generic;
+
 using SixLabors.Fonts;
-using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Utils;
-using SixLabors.Memory;
 using SixLabors.Primitives;
-using SixLabors.Shapes;
 
 namespace SixLabors.ImageSharp.Processing.Processors.Text
 {
     /// <summary>
-    /// Using the brush as a source of pixels colors blends the brush color with source.
+    /// Defines a processor to draw text on an <see cref="Image"/>.
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
-    internal class DrawTextProcessor<TPixel> : ImageProcessor<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public class DrawTextProcessor : IImageProcessor
     {
-        private CachingGlyphRenderer textRenderer;
-
         /// <summary>
-        /// Initializes a new instance of the <see cref="DrawTextProcessor{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="DrawTextProcessor"/> class.
         /// </summary>
         /// <param name="options">The options</param>
         /// <param name="text">The text we want to render</param>
@@ -33,7 +23,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Text
         /// <param name="brush">The brush to source pixel colors from.</param>
         /// <param name="pen">The pen to outline text with.</param>
         /// <param name="location">The location on the image to start drawing the text from.</param>
-        public DrawTextProcessor(TextGraphicsOptions options, string text, Font font, IBrush<TPixel> brush, IPen<TPixel> pen, PointF location)
+        public DrawTextProcessor(TextGraphicsOptions options, string text, Font font, IBrush brush, IPen pen, PointF location)
         {
             Guard.NotNull(text, nameof(text));
             Guard.NotNull(font, nameof(font));
@@ -52,24 +42,24 @@ namespace SixLabors.ImageSharp.Processing.Processors.Text
         }
 
         /// <summary>
-        /// Gets the brush.
+        /// Gets the brush used to fill the glyphs.
         /// </summary>
-        public IBrush<TPixel> Brush { get; }
+        public IBrush Brush { get; }
 
         /// <summary>
-        /// Gets the options
+        /// Gets the <see cref="TextGraphicsOptions"/> defining blending modes and text-specific drawing settings.
         /// </summary>
         public TextGraphicsOptions Options { get; }
 
         /// <summary>
-        /// Gets  the text
+        /// Gets the text to draw.
         /// </summary>
         public string Text { get; }
 
         /// <summary>
         /// Gets the pen used for outlining the text, if Null then we will not outline
         /// </summary>
-        public IPen<TPixel> Pen { get; }
+        public IPen Pen { get; }
 
         /// <summary>
         /// Gets the font used to render the text.
@@ -81,403 +71,11 @@ namespace SixLabors.ImageSharp.Processing.Processors.Text
         /// </summary>
         public PointF Location { get; }
 
-        protected override void BeforeImageApply(Image<TPixel> source, Rectangle sourceRectangle)
-        {
-            base.BeforeImageApply(source, sourceRectangle);
-
-            // do everything at the image level as we are delegating the processing down to other processors
-            var style = new RendererOptions(this.Font, this.Options.DpiX, this.Options.DpiY, this.Location)
-            {
-                ApplyKerning = this.Options.ApplyKerning,
-                TabWidth = this.Options.TabWidth,
-                WrappingWidth = this.Options.WrapTextWidth,
-                HorizontalAlignment = this.Options.HorizontalAlignment,
-                VerticalAlignment = this.Options.VerticalAlignment
-            };
-
-            this.textRenderer = new CachingGlyphRenderer(source.GetMemoryAllocator(), this.Text.Length, this.Pen, this.Brush != null);
-            this.textRenderer.Options = (GraphicsOptions)this.Options;
-            var renderer = new TextRenderer(this.textRenderer);
-            renderer.RenderText(this.Text, style);
-        }
-
-        protected override void AfterImageApply(Image<TPixel> source, Rectangle sourceRectangle)
-        {
-            base.AfterImageApply(source, sourceRectangle);
-            this.textRenderer?.Dispose();
-            this.textRenderer = null;
-        }
-
-        /// <inheritdoc/>
-        protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
+        /// <inheritdoc />
+        public IImageProcessor<TPixel> CreatePixelSpecificProcessor<TPixel>()
+            where TPixel : struct, IPixel<TPixel>
         {
-            // this is a no-op as we have processes all as an image, we should be able to pass out of before email apply a skip frames outcome
-            Draw(this.textRenderer.FillOperations, this.Brush);
-            Draw(this.textRenderer.OutlineOperations, this.Pen?.StrokeFill);
-
-            void Draw(List<DrawingOperation> operations, IBrush<TPixel> brush)
-            {
-                if (operations?.Count > 0)
-                {
-                    using (BrushApplicator<TPixel> app = brush.CreateApplicator(source, sourceRectangle, this.textRenderer.Options))
-                    {
-                        foreach (DrawingOperation operation in operations)
-                        {
-                            Buffer2D<float> buffer = operation.Map;
-                            int startY = operation.Location.Y;
-                            int startX = operation.Location.X;
-                            int offSetSpan = 0;
-                            if (startX < 0)
-                            {
-                                offSetSpan = -startX;
-                                startX = 0;
-                            }
-
-                            int fistRow = 0;
-                            if (startY < 0)
-                            {
-                                fistRow = -startY;
-                            }
-
-                            int maxHeight = source.Height - startY;
-                            int end = Math.Min(operation.Map.Height, maxHeight);
-
-                            for (int row = fistRow; row < end; row++)
-                            {
-                                int y = startY + row;
-                                Span<float> span = buffer.GetRowSpan(row).Slice(offSetSpan);
-                                app.Apply(span, startX, y);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private struct DrawingOperation
-        {
-            public Buffer2D<float> Map { get; set; }
-
-            public Point Location { get; set; }
-        }
-
-        private class CachingGlyphRenderer : IGlyphRenderer, IDisposable
-        {
-            // just enough accuracy to allow for 1/8 pixel differences which
-            // later are accumulated while rendering, but do not grow into full pixel offsets
-            // The value 8 is benchmarked to:
-            // - Provide a good accuracy (smaller than 0.2% image difference compared to the non-caching variant)
-            // - Cache hit ratio above 60%
-            private const float AccuracyMultiple = 8;
-
-            private readonly PathBuilder builder;
-
-            private Point currentRenderPosition = default;
-            private (GlyphRendererParameters glyph, PointF subPixelOffset) currentGlyphRenderParams = default;
-            private readonly int offset = 0;
-            private PointF currentPoint = default(PointF);
-
-            private readonly Dictionary<(GlyphRendererParameters glyph, PointF subPixelOffset), GlyphRenderData>
-                glyphData = new Dictionary<(GlyphRendererParameters glyph, PointF subPixelOffset), GlyphRenderData>();
-
-            private readonly bool renderOutline = false;
-            private readonly bool renderFill = false;
-            private bool rasterizationRequired = false;
-
-            public CachingGlyphRenderer(MemoryAllocator memoryAllocator, int size, IPen pen, bool renderFill)
-            {
-                this.MemoryAllocator = memoryAllocator;
-                this.Pen = pen;
-                this.renderFill = renderFill;
-                this.renderOutline = pen != null;
-                this.offset = 2;
-                if (this.renderFill)
-                {
-                    this.FillOperations = new List<DrawingOperation>(size);
-                }
-
-                if (this.renderOutline)
-                {
-                    this.offset = (int)MathF.Ceiling((pen.StrokeWidth * 2) + 2);
-                    this.OutlineOperations = new List<DrawingOperation>(size);
-                }
-
-                this.builder = new PathBuilder();
-            }
-
-            public List<DrawingOperation> FillOperations { get; }
-
-            public List<DrawingOperation> OutlineOperations { get; }
-
-            public MemoryAllocator MemoryAllocator { get; internal set; }
-
-            public IPen Pen { get; internal set; }
-
-            public GraphicsOptions Options { get; internal set; }
-
-            public void BeginFigure()
-            {
-                this.builder.StartFigure();
-            }
-
-            public bool BeginGlyph(RectangleF bounds, GlyphRendererParameters parameters)
-            {
-                this.currentRenderPosition = Point.Truncate(bounds.Location);
-                PointF subPixelOffset = bounds.Location - this.currentRenderPosition;
-
-                subPixelOffset.X = MathF.Round(subPixelOffset.X * AccuracyMultiple) / AccuracyMultiple;
-                subPixelOffset.Y = MathF.Round(subPixelOffset.Y * AccuracyMultiple) / AccuracyMultiple;
-
-                // we have offset our rendering origion a little bit down to prevent edge cropping, move the draw origin up to compensate
-                this.currentRenderPosition = new Point(this.currentRenderPosition.X - this.offset, this.currentRenderPosition.Y - this.offset);
-                this.currentGlyphRenderParams = (parameters, subPixelOffset);
-
-                if (this.glyphData.ContainsKey(this.currentGlyphRenderParams))
-                {
-                    // we have already drawn the glyph vectors skip trying again
-                    this.rasterizationRequired = false;
-                    return false;
-                }
-
-                // we check to see if we have a render cache and if we do then we render else
-                this.builder.Clear();
-
-                // ensure all glyphs render around [zero, zero]  so offset negative root positions so when we draw the glyph we can offet it back
-                this.builder.SetOrigin(new PointF(-(int)bounds.X + this.offset, -(int)bounds.Y + this.offset));
-
-                this.rasterizationRequired = true;
-                return true;
-            }
-
-            public void BeginText(RectangleF bounds)
-            {
-                // not concerned about this one
-                this.OutlineOperations?.Clear();
-                this.FillOperations?.Clear();
-            }
-
-            public void CubicBezierTo(PointF secondControlPoint, PointF thirdControlPoint, PointF point)
-            {
-                this.builder.AddBezier(this.currentPoint, secondControlPoint, thirdControlPoint, point);
-                this.currentPoint = point;
-            }
-
-            public void Dispose()
-            {
-                foreach (KeyValuePair<(GlyphRendererParameters glyph, PointF subPixelOffset), GlyphRenderData> kv in this.glyphData)
-                {
-                    kv.Value.Dispose();
-                }
-
-                this.glyphData.Clear();
-            }
-
-            public void EndFigure()
-            {
-                this.builder.CloseFigure();
-            }
-
-            public void EndGlyph()
-            {
-                GlyphRenderData renderData = default;
-
-                // has the glyoh been rendedered already????
-                if (this.rasterizationRequired)
-                {
-                    IPath path = this.builder.Build();
-
-                    if (this.renderFill)
-                    {
-                        renderData.FillMap = this.Render(path);
-                    }
-
-                    if (this.renderOutline)
-                    {
-                        if (this.Pen.StrokePattern.Length == 0)
-                        {
-                            path = path.GenerateOutline(this.Pen.StrokeWidth);
-                        }
-                        else
-                        {
-                            path = path.GenerateOutline(this.Pen.StrokeWidth, this.Pen.StrokePattern);
-                        }
-
-                        renderData.OutlineMap = this.Render(path);
-                    }
-
-                    this.glyphData[this.currentGlyphRenderParams] = renderData;
-                }
-                else
-                {
-                    renderData = this.glyphData[this.currentGlyphRenderParams];
-                }
-
-                if (this.renderFill)
-                {
-                    this.FillOperations.Add(new DrawingOperation
-                    {
-                        Location = this.currentRenderPosition,
-                        Map = renderData.FillMap
-                    });
-                }
-
-                if (this.renderOutline)
-                {
-                    this.OutlineOperations.Add(new DrawingOperation
-                    {
-                        Location = this.currentRenderPosition,
-                        Map = renderData.OutlineMap
-                    });
-                }
-            }
-
-            private Buffer2D<float> Render(IPath path)
-            {
-                Size size = Rectangle.Ceiling(path.Bounds).Size;
-                size = new Size(size.Width + (this.offset * 2), size.Height + (this.offset * 2));
-
-                float subpixelCount = 4;
-                float offset = 0.5f;
-                if (this.Options.Antialias)
-                {
-                    offset = 0f; // we are antialising skip offsetting as real antalising should take care of offset.
-                    subpixelCount = this.Options.AntialiasSubpixelDepth;
-                    if (subpixelCount < 4)
-                    {
-                        subpixelCount = 4;
-                    }
-                }
-
-                // take the path inside the path builder, scan thing and generate a Buffer2d representing the glyph and cache it.
-                Buffer2D<float> fullBuffer = this.MemoryAllocator.Allocate2D<float>(size.Width + 1, size.Height + 1, AllocationOptions.Clean);
-
-                using (IMemoryOwner<float> bufferBacking = this.MemoryAllocator.Allocate<float>(path.MaxIntersections))
-                using (IMemoryOwner<PointF> rowIntersectionBuffer = this.MemoryAllocator.Allocate<PointF>(size.Width))
-                {
-                    float subpixelFraction = 1f / subpixelCount;
-                    float subpixelFractionPoint = subpixelFraction / subpixelCount;
-
-                    for (int y = 0; y <= size.Height; y++)
-                    {
-                        Span<float> scanline = fullBuffer.GetRowSpan(y);
-                        bool scanlineDirty = false;
-                        float yPlusOne = y + 1;
-
-                        for (float subPixel = (float)y; subPixel < yPlusOne; subPixel += subpixelFraction)
-                        {
-                            var start = new PointF(path.Bounds.Left - 1, subPixel);
-                            var end = new PointF(path.Bounds.Right + 1, subPixel);
-                            Span<PointF> intersectionSpan = rowIntersectionBuffer.GetSpan();
-                            Span<float> buffer = bufferBacking.GetSpan();
-                            int pointsFound = path.FindIntersections(start, end, intersectionSpan);
-
-                            if (pointsFound == 0)
-                            {
-                                // nothing on this line skip
-                                continue;
-                            }
-
-                            for (int i = 0; i < pointsFound && i < intersectionSpan.Length; i++)
-                            {
-                                buffer[i] = intersectionSpan[i].X;
-                            }
-
-                            QuickSort.Sort(buffer.Slice(0, pointsFound));
-
-                            for (int point = 0; point < pointsFound; point += 2)
-                            {
-                                // points will be paired up
-                                float scanStart = buffer[point];
-                                float scanEnd = buffer[point + 1];
-                                int startX = (int)MathF.Floor(scanStart + offset);
-                                int endX = (int)MathF.Floor(scanEnd + offset);
-
-                                if (startX >= 0 && startX < scanline.Length)
-                                {
-                                    for (float x = scanStart; x < startX + 1; x += subpixelFraction)
-                                    {
-                                        scanline[startX] += subpixelFractionPoint;
-                                        scanlineDirty = true;
-                                    }
-                                }
-
-                                if (endX >= 0 && endX < scanline.Length)
-                                {
-                                    for (float x = endX; x < scanEnd; x += subpixelFraction)
-                                    {
-                                        scanline[endX] += subpixelFractionPoint;
-                                        scanlineDirty = true;
-                                    }
-                                }
-
-                                int nextX = startX + 1;
-                                endX = Math.Min(endX, scanline.Length); // reduce to end to the right edge
-                                nextX = Math.Max(nextX, 0);
-                                for (int x = nextX; x < endX; x++)
-                                {
-                                    scanline[x] += subpixelFraction;
-                                    scanlineDirty = true;
-                                }
-                            }
-                        }
-
-                        if (scanlineDirty)
-                        {
-                            if (!this.Options.Antialias)
-                            {
-                                for (int x = 0; x < size.Width; x++)
-                                {
-                                    if (scanline[x] >= 0.5)
-                                    {
-                                        scanline[x] = 1;
-                                    }
-                                    else
-                                    {
-                                        scanline[x] = 0;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                return fullBuffer;
-            }
-
-            public void EndText()
-            {
-            }
-
-            public void LineTo(PointF point)
-            {
-                this.builder.AddLine(this.currentPoint, point);
-                this.currentPoint = point;
-            }
-
-            public void MoveTo(PointF point)
-            {
-                this.builder.StartFigure();
-                this.currentPoint = point;
-            }
-
-            public void QuadraticBezierTo(PointF secondControlPoint, PointF point)
-            {
-                this.builder.AddBezier(this.currentPoint, secondControlPoint, point);
-                this.currentPoint = point;
-            }
-
-            private struct GlyphRenderData : IDisposable
-            {
-                public Buffer2D<float> FillMap;
-
-                public Buffer2D<float> OutlineMap;
-
-                public void Dispose()
-                {
-                    this.FillMap?.Dispose();
-                    this.OutlineMap?.Dispose();
-                }
-            }
+            return new DrawTextProcessor<TPixel>(this);
         }
     }
 }

src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor{TPixel}.cs

@@ -0,0 +1,446 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+
+using SixLabors.Fonts;
+using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Memory;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Utils;
+using SixLabors.Memory;
+using SixLabors.Primitives;
+using SixLabors.Shapes;
+
+namespace SixLabors.ImageSharp.Processing.Processors.Text
+{
+    /// <summary>
+    /// Using the brush as a source of pixels colors blends the brush color with source.
+    /// </summary>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class DrawTextProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
+    {
+        private CachingGlyphRenderer textRenderer;
+
+        private readonly DrawTextProcessor definition;
+
+        public DrawTextProcessor(DrawTextProcessor definition)
+        {
+            this.definition = definition;
+        }
+
+        private TextGraphicsOptions Options => this.definition.Options;
+
+        private Font Font => this.definition.Font;
+
+        private PointF Location => this.definition.Location;
+
+        private string Text => this.definition.Text;
+
+        private IPen Pen => this.definition.Pen;
+
+        private IBrush Brush => this.definition.Brush;
+
+        protected override void BeforeImageApply(Image<TPixel> source, Rectangle sourceRectangle)
+        {
+            base.BeforeImageApply(source, sourceRectangle);
+
+            // do everything at the image level as we are delegating the processing down to other processors
+            var style = new RendererOptions(this.Font, this.Options.DpiX, this.Options.DpiY, this.Location)
+                            {
+                                ApplyKerning = this.Options.ApplyKerning,
+                                TabWidth = this.Options.TabWidth,
+                                WrappingWidth = this.Options.WrapTextWidth,
+                                HorizontalAlignment = this.Options.HorizontalAlignment,
+                                VerticalAlignment = this.Options.VerticalAlignment
+                            };
+
+            this.textRenderer = new CachingGlyphRenderer(source.GetMemoryAllocator(), this.Text.Length, this.Pen, this.Brush != null);
+            this.textRenderer.Options = (GraphicsOptions)this.Options;
+            var renderer = new TextRenderer(this.textRenderer);
+            renderer.RenderText(this.Text, style);
+        }
+
+        protected override void AfterImageApply(Image<TPixel> source, Rectangle sourceRectangle)
+        {
+            base.AfterImageApply(source, sourceRectangle);
+            this.textRenderer?.Dispose();
+            this.textRenderer = null;
+        }
+
+        /// <inheritdoc/>
+        protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
+        {
+            // this is a no-op as we have processes all as an image, we should be able to pass out of before email apply a skip frames outcome
+            Draw(this.textRenderer.FillOperations, this.Brush);
+            Draw(this.textRenderer.OutlineOperations, this.Pen?.StrokeFill);
+
+            void Draw(List<DrawingOperation> operations, IBrush brush)
+            {
+                if (operations?.Count > 0)
+                {
+                    using (BrushApplicator<TPixel> app = brush.CreateApplicator(source, sourceRectangle, this.textRenderer.Options))
+                    {
+                        foreach (DrawingOperation operation in operations)
+                        {
+                            Buffer2D<float> buffer = operation.Map;
+                            int startY = operation.Location.Y;
+                            int startX = operation.Location.X;
+                            int offSetSpan = 0;
+                            if (startX < 0)
+                            {
+                                offSetSpan = -startX;
+                                startX = 0;
+                            }
+
+                            int fistRow = 0;
+                            if (startY < 0)
+                            {
+                                fistRow = -startY;
+                            }
+
+                            int maxHeight = source.Height - startY;
+                            int end = Math.Min(operation.Map.Height, maxHeight);
+
+                            for (int row = fistRow; row < end; row++)
+                            {
+                                int y = startY + row;
+                                Span<float> span = buffer.GetRowSpan(row).Slice(offSetSpan);
+                                app.Apply(span, startX, y);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private struct DrawingOperation
+        {
+            public Buffer2D<float> Map { get; set; }
+
+            public Point Location { get; set; }
+        }
+
+        private class CachingGlyphRenderer : IGlyphRenderer, IDisposable
+        {
+            // just enough accuracy to allow for 1/8 pixel differences which
+            // later are accumulated while rendering, but do not grow into full pixel offsets
+            // The value 8 is benchmarked to:
+            // - Provide a good accuracy (smaller than 0.2% image difference compared to the non-caching variant)
+            // - Cache hit ratio above 60%
+            private const float AccuracyMultiple = 8;
+
+            private readonly PathBuilder builder;
+
+            private Point currentRenderPosition = default;
+            private (GlyphRendererParameters glyph, PointF subPixelOffset) currentGlyphRenderParams = default;
+            private readonly int offset = 0;
+            private PointF currentPoint = default(PointF);
+
+            private readonly Dictionary<(GlyphRendererParameters glyph, PointF subPixelOffset), GlyphRenderData>
+                glyphData = new Dictionary<(GlyphRendererParameters glyph, PointF subPixelOffset), GlyphRenderData>();
+
+            private readonly bool renderOutline = false;
+            private readonly bool renderFill = false;
+            private bool rasterizationRequired = false;
+
+            public CachingGlyphRenderer(MemoryAllocator memoryAllocator, int size, IPen pen, bool renderFill)
+            {
+                this.MemoryAllocator = memoryAllocator;
+                this.Pen = pen;
+                this.renderFill = renderFill;
+                this.renderOutline = pen != null;
+                this.offset = 2;
+                if (this.renderFill)
+                {
+                    this.FillOperations = new List<DrawingOperation>(size);
+                }
+
+                if (this.renderOutline)
+                {
+                    this.offset = (int)MathF.Ceiling((pen.StrokeWidth * 2) + 2);
+                    this.OutlineOperations = new List<DrawingOperation>(size);
+                }
+
+                this.builder = new PathBuilder();
+            }
+
+            public List<DrawingOperation> FillOperations { get; }
+
+            public List<DrawingOperation> OutlineOperations { get; }
+
+            public MemoryAllocator MemoryAllocator { get; internal set; }
+
+            public IPen Pen { get; internal set; }
+
+            public GraphicsOptions Options { get; internal set; }
+
+            public void BeginFigure()
+            {
+                this.builder.StartFigure();
+            }
+
+            public bool BeginGlyph(RectangleF bounds, GlyphRendererParameters parameters)
+            {
+                this.currentRenderPosition = Point.Truncate(bounds.Location);
+                PointF subPixelOffset = bounds.Location - this.currentRenderPosition;
+
+                subPixelOffset.X = MathF.Round(subPixelOffset.X * AccuracyMultiple) / AccuracyMultiple;
+                subPixelOffset.Y = MathF.Round(subPixelOffset.Y * AccuracyMultiple) / AccuracyMultiple;
+
+                // we have offset our rendering origion a little bit down to prevent edge cropping, move the draw origin up to compensate
+                this.currentRenderPosition = new Point(this.currentRenderPosition.X - this.offset, this.currentRenderPosition.Y - this.offset);
+                this.currentGlyphRenderParams = (parameters, subPixelOffset);
+
+                if (this.glyphData.ContainsKey(this.currentGlyphRenderParams))
+                {
+                    // we have already drawn the glyph vectors skip trying again
+                    this.rasterizationRequired = false;
+                    return false;
+                }
+
+                // we check to see if we have a render cache and if we do then we render else
+                this.builder.Clear();
+
+                // ensure all glyphs render around [zero, zero]  so offset negative root positions so when we draw the glyph we can offet it back
+                this.builder.SetOrigin(new PointF(-(int)bounds.X + this.offset, -(int)bounds.Y + this.offset));
+
+                this.rasterizationRequired = true;
+                return true;
+            }
+
+            public void BeginText(RectangleF bounds)
+            {
+                // not concerned about this one
+                this.OutlineOperations?.Clear();
+                this.FillOperations?.Clear();
+            }
+
+            public void CubicBezierTo(PointF secondControlPoint, PointF thirdControlPoint, PointF point)
+            {
+                this.builder.AddBezier(this.currentPoint, secondControlPoint, thirdControlPoint, point);
+                this.currentPoint = point;
+            }
+
+            public void Dispose()
+            {
+                foreach (KeyValuePair<(GlyphRendererParameters glyph, PointF subPixelOffset), GlyphRenderData> kv in this.glyphData)
+                {
+                    kv.Value.Dispose();
+                }
+
+                this.glyphData.Clear();
+            }
+
+            public void EndFigure()
+            {
+                this.builder.CloseFigure();
+            }
+
+            public void EndGlyph()
+            {
+                GlyphRenderData renderData = default;
+
+                // has the glyoh been rendedered already????
+                if (this.rasterizationRequired)
+                {
+                    IPath path = this.builder.Build();
+
+                    if (this.renderFill)
+                    {
+                        renderData.FillMap = this.Render(path);
+                    }
+
+                    if (this.renderOutline)
+                    {
+                        if (this.Pen.StrokePattern.Length == 0)
+                        {
+                            path = path.GenerateOutline(this.Pen.StrokeWidth);
+                        }
+                        else
+                        {
+                            path = path.GenerateOutline(this.Pen.StrokeWidth, this.Pen.StrokePattern);
+                        }
+
+                        renderData.OutlineMap = this.Render(path);
+                    }
+
+                    this.glyphData[this.currentGlyphRenderParams] = renderData;
+                }
+                else
+                {
+                    renderData = this.glyphData[this.currentGlyphRenderParams];
+                }
+
+                if (this.renderFill)
+                {
+                    this.FillOperations.Add(new DrawingOperation
+                                                {
+                                                    Location = this.currentRenderPosition,
+                                                    Map = renderData.FillMap
+                                                });
+                }
+
+                if (this.renderOutline)
+                {
+                    this.OutlineOperations.Add(new DrawingOperation
+                                                   {
+                                                       Location = this.currentRenderPosition,
+                                                       Map = renderData.OutlineMap
+                                                   });
+                }
+            }
+
+            private Buffer2D<float> Render(IPath path)
+            {
+                Size size = Rectangle.Ceiling(path.Bounds).Size;
+                size = new Size(size.Width + (this.offset * 2), size.Height + (this.offset * 2));
+
+                float subpixelCount = 4;
+                float offset = 0.5f;
+                if (this.Options.Antialias)
+                {
+                    offset = 0f; // we are antialising skip offsetting as real antalising should take care of offset.
+                    subpixelCount = this.Options.AntialiasSubpixelDepth;
+                    if (subpixelCount < 4)
+                    {
+                        subpixelCount = 4;
+                    }
+                }
+
+                // take the path inside the path builder, scan thing and generate a Buffer2d representing the glyph and cache it.
+                Buffer2D<float> fullBuffer = this.MemoryAllocator.Allocate2D<float>(size.Width + 1, size.Height + 1, AllocationOptions.Clean);
+
+                using (IMemoryOwner<float> bufferBacking = this.MemoryAllocator.Allocate<float>(path.MaxIntersections))
+                using (IMemoryOwner<PointF> rowIntersectionBuffer = this.MemoryAllocator.Allocate<PointF>(size.Width))
+                {
+                    float subpixelFraction = 1f / subpixelCount;
+                    float subpixelFractionPoint = subpixelFraction / subpixelCount;
+
+                    for (int y = 0; y <= size.Height; y++)
+                    {
+                        Span<float> scanline = fullBuffer.GetRowSpan(y);
+                        bool scanlineDirty = false;
+                        float yPlusOne = y + 1;
+
+                        for (float subPixel = (float)y; subPixel < yPlusOne; subPixel += subpixelFraction)
+                        {
+                            var start = new PointF(path.Bounds.Left - 1, subPixel);
+                            var end = new PointF(path.Bounds.Right + 1, subPixel);
+                            Span<PointF> intersectionSpan = rowIntersectionBuffer.GetSpan();
+                            Span<float> buffer = bufferBacking.GetSpan();
+                            int pointsFound = path.FindIntersections(start, end, intersectionSpan);
+
+                            if (pointsFound == 0)
+                            {
+                                // nothing on this line skip
+                                continue;
+                            }
+
+                            for (int i = 0; i < pointsFound && i < intersectionSpan.Length; i++)
+                            {
+                                buffer[i] = intersectionSpan[i].X;
+                            }
+
+                            QuickSort.Sort(buffer.Slice(0, pointsFound));
+
+                            for (int point = 0; point < pointsFound; point += 2)
+                            {
+                                // points will be paired up
+                                float scanStart = buffer[point];
+                                float scanEnd = buffer[point + 1];
+                                int startX = (int)MathF.Floor(scanStart + offset);
+                                int endX = (int)MathF.Floor(scanEnd + offset);
+
+                                if (startX >= 0 && startX < scanline.Length)
+                                {
+                                    for (float x = scanStart; x < startX + 1; x += subpixelFraction)
+                                    {
+                                        scanline[startX] += subpixelFractionPoint;
+                                        scanlineDirty = true;
+                                    }
+                                }
+
+                                if (endX >= 0 && endX < scanline.Length)
+                                {
+                                    for (float x = endX; x < scanEnd; x += subpixelFraction)
+                                    {
+                                        scanline[endX] += subpixelFractionPoint;
+                                        scanlineDirty = true;
+                                    }
+                                }
+
+                                int nextX = startX + 1;
+                                endX = Math.Min(endX, scanline.Length); // reduce to end to the right edge
+                                nextX = Math.Max(nextX, 0);
+                                for (int x = nextX; x < endX; x++)
+                                {
+                                    scanline[x] += subpixelFraction;
+                                    scanlineDirty = true;
+                                }
+                            }
+                        }
+
+                        if (scanlineDirty)
+                        {
+                            if (!this.Options.Antialias)
+                            {
+                                for (int x = 0; x < size.Width; x++)
+                                {
+                                    if (scanline[x] >= 0.5)
+                                    {
+                                        scanline[x] = 1;
+                                    }
+                                    else
+                                    {
+                                        scanline[x] = 0;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                return fullBuffer;
+            }
+
+            public void EndText()
+            {
+            }
+
+            public void LineTo(PointF point)
+            {
+                this.builder.AddLine(this.currentPoint, point);
+                this.currentPoint = point;
+            }
+
+            public void MoveTo(PointF point)
+            {
+                this.builder.StartFigure();
+                this.currentPoint = point;
+            }
+
+            public void QuadraticBezierTo(PointF secondControlPoint, PointF point)
+            {
+                this.builder.AddBezier(this.currentPoint, secondControlPoint, point);
+                this.currentPoint = point;
+            }
+
+            private struct GlyphRenderData : IDisposable
+            {
+                public Buffer2D<float> FillMap;
+
+                public Buffer2D<float> OutlineMap;
+
+                public void Dispose()
+                {
+                    this.FillMap?.Dispose();
+                    this.OutlineMap?.Dispose();
+                }
+            }
+        }
+    }
+}

src/ImageSharp.Drawing/Processing/RadialGradientBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/RadialGradientBrush.cs

@@ -11,36 +11,34 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// A Circular Gradient Brush, defined by center point and radius.
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
-    public sealed class RadialGradientBrush<TPixel> : GradientBrushBase<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public sealed class RadialGradientBrush : GradientBrush
     {
-        private readonly Point center;
+        private readonly PointF center;
 
         private readonly float radius;
 
-        /// <inheritdoc cref="GradientBrushBase{TPixel}" />
+        /// <inheritdoc cref="GradientBrush" />
         /// <param name="center">The center of the circular gradient and 0 for the color stops.</param>
         /// <param name="radius">The radius of the circular gradient and 1 for the color stops.</param>
         /// <param name="repetitionMode">Defines how the colors in the gradient are repeated.</param>
         /// <param name="colorStops">the color stops as defined in base class.</param>
         public RadialGradientBrush(
-            Point center,
+            PointF center,
             float radius,
             GradientRepetitionMode repetitionMode,
-            params ColorStop<TPixel>[] colorStops)
+            params ColorStop[] colorStops)
             : base(repetitionMode, colorStops)
         {
             this.center = center;
             this.radius = radius;
         }
 
-        /// <inheritdoc cref="CreateApplicator" />
-        public override BrushApplicator<TPixel> CreateApplicator(
+        /// <inheritdoc />
+        public override BrushApplicator<TPixel> CreateApplicator<TPixel>(
             ImageFrame<TPixel> source,
             RectangleF region,
             GraphicsOptions options) =>
-            new RadialGradientBrushApplicator(
+            new RadialGradientBrushApplicator<TPixel>(
                 source,
                 options,
                 this.center,
@@ -49,14 +47,15 @@ namespace SixLabors.ImageSharp.Processing
                 this.RepetitionMode);
 
         /// <inheritdoc />
-        private sealed class RadialGradientBrushApplicator : GradientBrushApplicatorBase
+        private sealed class RadialGradientBrushApplicator<TPixel> : GradientBrushApplicator<TPixel>
+            where TPixel : struct, IPixel<TPixel>
         {
-            private readonly Point center;
+            private readonly PointF center;
 
             private readonly float radius;
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="RadialGradientBrushApplicator" /> class.
+            /// Initializes a new instance of the <see cref="RadialGradientBrushApplicator{TPixel}" /> class.
             /// </summary>
             /// <param name="target">The target image</param>
             /// <param name="options">The options.</param>
@@ -67,9 +66,9 @@ namespace SixLabors.ImageSharp.Processing
             public RadialGradientBrushApplicator(
                 ImageFrame<TPixel> target,
                 GraphicsOptions options,
-                Point center,
+                PointF center,
                 float radius,
-                ColorStop<TPixel>[] colorStops,
+                ColorStop[] colorStops,
                 GradientRepetitionMode repetitionMode)
                 : base(target, options, colorStops, repetitionMode)
             {
@@ -89,9 +88,9 @@ namespace SixLabors.ImageSharp.Processing
             /// <param name="x">The X coordinate of the target pixel.</param>
             /// <param name="y">The Y coordinate of the target pixel.</param>
             /// <returns>the position on the color gradient.</returns>
-            protected override float PositionOnGradient(int x, int y)
+            protected override float PositionOnGradient(float x, float y)
             {
-                float distance = (float)Math.Sqrt(Math.Pow(this.center.X - x, 2) + Math.Pow(this.center.Y - y, 2));
+                float distance = MathF.Sqrt(MathF.Pow(this.center.X - x, 2) + MathF.Pow(this.center.Y - y, 2));
                 return distance / this.radius;
             }
 

src/ImageSharp.Drawing/Processing/RecolorBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/RecolorBrush.cs

@@ -15,17 +15,15 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// Provides an implementation of a brush that can recolor an image
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
-    public class RecolorBrush<TPixel> : IBrush<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public class RecolorBrush : IBrush
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="RecolorBrush{TPixel}" /> class.
+        /// Initializes a new instance of the <see cref="RecolorBrush" /> class.
         /// </summary>
         /// <param name="sourceColor">Color of the source.</param>
         /// <param name="targetColor">Color of the target.</param>
         /// <param name="threshold">The threshold as a value between 0 and 1.</param>
-        public RecolorBrush(TPixel sourceColor, TPixel targetColor, float threshold)
+        public RecolorBrush(Color sourceColor, Color targetColor, float threshold)
         {
             this.SourceColor = sourceColor;
             this.Threshold = threshold;
@@ -43,23 +41,33 @@ namespace SixLabors.ImageSharp.Processing
         /// <value>
         /// The color of the source.
         /// </value>
-        public TPixel SourceColor { get; }
+        public Color SourceColor { get; }
 
         /// <summary>
         /// Gets the target color.
         /// </summary>
-        public TPixel TargetColor { get; }
+        public Color TargetColor { get; }
 
         /// <inheritdoc />
-        public BrushApplicator<TPixel> CreateApplicator(ImageFrame<TPixel> source, RectangleF region, GraphicsOptions options)
+        public BrushApplicator<TPixel> CreateApplicator<TPixel>(
+            ImageFrame<TPixel> source,
+            RectangleF region,
+            GraphicsOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return new RecolorBrushApplicator(source, this.SourceColor, this.TargetColor, this.Threshold, options);
+            return new RecolorBrushApplicator<TPixel>(
+                source,
+                this.SourceColor.ToPixel<TPixel>(),
+                this.TargetColor.ToPixel<TPixel>(),
+                this.Threshold,
+                options);
         }
 
         /// <summary>
         /// The recolor brush applicator.
         /// </summary>
-        private class RecolorBrushApplicator : BrushApplicator<TPixel>
+        private class RecolorBrushApplicator<TPixel> : BrushApplicator<TPixel>
+            where TPixel : struct, IPixel<TPixel>
         {
             /// <summary>
             /// The source color.
@@ -79,7 +87,7 @@ namespace SixLabors.ImageSharp.Processing
             private readonly TPixel targetColorPixel;
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="RecolorBrushApplicator" /> class.
+            /// Initializes a new instance of the <see cref="RecolorBrushApplicator{TPixel}" /> class.
             /// </summary>
             /// <param name="source">The source image.</param>
             /// <param name="sourceColor">Color of the source.</param>

src/ImageSharp.Drawing/Processing/SolidBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/SolidBrush.cs

@@ -15,20 +15,18 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// Provides an implementation of a solid brush for painting solid color areas.
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
-    public class SolidBrush<TPixel> : IBrush<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public class SolidBrush : IBrush
     {
         /// <summary>
         /// The color to paint.
         /// </summary>
-        private readonly TPixel color;
+        private readonly Color color;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="SolidBrush{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="SolidBrush"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
-        public SolidBrush(TPixel color)
+        public SolidBrush(Color color)
         {
             this.color = color;
         }
@@ -39,21 +37,23 @@ namespace SixLabors.ImageSharp.Processing
         /// <value>
         /// The color.
         /// </value>
-        public TPixel Color => this.color;
+        public Color Color => this.color;
 
         /// <inheritdoc />
-        public BrushApplicator<TPixel> CreateApplicator(ImageFrame<TPixel> source, RectangleF region, GraphicsOptions options)
+        public BrushApplicator<TPixel> CreateApplicator<TPixel>(ImageFrame<TPixel> source, RectangleF region, GraphicsOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return new SolidBrushApplicator(source, this.color, options);
+            return new SolidBrushApplicator<TPixel>(source, this.color.ToPixel<TPixel>(), options);
         }
 
         /// <summary>
         /// The solid brush applicator.
         /// </summary>
-        private class SolidBrushApplicator : BrushApplicator<TPixel>
+        private class SolidBrushApplicator<TPixel> : BrushApplicator<TPixel>
+            where TPixel : struct, IPixel<TPixel>
         {
             /// <summary>
-            /// Initializes a new instance of the <see cref="SolidBrushApplicator"/> class.
+            /// Initializes a new instance of the <see cref="SolidBrushApplicator{TPixel}"/> class.
             /// </summary>
             /// <param name="source">The source image.</param>
             /// <param name="color">The color.</param>

src/ImageSharp.Drawing/Processing/TextGraphicsOptions.cs

@@ -1,169 +1,163 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.Fonts;
-using SixLabors.ImageSharp.PixelFormats;
-
-namespace SixLabors.ImageSharp.Processing
-{
-    /// <summary>
-    /// Options for influencing the drawing functions.
-    /// </summary>
-    public struct TextGraphicsOptions
-    {
-        private const int DefaultTextDpi = 72;
-
-        /// <summary>
-        /// Represents the default <see cref="TextGraphicsOptions"/>.
-        /// </summary>
-        public static readonly TextGraphicsOptions Default = new TextGraphicsOptions(true);
-
-        private float? blendPercentage;
-
-        private int? antialiasSubpixelDepth;
-
-        private bool? antialias;
-
-        private bool? applyKerning;
-
-        private float? tabWidth;
-
-        private float? dpiX;
-
-        private float? dpiY;
-
-        private PixelColorBlendingMode colorBlendingMode;
-
-        private PixelAlphaCompositionMode alphaCompositionMode;
-
-        private float wrapTextWidth;
-
-        private HorizontalAlignment? horizontalAlignment;
-
-        private VerticalAlignment? verticalAlignment;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TextGraphicsOptions" /> struct.
-        /// </summary>
-        /// <param name="enableAntialiasing">If set to <c>true</c> [enable antialiasing].</param>
-        public TextGraphicsOptions(bool enableAntialiasing)
-        {
-            this.applyKerning = true;
-            this.tabWidth = 4;
-            this.wrapTextWidth = 0;
-            this.horizontalAlignment = HorizontalAlignment.Left;
-            this.verticalAlignment = VerticalAlignment.Top;
-
-            this.antialiasSubpixelDepth = 16;
-            this.colorBlendingMode = PixelColorBlendingMode.Normal;
-            this.alphaCompositionMode = PixelAlphaCompositionMode.SrcOver;
-            this.blendPercentage = 1;
-            this.antialias = enableAntialiasing;
-            this.dpiX = DefaultTextDpi;
-            this.dpiY = DefaultTextDpi;
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether antialiasing should be applied.
-        /// </summary>
-        public bool Antialias { get => this.antialias ?? true; set => this.antialias = value; }
-
-        /// <summary>
-        /// Gets or sets a value indicating the number of subpixels to use while rendering with antialiasing enabled.
-        /// </summary>
-        public int AntialiasSubpixelDepth { get => this.antialiasSubpixelDepth ?? 16; set => this.antialiasSubpixelDepth = value; }
-
-        /// <summary>
-        /// Gets or sets a value indicating the blending percentage to apply to the drawing operation
-        /// </summary>
-        public float BlendPercentage { get => (this.blendPercentage ?? 1).Clamp(0, 1); set => this.blendPercentage = value; }
-
-        // In the future we could expose a PixelBlender<TPixel> directly on here
-        // or some forms of PixelBlender factory for each pixel type. Will need
-        // some API thought post V1.
-
-        /// <summary>
-        /// Gets or sets a value indicating the color blending percentage to apply to the drawing operation
-        /// </summary>
-        public PixelColorBlendingMode ColorBlendingMode { get => this.colorBlendingMode; set => this.colorBlendingMode = value; }
-
-        /// <summary>
-        /// Gets or sets a value indicating the color blending percentage to apply to the drawing operation
-        /// </summary>
-        public PixelAlphaCompositionMode AlphaCompositionMode { get => this.alphaCompositionMode; set => this.alphaCompositionMode = value; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the text should be drawing with kerning enabled.
-        /// </summary>
-        public bool ApplyKerning { get => this.applyKerning ?? true; set => this.applyKerning = value; }
-
-        /// <summary>
-        /// Gets or sets a value indicating the number of space widths a tab should lock to.
-        /// </summary>
-        public float TabWidth { get => this.tabWidth ?? 4; set => this.tabWidth = value; }
-
-        /// <summary>
-        /// Gets or sets a value indicating if greater than zero determine the width at which text should wrap.
-        /// </summary>
-        public float WrapTextWidth { get => this.wrapTextWidth; set => this.wrapTextWidth = value; }
-
-        /// <summary>
-        /// Gets or sets a value indicating the DPI to render text along the X axis.
-        /// </summary>
-        public float DpiX { get => this.dpiX ?? DefaultTextDpi; set => this.dpiX = value; }
-
-        /// <summary>
-        /// Gets or sets a value indicating the DPI to render text along the Y axis.
-        /// </summary>
-        public float DpiY { get => this.dpiY ?? DefaultTextDpi; set => this.dpiY = value; }
-
-        /// <summary>
-        /// Gets or sets a value indicating how to align the text relative to the rendering space.
-        /// If <see cref="WrapTextWidth"/> is greater than zero it will align relative to the space
-        /// defined by the location and width, if <see cref="WrapTextWidth"/> equals zero, and thus
-        /// wrapping disabled, then the alignment is relative to the drawing location.
-        /// </summary>
-        public HorizontalAlignment HorizontalAlignment { get => this.horizontalAlignment ?? HorizontalAlignment.Left; set => this.horizontalAlignment = value; }
-
-        /// <summary>
-        /// Gets or sets a value indicating how to align the text relative to the rendering space.
-        /// </summary>
-        public VerticalAlignment VerticalAlignment { get => this.verticalAlignment ?? VerticalAlignment.Top; set => this.verticalAlignment = value; }
-
-        /// <summary>
-        /// Performs an implicit conversion from <see cref="GraphicsOptions"/> to <see cref="TextGraphicsOptions"/>.
-        /// </summary>
-        /// <param name="options">The options.</param>
-        /// <returns>
-        /// The result of the conversion.
-        /// </returns>
-        public static implicit operator TextGraphicsOptions(GraphicsOptions options)
-        {
-            return new TextGraphicsOptions(options.Antialias)
-            {
-                AntialiasSubpixelDepth = options.AntialiasSubpixelDepth,
-                blendPercentage = options.BlendPercentage,
-                colorBlendingMode = options.ColorBlendingMode,
-                alphaCompositionMode = options.AlphaCompositionMode
-            };
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="TextGraphicsOptions"/> to <see cref="GraphicsOptions"/>.
-        /// </summary>
-        /// <param name="options">The options.</param>
-        /// <returns>
-        /// The result of the conversion.
-        /// </returns>
-        public static explicit operator GraphicsOptions(TextGraphicsOptions options)
-        {
-            return new GraphicsOptions(options.Antialias)
-            {
-                AntialiasSubpixelDepth = options.AntialiasSubpixelDepth,
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.Fonts;
+using SixLabors.ImageSharp.PixelFormats;
+
+namespace SixLabors.ImageSharp.Processing
+{
+    /// <summary>
+    /// Options for influencing the drawing functions.
+    /// </summary>
+    public struct TextGraphicsOptions
+    {
+        private const int DefaultTextDpi = 72;
+
+        /// <summary>
+        /// Represents the default <see cref="TextGraphicsOptions"/>.
+        /// </summary>
+        public static readonly TextGraphicsOptions Default = new TextGraphicsOptions(true);
+
+        private float? blendPercentage;
+
+        private int? antialiasSubpixelDepth;
+
+        private bool? antialias;
+
+        private bool? applyKerning;
+
+        private float? tabWidth;
+
+        private float? dpiX;
+
+        private float? dpiY;
+
+        private HorizontalAlignment? horizontalAlignment;
+
+        private VerticalAlignment? verticalAlignment;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextGraphicsOptions" /> struct.
+        /// </summary>
+        /// <param name="enableAntialiasing">If set to <c>true</c> [enable antialiasing].</param>
+        public TextGraphicsOptions(bool enableAntialiasing)
+        {
+            this.applyKerning = true;
+            this.tabWidth = 4;
+            this.WrapTextWidth = 0;
+            this.horizontalAlignment = HorizontalAlignment.Left;
+            this.verticalAlignment = VerticalAlignment.Top;
+
+            this.antialiasSubpixelDepth = 16;
+            this.ColorBlendingMode = PixelColorBlendingMode.Normal;
+            this.AlphaCompositionMode = PixelAlphaCompositionMode.SrcOver;
+            this.blendPercentage = 1;
+            this.antialias = enableAntialiasing;
+            this.dpiX = DefaultTextDpi;
+            this.dpiY = DefaultTextDpi;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether antialiasing should be applied.
+        /// </summary>
+        public bool Antialias { get => this.antialias ?? true; set => this.antialias = value; }
+
+        /// <summary>
+        /// Gets or sets a value indicating the number of subpixels to use while rendering with antialiasing enabled.
+        /// </summary>
+        public int AntialiasSubpixelDepth { get => this.antialiasSubpixelDepth ?? 16; set => this.antialiasSubpixelDepth = value; }
+
+        /// <summary>
+        /// Gets or sets a value indicating the blending percentage to apply to the drawing operation
+        /// </summary>
+        public float BlendPercentage { get => (this.blendPercentage ?? 1).Clamp(0, 1); set => this.blendPercentage = value; }
+
+        // In the future we could expose a PixelBlender<TPixel> directly on here
+        // or some forms of PixelBlender factory for each pixel type. Will need
+        // some API thought post V1.
+
+        /// <summary>
+        /// Gets or sets a value indicating the color blending percentage to apply to the drawing operation
+        /// </summary>
+        public PixelColorBlendingMode ColorBlendingMode { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating the color blending percentage to apply to the drawing operation
+        /// </summary>
+        public PixelAlphaCompositionMode AlphaCompositionMode { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the text should be drawing with kerning enabled.
+        /// </summary>
+        public bool ApplyKerning { get => this.applyKerning ?? true; set => this.applyKerning = value; }
+
+        /// <summary>
+        /// Gets or sets a value indicating the number of space widths a tab should lock to.
+        /// </summary>
+        public float TabWidth { get => this.tabWidth ?? 4; set => this.tabWidth = value; }
+
+        /// <summary>
+        /// Gets or sets a value indicating if greater than zero determine the width at which text should wrap.
+        /// </summary>
+        public float WrapTextWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating the DPI to render text along the X axis.
+        /// </summary>
+        public float DpiX { get => this.dpiX ?? DefaultTextDpi; set => this.dpiX = value; }
+
+        /// <summary>
+        /// Gets or sets a value indicating the DPI to render text along the Y axis.
+        /// </summary>
+        public float DpiY { get => this.dpiY ?? DefaultTextDpi; set => this.dpiY = value; }
+
+        /// <summary>
+        /// Gets or sets a value indicating how to align the text relative to the rendering space.
+        /// If <see cref="WrapTextWidth"/> is greater than zero it will align relative to the space
+        /// defined by the location and width, if <see cref="WrapTextWidth"/> equals zero, and thus
+        /// wrapping disabled, then the alignment is relative to the drawing location.
+        /// </summary>
+        public HorizontalAlignment HorizontalAlignment { get => this.horizontalAlignment ?? HorizontalAlignment.Left; set => this.horizontalAlignment = value; }
+
+        /// <summary>
+        /// Gets or sets a value indicating how to align the text relative to the rendering space.
+        /// </summary>
+        public VerticalAlignment VerticalAlignment { get => this.verticalAlignment ?? VerticalAlignment.Top; set => this.verticalAlignment = value; }
+
+        /// <summary>
+        /// Performs an implicit conversion from <see cref="GraphicsOptions"/> to <see cref="TextGraphicsOptions"/>.
+        /// </summary>
+        /// <param name="options">The options.</param>
+        /// <returns>
+        /// The result of the conversion.
+        /// </returns>
+        public static implicit operator TextGraphicsOptions(GraphicsOptions options)
+        {
+            return new TextGraphicsOptions(options.Antialias)
+            {
+                AntialiasSubpixelDepth = options.AntialiasSubpixelDepth,
+                blendPercentage = options.BlendPercentage,
+                ColorBlendingMode = options.ColorBlendingMode,
+                AlphaCompositionMode = options.AlphaCompositionMode
+            };
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="TextGraphicsOptions"/> to <see cref="GraphicsOptions"/>.
+        /// </summary>
+        /// <param name="options">The options.</param>
+        /// <returns>
+        /// The result of the conversion.
+        /// </returns>
+        public static explicit operator GraphicsOptions(TextGraphicsOptions options)
+        {
+            return new GraphicsOptions(options.Antialias)
+            {
+                AntialiasSubpixelDepth = options.AntialiasSubpixelDepth,
                 ColorBlendingMode = options.ColorBlendingMode,
-                AlphaCompositionMode = options.AlphaCompositionMode,
-                BlendPercentage = options.BlendPercentage
-            };
-        }
-    }
+                AlphaCompositionMode = options.AlphaCompositionMode,
+                BlendPercentage = options.BlendPercentage
+            };
+        }
+    }
 }

src/ImageSharp.Drawing/Properties/AssemblyInfo.cs

@@ -1,4 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-// Common values read from `AssemblyInfo.Common.cs`

src/ImageSharp/Advanced/AdvancedImageExtensions.cs

@@ -18,11 +18,9 @@ namespace SixLabors.ImageSharp.Advanced
         /// <summary>
         /// Gets the configuration for the image.
         /// </summary>
-        /// <typeparam name="TPixel">The Pixel format.</typeparam>
-        /// <param name="source">The source image</param>
+        /// <param name="source">The source image.</param>
         /// <returns>Returns the configuration.</returns>
-        public static Configuration GetConfiguration<TPixel>(this Image<TPixel> source)
-            where TPixel : struct, IPixel<TPixel>
+        public static Configuration GetConfiguration(this Image source)
             => GetConfiguration((IConfigurable)source);
 
         /// <summary>
@@ -150,7 +148,7 @@ namespace SixLabors.ImageSharp.Advanced
         /// <summary>
         /// Gets the <see cref="MemoryAllocator"/> assigned to 'source'.
         /// </summary>
-        /// <param name="source">The source image</param>
+        /// <param name="source">The source image.</param>
         /// <returns>Returns the configuration.</returns>
         internal static MemoryAllocator GetMemoryAllocator(this IConfigurable source)
             => GetConfiguration(source).MemoryAllocator;
@@ -185,7 +183,7 @@ namespace SixLabors.ImageSharp.Advanced
         /// <param name="source">The source.</param>
         /// <param name="row">The row.</param>
         /// <returns>
-        /// The span returned from Pixel source
+        /// The span returned from Pixel source.
         /// </returns>
         private static Span<TPixel> GetSpan<TPixel>(Buffer2D<TPixel> source, int row)
             where TPixel : struct, IPixel<TPixel>

src/ImageSharp/Advanced/AotCompilerTools.cs

@@ -104,7 +104,7 @@ namespace SixLabors.ImageSharp.Advanced
         private static void AotCompileWuQuantizer<TPixel>()
             where TPixel : struct, IPixel<TPixel>
         {
-            var test = new WuFrameQuantizer<TPixel>(new WuQuantizer(false));
+            var test = new WuFrameQuantizer<TPixel>(Configuration.Default.MemoryAllocator, new WuQuantizer(false));
             test.QuantizeFrame(new ImageFrame<TPixel>(Configuration.Default, 1, 1));
             test.AotGetPalette();
         }

src/ImageSharp/Advanced/IPixelSource.cs

@@ -3,7 +3,6 @@
 
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.Memory;
 
 namespace SixLabors.ImageSharp.Advanced
 {

src/ImageSharp/Color/Color.Conversions.cs

@@ -0,0 +1,98 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Numerics;
+using System.Runtime.CompilerServices;
+
+using SixLabors.ImageSharp.PixelFormats;
+
+namespace SixLabors.ImageSharp
+{
+    /// <content>
+    /// Contains constructors and implicit conversion methods.
+    /// </content>
+    public readonly partial struct Color
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// </summary>
+        /// <param name="pixel">The <see cref="Rgba64"/> containing the color information.</param>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public Color(Rgba64 pixel) => this.data = pixel;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// </summary>
+        /// <param name="pixel">The <see cref="Rgba32"/> containing the color information.</param>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public Color(Rgba32 pixel) => this.data = new Rgba64(pixel);
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// </summary>
+        /// <param name="pixel">The <see cref="Argb32"/> containing the color information.</param>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public Color(Argb32 pixel) => this.data = new Rgba64(pixel);
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// </summary>
+        /// <param name="pixel">The <see cref="Bgra32"/> containing the color information.</param>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public Color(Bgra32 pixel) => this.data = new Rgba64(pixel);
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// </summary>
+        /// <param name="pixel">The <see cref="Rgb24"/> containing the color information.</param>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public Color(Rgb24 pixel) => this.data = new Rgba64(pixel);
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// </summary>
+        /// <param name="pixel">The <see cref="Bgr24"/> containing the color information.</param>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public Color(Bgr24 pixel) => this.data = new Rgba64(pixel);
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// </summary>
+        /// <param name="vector">The <see cref="Vector4"/> containing the color information.</param>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public Color(Vector4 vector) => this.data = new Rgba64(vector);
+
+        /// <summary>
+        /// Converts a <see cref="Color"/> to <see cref="Vector4"/>.
+        /// </summary>
+        /// <param name="color">The <see cref="Color"/>.</param>
+        /// <returns>The <see cref="Vector4"/>.</returns>
+        public static explicit operator Vector4(Color color) => color.data.ToVector4();
+
+        /// <summary>
+        /// Converts an <see cref="Vector4"/> to <see cref="Color"/>.
+        /// </summary>
+        /// <param name="source">The <see cref="Vector4"/>.</param>
+        /// <returns>The <see cref="Color"/>.</returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static explicit operator Color(Vector4 source) => new Color(source);
+
+        [MethodImpl(InliningOptions.ShortMethod)]
+        internal Rgba32 ToRgba32() => this.data.ToRgba32();
+
+        [MethodImpl(InliningOptions.ShortMethod)]
+        internal Bgra32 ToBgra32() => this.data.ToBgra32();
+
+        [MethodImpl(InliningOptions.ShortMethod)]
+        internal Argb32 ToArgb32() => this.data.ToArgb32();
+
+        [MethodImpl(InliningOptions.ShortMethod)]
+        internal Rgb24 ToRgb24() => this.data.ToRgb24();
+
+        [MethodImpl(InliningOptions.ShortMethod)]
+        internal Bgr24 ToBgr24() => this.data.ToBgr24();
+
+        [MethodImpl(InliningOptions.ShortMethod)]
+        internal Vector4 ToVector4() => this.data.ToVector4();
+    }
+}

src/ImageSharp/Color/Color.NamedColors.cs

@@ -0,0 +1,721 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp
+{
+    /// <content>
+    /// Contains static named color values.
+    /// </content>
+    public readonly partial struct Color
+    {
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #F0F8FF.
+        /// </summary>
+        public static readonly Color AliceBlue = FromRgba(240, 248, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FAEBD7.
+        /// </summary>
+        public static readonly Color AntiqueWhite = FromRgba(250, 235, 215, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #00FFFF.
+        /// </summary>
+        public static readonly Color Aqua = FromRgba(0, 255, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #7FFFD4.
+        /// </summary>
+        public static readonly Color Aquamarine = FromRgba(127, 255, 212, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #F0FFFF.
+        /// </summary>
+        public static readonly Color Azure = FromRgba(240, 255, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #F5F5DC.
+        /// </summary>
+        public static readonly Color Beige = FromRgba(245, 245, 220, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFE4C4.
+        /// </summary>
+        public static readonly Color Bisque = FromRgba(255, 228, 196, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #000000.
+        /// </summary>
+        public static readonly Color Black = FromRgba(0, 0, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFEBCD.
+        /// </summary>
+        public static readonly Color BlanchedAlmond = FromRgba(255, 235, 205, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #0000FF.
+        /// </summary>
+        public static readonly Color Blue = FromRgba(0, 0, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #8A2BE2.
+        /// </summary>
+        public static readonly Color BlueViolet = FromRgba(138, 43, 226, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #A52A2A.
+        /// </summary>
+        public static readonly Color Brown = FromRgba(165, 42, 42, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #DEB887.
+        /// </summary>
+        public static readonly Color BurlyWood = FromRgba(222, 184, 135, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #5F9EA0.
+        /// </summary>
+        public static readonly Color CadetBlue = FromRgba(95, 158, 160, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #7FFF00.
+        /// </summary>
+        public static readonly Color Chartreuse = FromRgba(127, 255, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #D2691E.
+        /// </summary>
+        public static readonly Color Chocolate = FromRgba(210, 105, 30, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FF7F50.
+        /// </summary>
+        public static readonly Color Coral = FromRgba(255, 127, 80, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #6495ED.
+        /// </summary>
+        public static readonly Color CornflowerBlue = FromRgba(100, 149, 237, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFF8DC.
+        /// </summary>
+        public static readonly Color Cornsilk = FromRgba(255, 248, 220, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #DC143C.
+        /// </summary>
+        public static readonly Color Crimson = FromRgba(220, 20, 60, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #00FFFF.
+        /// </summary>
+        public static readonly Color Cyan = FromRgba(0, 255, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #00008B.
+        /// </summary>
+        public static readonly Color DarkBlue = FromRgba(0, 0, 139, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #008B8B.
+        /// </summary>
+        public static readonly Color DarkCyan = FromRgba(0, 139, 139, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #B8860B.
+        /// </summary>
+        public static readonly Color DarkGoldenrod = FromRgba(184, 134, 11, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #A9A9A9.
+        /// </summary>
+        public static readonly Color DarkGray = FromRgba(169, 169, 169, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #006400.
+        /// </summary>
+        public static readonly Color DarkGreen = FromRgba(0, 100, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #BDB76B.
+        /// </summary>
+        public static readonly Color DarkKhaki = FromRgba(189, 183, 107, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #8B008B.
+        /// </summary>
+        public static readonly Color DarkMagenta = FromRgba(139, 0, 139, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #556B2F.
+        /// </summary>
+        public static readonly Color DarkOliveGreen = FromRgba(85, 107, 47, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FF8C00.
+        /// </summary>
+        public static readonly Color DarkOrange = FromRgba(255, 140, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #9932CC.
+        /// </summary>
+        public static readonly Color DarkOrchid = FromRgba(153, 50, 204, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #8B0000.
+        /// </summary>
+        public static readonly Color DarkRed = FromRgba(139, 0, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #E9967A.
+        /// </summary>
+        public static readonly Color DarkSalmon = FromRgba(233, 150, 122, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #8FBC8B.
+        /// </summary>
+        public static readonly Color DarkSeaGreen = FromRgba(143, 188, 139, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #483D8B.
+        /// </summary>
+        public static readonly Color DarkSlateBlue = FromRgba(72, 61, 139, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #2F4F4F.
+        /// </summary>
+        public static readonly Color DarkSlateGray = FromRgba(47, 79, 79, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #00CED1.
+        /// </summary>
+        public static readonly Color DarkTurquoise = FromRgba(0, 206, 209, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #9400D3.
+        /// </summary>
+        public static readonly Color DarkViolet = FromRgba(148, 0, 211, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FF1493.
+        /// </summary>
+        public static readonly Color DeepPink = FromRgba(255, 20, 147, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #00BFFF.
+        /// </summary>
+        public static readonly Color DeepSkyBlue = FromRgba(0, 191, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #696969.
+        /// </summary>
+        public static readonly Color DimGray = FromRgba(105, 105, 105, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #1E90FF.
+        /// </summary>
+        public static readonly Color DodgerBlue = FromRgba(30, 144, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #B22222.
+        /// </summary>
+        public static readonly Color Firebrick = FromRgba(178, 34, 34, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFFAF0.
+        /// </summary>
+        public static readonly Color FloralWhite = FromRgba(255, 250, 240, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #228B22.
+        /// </summary>
+        public static readonly Color ForestGreen = FromRgba(34, 139, 34, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FF00FF.
+        /// </summary>
+        public static readonly Color Fuchsia = FromRgba(255, 0, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #DCDCDC.
+        /// </summary>
+        public static readonly Color Gainsboro = FromRgba(220, 220, 220, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #F8F8FF.
+        /// </summary>
+        public static readonly Color GhostWhite = FromRgba(248, 248, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFD700.
+        /// </summary>
+        public static readonly Color Gold = FromRgba(255, 215, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #DAA520.
+        /// </summary>
+        public static readonly Color Goldenrod = FromRgba(218, 165, 32, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #808080.
+        /// </summary>
+        public static readonly Color Gray = FromRgba(128, 128, 128, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #008000.
+        /// </summary>
+        public static readonly Color Green = FromRgba(0, 128, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #ADFF2F.
+        /// </summary>
+        public static readonly Color GreenYellow = FromRgba(173, 255, 47, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #F0FFF0.
+        /// </summary>
+        public static readonly Color Honeydew = FromRgba(240, 255, 240, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FF69B4.
+        /// </summary>
+        public static readonly Color HotPink = FromRgba(255, 105, 180, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #CD5C5C.
+        /// </summary>
+        public static readonly Color IndianRed = FromRgba(205, 92, 92, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #4B0082.
+        /// </summary>
+        public static readonly Color Indigo = FromRgba(75, 0, 130, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFFFF0.
+        /// </summary>
+        public static readonly Color Ivory = FromRgba(255, 255, 240, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #F0E68C.
+        /// </summary>
+        public static readonly Color Khaki = FromRgba(240, 230, 140, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #E6E6FA.
+        /// </summary>
+        public static readonly Color Lavender = FromRgba(230, 230, 250, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFF0F5.
+        /// </summary>
+        public static readonly Color LavenderBlush = FromRgba(255, 240, 245, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #7CFC00.
+        /// </summary>
+        public static readonly Color LawnGreen = FromRgba(124, 252, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFFACD.
+        /// </summary>
+        public static readonly Color LemonChiffon = FromRgba(255, 250, 205, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #ADD8E6.
+        /// </summary>
+        public static readonly Color LightBlue = FromRgba(173, 216, 230, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #F08080.
+        /// </summary>
+        public static readonly Color LightCoral = FromRgba(240, 128, 128, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #E0FFFF.
+        /// </summary>
+        public static readonly Color LightCyan = FromRgba(224, 255, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FAFAD2.
+        /// </summary>
+        public static readonly Color LightGoldenrodYellow = FromRgba(250, 250, 210, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #D3D3D3.
+        /// </summary>
+        public static readonly Color LightGray = FromRgba(211, 211, 211, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #90EE90.
+        /// </summary>
+        public static readonly Color LightGreen = FromRgba(144, 238, 144, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFB6C1.
+        /// </summary>
+        public static readonly Color LightPink = FromRgba(255, 182, 193, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFA07A.
+        /// </summary>
+        public static readonly Color LightSalmon = FromRgba(255, 160, 122, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #20B2AA.
+        /// </summary>
+        public static readonly Color LightSeaGreen = FromRgba(32, 178, 170, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #87CEFA.
+        /// </summary>
+        public static readonly Color LightSkyBlue = FromRgba(135, 206, 250, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #778899.
+        /// </summary>
+        public static readonly Color LightSlateGray = FromRgba(119, 136, 153, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #B0C4DE.
+        /// </summary>
+        public static readonly Color LightSteelBlue = FromRgba(176, 196, 222, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFFFE0.
+        /// </summary>
+        public static readonly Color LightYellow = FromRgba(255, 255, 224, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #00FF00.
+        /// </summary>
+        public static readonly Color Lime = FromRgba(0, 255, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #32CD32.
+        /// </summary>
+        public static readonly Color LimeGreen = FromRgba(50, 205, 50, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FAF0E6.
+        /// </summary>
+        public static readonly Color Linen = FromRgba(250, 240, 230, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FF00FF.
+        /// </summary>
+        public static readonly Color Magenta = FromRgba(255, 0, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #800000.
+        /// </summary>
+        public static readonly Color Maroon = FromRgba(128, 0, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #66CDAA.
+        /// </summary>
+        public static readonly Color MediumAquamarine = FromRgba(102, 205, 170, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #0000CD.
+        /// </summary>
+        public static readonly Color MediumBlue = FromRgba(0, 0, 205, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #BA55D3.
+        /// </summary>
+        public static readonly Color MediumOrchid = FromRgba(186, 85, 211, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #9370DB.
+        /// </summary>
+        public static readonly Color MediumPurple = FromRgba(147, 112, 219, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #3CB371.
+        /// </summary>
+        public static readonly Color MediumSeaGreen = FromRgba(60, 179, 113, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #7B68EE.
+        /// </summary>
+        public static readonly Color MediumSlateBlue = FromRgba(123, 104, 238, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #00FA9A.
+        /// </summary>
+        public static readonly Color MediumSpringGreen = FromRgba(0, 250, 154, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #48D1CC.
+        /// </summary>
+        public static readonly Color MediumTurquoise = FromRgba(72, 209, 204, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #C71585.
+        /// </summary>
+        public static readonly Color MediumVioletRed = FromRgba(199, 21, 133, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #191970.
+        /// </summary>
+        public static readonly Color MidnightBlue = FromRgba(25, 25, 112, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #F5FFFA.
+        /// </summary>
+        public static readonly Color MintCream = FromRgba(245, 255, 250, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFE4E1.
+        /// </summary>
+        public static readonly Color MistyRose = FromRgba(255, 228, 225, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFE4B5.
+        /// </summary>
+        public static readonly Color Moccasin = FromRgba(255, 228, 181, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFDEAD.
+        /// </summary>
+        public static readonly Color NavajoWhite = FromRgba(255, 222, 173, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #000080.
+        /// </summary>
+        public static readonly Color Navy = FromRgba(0, 0, 128, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FDF5E6.
+        /// </summary>
+        public static readonly Color OldLace = FromRgba(253, 245, 230, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #808000.
+        /// </summary>
+        public static readonly Color Olive = FromRgba(128, 128, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #6B8E23.
+        /// </summary>
+        public static readonly Color OliveDrab = FromRgba(107, 142, 35, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFA500.
+        /// </summary>
+        public static readonly Color Orange = FromRgba(255, 165, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FF4500.
+        /// </summary>
+        public static readonly Color OrangeRed = FromRgba(255, 69, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #DA70D6.
+        /// </summary>
+        public static readonly Color Orchid = FromRgba(218, 112, 214, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #EEE8AA.
+        /// </summary>
+        public static readonly Color PaleGoldenrod = FromRgba(238, 232, 170, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #98FB98.
+        /// </summary>
+        public static readonly Color PaleGreen = FromRgba(152, 251, 152, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #AFEEEE.
+        /// </summary>
+        public static readonly Color PaleTurquoise = FromRgba(175, 238, 238, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #DB7093.
+        /// </summary>
+        public static readonly Color PaleVioletRed = FromRgba(219, 112, 147, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFEFD5.
+        /// </summary>
+        public static readonly Color PapayaWhip = FromRgba(255, 239, 213, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFDAB9.
+        /// </summary>
+        public static readonly Color PeachPuff = FromRgba(255, 218, 185, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #CD853F.
+        /// </summary>
+        public static readonly Color Peru = FromRgba(205, 133, 63, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFC0CB.
+        /// </summary>
+        public static readonly Color Pink = FromRgba(255, 192, 203, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #DDA0DD.
+        /// </summary>
+        public static readonly Color Plum = FromRgba(221, 160, 221, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #B0E0E6.
+        /// </summary>
+        public static readonly Color PowderBlue = FromRgba(176, 224, 230, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #800080.
+        /// </summary>
+        public static readonly Color Purple = FromRgba(128, 0, 128, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #663399.
+        /// </summary>
+        public static readonly Color RebeccaPurple = FromRgba(102, 51, 153, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FF0000.
+        /// </summary>
+        public static readonly Color Red = FromRgba(255, 0, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #BC8F8F.
+        /// </summary>
+        public static readonly Color RosyBrown = FromRgba(188, 143, 143, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #4169E1.
+        /// </summary>
+        public static readonly Color RoyalBlue = FromRgba(65, 105, 225, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #8B4513.
+        /// </summary>
+        public static readonly Color SaddleBrown = FromRgba(139, 69, 19, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FA8072.
+        /// </summary>
+        public static readonly Color Salmon = FromRgba(250, 128, 114, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #F4A460.
+        /// </summary>
+        public static readonly Color SandyBrown = FromRgba(244, 164, 96, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #2E8B57.
+        /// </summary>
+        public static readonly Color SeaGreen = FromRgba(46, 139, 87, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFF5EE.
+        /// </summary>
+        public static readonly Color SeaShell = FromRgba(255, 245, 238, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #A0522D.
+        /// </summary>
+        public static readonly Color Sienna = FromRgba(160, 82, 45, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #C0C0C0.
+        /// </summary>
+        public static readonly Color Silver = FromRgba(192, 192, 192, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #87CEEB.
+        /// </summary>
+        public static readonly Color SkyBlue = FromRgba(135, 206, 235, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #6A5ACD.
+        /// </summary>
+        public static readonly Color SlateBlue = FromRgba(106, 90, 205, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #708090.
+        /// </summary>
+        public static readonly Color SlateGray = FromRgba(112, 128, 144, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFFAFA.
+        /// </summary>
+        public static readonly Color Snow = FromRgba(255, 250, 250, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #00FF7F.
+        /// </summary>
+        public static readonly Color SpringGreen = FromRgba(0, 255, 127, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #4682B4.
+        /// </summary>
+        public static readonly Color SteelBlue = FromRgba(70, 130, 180, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #D2B48C.
+        /// </summary>
+        public static readonly Color Tan = FromRgba(210, 180, 140, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #008080.
+        /// </summary>
+        public static readonly Color Teal = FromRgba(0, 128, 128, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #D8BFD8.
+        /// </summary>
+        public static readonly Color Thistle = FromRgba(216, 191, 216, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FF6347.
+        /// </summary>
+        public static readonly Color Tomato = FromRgba(255, 99, 71, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFFFFF.
+        /// </summary>
+        public static readonly Color Transparent = FromRgba(255, 255, 255, 0);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #40E0D0.
+        /// </summary>
+        public static readonly Color Turquoise = FromRgba(64, 224, 208, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #EE82EE.
+        /// </summary>
+        public static readonly Color Violet = FromRgba(238, 130, 238, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #F5DEB3.
+        /// </summary>
+        public static readonly Color Wheat = FromRgba(245, 222, 179, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFFFFF.
+        /// </summary>
+        public static readonly Color White = FromRgba(255, 255, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #F5F5F5.
+        /// </summary>
+        public static readonly Color WhiteSmoke = FromRgba(245, 245, 245, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #FFFF00.
+        /// </summary>
+        public static readonly Color Yellow = FromRgba(255, 255, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="Color"/> matching the W3C definition that has an hex value of #9ACD32.
+        /// </summary>
+        public static readonly Color YellowGreen = FromRgba(154, 205, 50, 255);
+    }
+}

src/ImageSharp/Color/Color.WebSafePalette.cs

@@ -0,0 +1,166 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+
+namespace SixLabors.ImageSharp
+{
+    /// <content>
+    /// Contains the definition of <see cref="WebSafePalette"/>.
+    /// </content>
+    public partial struct Color
+    {
+        private static readonly Lazy<Color[]> WebSafePaletteLazy = new Lazy<Color[]>(CreateWebSafePalette, true);
+
+        /// <summary>
+        /// Gets a collection of named, web safe colors as defined in the CSS Color Module Level 4.
+        /// </summary>
+        public static ReadOnlyMemory<Color> WebSafePalette => WebSafePaletteLazy.Value;
+
+        private static Color[] CreateWebSafePalette() => new[]
+        {
+            AliceBlue,
+            AntiqueWhite,
+            Aqua,
+            Aquamarine,
+            Azure,
+            Beige,
+            Bisque,
+            Black,
+            BlanchedAlmond,
+            Blue,
+            BlueViolet,
+            Brown,
+            BurlyWood,
+            CadetBlue,
+            Chartreuse,
+            Chocolate,
+            Coral,
+            CornflowerBlue,
+            Cornsilk,
+            Crimson,
+            Cyan,
+            DarkBlue,
+            DarkCyan,
+            DarkGoldenrod,
+            DarkGray,
+            DarkGreen,
+            DarkKhaki,
+            DarkMagenta,
+            DarkOliveGreen,
+            DarkOrange,
+            DarkOrchid,
+            DarkRed,
+            DarkSalmon,
+            DarkSeaGreen,
+            DarkSlateBlue,
+            DarkSlateGray,
+            DarkTurquoise,
+            DarkViolet,
+            DeepPink,
+            DeepSkyBlue,
+            DimGray,
+            DodgerBlue,
+            Firebrick,
+            FloralWhite,
+            ForestGreen,
+            Fuchsia,
+            Gainsboro,
+            GhostWhite,
+            Gold,
+            Goldenrod,
+            Gray,
+            Green,
+            GreenYellow,
+            Honeydew,
+            HotPink,
+            IndianRed,
+            Indigo,
+            Ivory,
+            Khaki,
+            Lavender,
+            LavenderBlush,
+            LawnGreen,
+            LemonChiffon,
+            LightBlue,
+            LightCoral,
+            LightCyan,
+            LightGoldenrodYellow,
+            LightGray,
+            LightGreen,
+            LightPink,
+            LightSalmon,
+            LightSeaGreen,
+            LightSkyBlue,
+            LightSlateGray,
+            LightSteelBlue,
+            LightYellow,
+            Lime,
+            LimeGreen,
+            Linen,
+            Magenta,
+            Maroon,
+            MediumAquamarine,
+            MediumBlue,
+            MediumOrchid,
+            MediumPurple,
+            MediumSeaGreen,
+            MediumSlateBlue,
+            MediumSpringGreen,
+            MediumTurquoise,
+            MediumVioletRed,
+            MidnightBlue,
+            MintCream,
+            MistyRose,
+            Moccasin,
+            NavajoWhite,
+            Navy,
+            OldLace,
+            Olive,
+            OliveDrab,
+            Orange,
+            OrangeRed,
+            Orchid,
+            PaleGoldenrod,
+            PaleGreen,
+            PaleTurquoise,
+            PaleVioletRed,
+            PapayaWhip,
+            PeachPuff,
+            Peru,
+            Pink,
+            Plum,
+            PowderBlue,
+            Purple,
+            RebeccaPurple,
+            Red,
+            RosyBrown,
+            RoyalBlue,
+            SaddleBrown,
+            Salmon,
+            SandyBrown,
+            SeaGreen,
+            SeaShell,
+            Sienna,
+            Silver,
+            SkyBlue,
+            SlateBlue,
+            SlateGray,
+            Snow,
+            SpringGreen,
+            SteelBlue,
+            Tan,
+            Teal,
+            Thistle,
+            Tomato,
+            Transparent,
+            Turquoise,
+            Violet,
+            Wheat,
+            White,
+            WhiteSmoke,
+            Yellow,
+            YellowGreen
+        };
+    }
+}

src/ImageSharp/Color/Color.WernerPalette.cs

@@ -0,0 +1,135 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+
+namespace SixLabors.ImageSharp
+{
+    /// <content>
+    /// Contains the definition of <see cref="WernerPalette"/>.
+    /// </content>
+    public partial struct Color
+    {
+        private static readonly Lazy<Color[]> WernerPaletteLazy = new Lazy<Color[]>(CreateWernerPalette, true);
+
+        /// <summary>
+        /// Gets a collection of colors as defined in the original second edition of Werner’s Nomenclature of Colours 1821.
+        /// The hex codes were collected and defined by Nicholas Rougeux <see href="https://www.c82.net/werner"/>.
+        /// </summary>
+        public static ReadOnlyMemory<Color> WernerPalette => WernerPaletteLazy.Value;
+
+        private static Color[] CreateWernerPalette() => new[]
+        {
+            FromHex("#f1e9cd"),
+            FromHex("#f2e7cf"),
+            FromHex("#ece6d0"),
+            FromHex("#f2eacc"),
+            FromHex("#f3e9ca"),
+            FromHex("#f2ebcd"),
+            FromHex("#e6e1c9"),
+            FromHex("#e2ddc6"),
+            FromHex("#cbc8b7"),
+            FromHex("#bfbbb0"),
+            FromHex("#bebeb3"),
+            FromHex("#b7b5ac"),
+            FromHex("#bab191"),
+            FromHex("#9c9d9a"),
+            FromHex("#8a8d84"),
+            FromHex("#5b5c61"),
+            FromHex("#555152"),
+            FromHex("#413f44"),
+            FromHex("#454445"),
+            FromHex("#423937"),
+            FromHex("#433635"),
+            FromHex("#252024"),
+            FromHex("#241f20"),
+            FromHex("#281f3f"),
+            FromHex("#1c1949"),
+            FromHex("#4f638d"),
+            FromHex("#383867"),
+            FromHex("#5c6b8f"),
+            FromHex("#657abb"),
+            FromHex("#6f88af"),
+            FromHex("#7994b5"),
+            FromHex("#6fb5a8"),
+            FromHex("#719ba2"),
+            FromHex("#8aa1a6"),
+            FromHex("#d0d5d3"),
+            FromHex("#8590ae"),
+            FromHex("#3a2f52"),
+            FromHex("#39334a"),
+            FromHex("#6c6d94"),
+            FromHex("#584c77"),
+            FromHex("#533552"),
+            FromHex("#463759"),
+            FromHex("#bfbac0"),
+            FromHex("#77747f"),
+            FromHex("#4a475c"),
+            FromHex("#b8bfaf"),
+            FromHex("#b2b599"),
+            FromHex("#979c84"),
+            FromHex("#5d6161"),
+            FromHex("#61ac86"),
+            FromHex("#a4b6a7"),
+            FromHex("#adba98"),
+            FromHex("#93b778"),
+            FromHex("#7d8c55"),
+            FromHex("#33431e"),
+            FromHex("#7c8635"),
+            FromHex("#8e9849"),
+            FromHex("#c2c190"),
+            FromHex("#67765b"),
+            FromHex("#ab924b"),
+            FromHex("#c8c76f"),
+            FromHex("#ccc050"),
+            FromHex("#ebdd99"),
+            FromHex("#ab9649"),
+            FromHex("#dbc364"),
+            FromHex("#e6d058"),
+            FromHex("#ead665"),
+            FromHex("#d09b2c"),
+            FromHex("#a36629"),
+            FromHex("#a77d35"),
+            FromHex("#f0d696"),
+            FromHex("#d7c485"),
+            FromHex("#f1d28c"),
+            FromHex("#efcc83"),
+            FromHex("#f3daa7"),
+            FromHex("#dfa837"),
+            FromHex("#ebbc71"),
+            FromHex("#d17c3f"),
+            FromHex("#92462f"),
+            FromHex("#be7249"),
+            FromHex("#bb603c"),
+            FromHex("#c76b4a"),
+            FromHex("#a75536"),
+            FromHex("#b63e36"),
+            FromHex("#b5493a"),
+            FromHex("#cd6d57"),
+            FromHex("#711518"),
+            FromHex("#e9c49d"),
+            FromHex("#eedac3"),
+            FromHex("#eecfbf"),
+            FromHex("#ce536b"),
+            FromHex("#b74a70"),
+            FromHex("#b7757c"),
+            FromHex("#612741"),
+            FromHex("#7a4848"),
+            FromHex("#3f3033"),
+            FromHex("#8d746f"),
+            FromHex("#4d3635"),
+            FromHex("#6e3b31"),
+            FromHex("#864735"),
+            FromHex("#553d3a"),
+            FromHex("#613936"),
+            FromHex("#7a4b3a"),
+            FromHex("#946943"),
+            FromHex("#c39e6d"),
+            FromHex("#513e32"),
+            FromHex("#8b7859"),
+            FromHex("#9b856b"),
+            FromHex("#766051"),
+            FromHex("#453b32")
+        };
+    }
+}

src/ImageSharp/Color/Color.cs

@@ -0,0 +1,186 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Buffers.Binary;
+using System.Globalization;
+using System.Numerics;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+using SixLabors.ImageSharp.PixelFormats;
+
+namespace SixLabors.ImageSharp
+{
+    /// <summary>
+    /// Represents a color value that is convertible to any <see cref="IPixel{TSelf}"/> type.
+    /// </summary>
+    /// <remarks>
+    /// The internal representation and layout of this structure is hidden by intention.
+    /// It's not serializable, and it should not be considered as part of a contract.
+    /// Unlike System.Drawing.Color, <see cref="Color"/> has to be converted to a specific pixel value
+    /// to query the color components.
+    /// </remarks>
+    public readonly partial struct Color : IEquatable<Color>
+    {
+        private readonly Rgba64 data;
+
+        [MethodImpl(InliningOptions.ShortMethod)]
+        private Color(byte r, byte g, byte b, byte a)
+        {
+            this.data = new Rgba64(
+                ImageMaths.UpscaleFrom8BitTo16Bit(r),
+                ImageMaths.UpscaleFrom8BitTo16Bit(g),
+                ImageMaths.UpscaleFrom8BitTo16Bit(b),
+                ImageMaths.UpscaleFrom8BitTo16Bit(a));
+        }
+
+        [MethodImpl(InliningOptions.ShortMethod)]
+        private Color(byte r, byte g, byte b)
+        {
+            this.data = new Rgba64(
+                ImageMaths.UpscaleFrom8BitTo16Bit(r),
+                ImageMaths.UpscaleFrom8BitTo16Bit(g),
+                ImageMaths.UpscaleFrom8BitTo16Bit(b),
+                ushort.MaxValue);
+        }
+
+        /// <summary>
+        /// Checks whether two <see cref="Color"/> structures are equal.
+        /// </summary>
+        /// <param name="left">The left hand <see cref="Color"/> operand.</param>
+        /// <param name="right">The right hand <see cref="Color"/> operand.</param>
+        /// <returns>
+        /// True if the <paramref name="left"/> parameter is equal to the <paramref name="right"/> parameter;
+        /// otherwise, false.
+        /// </returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static bool operator ==(Color left, Color right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Checks whether two <see cref="Color"/> structures are equal.
+        /// </summary>
+        /// <param name="left">The left hand <see cref="Color"/> operand.</param>
+        /// <param name="right">The right hand <see cref="Color"/> operand.</param>
+        /// <returns>
+        /// True if the <paramref name="left"/> parameter is not equal to the <paramref name="right"/> parameter;
+        /// otherwise, false.
+        /// </returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static bool operator !=(Color left, Color right)
+        {
+            return !left.Equals(right);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="Color"/> from RGBA bytes.
+        /// </summary>
+        /// <param name="r">The red component (0-255).</param>
+        /// <param name="g">The green component (0-255).</param>
+        /// <param name="b">The blue component (0-255).</param>
+        /// <param name="a">The alpha component (0-255).</param>
+        /// <returns>The <see cref="Color"/>.</returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static Color FromRgba(byte r, byte g, byte b, byte a) => new Color(r, g, b, a);
+
+        /// <summary>
+        /// Creates a <see cref="Color"/> from RGB bytes.
+        /// </summary>
+        /// <param name="r">The red component (0-255).</param>
+        /// <param name="g">The green component (0-255).</param>
+        /// <param name="b">The blue component (0-255).</param>
+        /// <returns>The <see cref="Color"/>.</returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static Color FromRgb(byte r, byte g, byte b) => new Color(r, g, b);
+
+        /// <summary>
+        /// Creates a new <see cref="Color"/> instance from the string representing a color in hexadecimal form.
+        /// </summary>
+        /// <param name="hex">
+        /// The hexadecimal representation of the combined color components arranged
+        /// in rgb, rgba, rrggbb, or rrggbbaa format to match web syntax.
+        /// </param>
+        /// <returns>Returns a <see cref="Color"/> that represents the color defined by the provided RGBA hex string.</returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static Color FromHex(string hex)
+        {
+            Rgba32 rgba = Rgba32.FromHex(hex);
+
+            return new Color(rgba);
+        }
+
+        /// <summary>
+        /// Alters the alpha channel of the color, returning a new instance.
+        /// </summary>
+        /// <param name="alpha">The new value of alpha [0..1].</param>
+        /// <returns>The color having it's alpha channel altered.</returns>
+        public Color WithAlpha(float alpha)
+        {
+            Vector4 v = (Vector4)this;
+            v.W = alpha;
+            return new Color(v);
+        }
+
+        /// <summary>
+        /// Gets the hexadecimal representation of the color instance in rrggbbaa form.
+        /// </summary>
+        /// <returns>A hexadecimal string representation of the value.</returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public string ToHex() => this.data.ToRgba32().ToHex();
+
+        /// <inheritdoc />
+        public override string ToString() => this.ToHex();
+
+        /// <summary>
+        /// Converts the color instance to an <see cref="IPixel{TSelf}"/>
+        /// implementation defined by <typeparamref name="TPixel"/>.
+        /// </summary>
+        /// <typeparam name="TPixel">The pixel type to convert to.</typeparam>
+        /// <returns>The pixel value.</returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public TPixel ToPixel<TPixel>()
+            where TPixel : struct, IPixel<TPixel>
+        {
+            TPixel pixel = default;
+            pixel.FromRgba64(this.data);
+            return pixel;
+        }
+
+        /// <inheritdoc />
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public bool Equals(Color other)
+        {
+            return this.data.PackedValue == other.data.PackedValue;
+        }
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            return obj is Color other && this.Equals(other);
+        }
+
+        /// <inheritdoc />
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public override int GetHashCode()
+        {
+            return this.data.PackedValue.GetHashCode();
+        }
+
+        /// <summary>
+        /// Bulk convert a span of <see cref="Color"/> to a span of a specified pixel type.
+        /// </summary>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        internal static void ToPixel<TPixel>(
+            Configuration configuration,
+            ReadOnlySpan<Color> source,
+            Span<TPixel> destination)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            ReadOnlySpan<Rgba64> rgba64Span = MemoryMarshal.Cast<Color, Rgba64>(source);
+            PixelOperations<TPixel>.Instance.FromRgba64(Configuration.Default, rgba64Span, destination);
+        }
+    }
+}

src/ImageSharp/ColorSpaces/CieLch.cs

@@ -13,15 +13,15 @@ namespace SixLabors.ImageSharp.ColorSpaces
     /// </summary>
     public readonly struct CieLch : IEquatable<CieLch>
     {
-        private static readonly Vector3 Min = new Vector3(0, -200, 0);
-        private static readonly Vector3 Max = new Vector3(100, 200, 360);
-
         /// <summary>
         /// D50 standard illuminant.
         /// Used when reference white is not specified explicitly.
         /// </summary>
         public static readonly CieXyz DefaultWhitePoint = Illuminants.D50;
 
+        private static readonly Vector3 Min = new Vector3(0, -200, 0);
+        private static readonly Vector3 Max = new Vector3(100, 200, 360);
+
         /// <summary>
         /// Gets the lightness dimension.
         /// <remarks>A value ranging between 0 (black), 100 (diffuse white) or higher (specular white).</remarks>

src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs

@@ -8,7 +8,7 @@ using System.Runtime.CompilerServices;
 namespace SixLabors.ImageSharp.ColorSpaces
 {
     /// <summary>
-    /// Represents the coordinates of CIEXY chromaticity space
+    /// Represents the coordinates of CIEXY chromaticity space.
     /// </summary>
     public readonly struct CieXyChromaticityCoordinates : IEquatable<CieXyChromaticityCoordinates>
     {

src/ImageSharp/ColorSpaces/CieXyz.cs

@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         public readonly float Y;
 
         /// <summary>
-        /// Gets the Z component. Quasi-equal to blue stimulation, or the S cone response
+        /// Gets the Z component. Quasi-equal to blue stimulation, or the S cone response.
         /// <remarks>A value usually ranging between 0 and 1.</remarks>
         /// </summary>
         public readonly float Z;

src/ImageSharp/ColorSpaces/Cmyk.cs

@@ -78,7 +78,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         public static bool operator ==(Cmyk left, Cmyk right) => left.Equals(right);
 
         /// <summary>
-        /// Compares two <see cref="Cmyk"/> objects for inequality
+        /// Compares two <see cref="Cmyk"/> objects for inequality.
         /// </summary>
         /// <param name="left">The <see cref="Cmyk"/> on the left side of the operand.</param>
         /// <param name="right">The <see cref="Cmyk"/> on the right side of the operand.</param>

src/ImageSharp/ColorSpaces/Companding/GammaCompanding.cs

@@ -7,7 +7,7 @@ using System.Runtime.CompilerServices;
 namespace SixLabors.ImageSharp.ColorSpaces.Companding
 {
     /// <summary>
-    /// Implements gamma companding
+    /// Implements gamma companding.
     /// </summary>
     /// <remarks>
     /// <see href="http://www.brucelindbloom.com/index.html?Eqn_RGB_to_XYZ.html"/>

src/ImageSharp/ColorSpaces/Companding/LCompanding.cs

@@ -8,7 +8,7 @@ using SixLabors.ImageSharp.ColorSpaces.Conversion;
 namespace SixLabors.ImageSharp.ColorSpaces.Companding
 {
     /// <summary>
-    /// Implements L* companding
+    /// Implements L* companding.
     /// </summary>
     /// <remarks>
     /// For more info see:
@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Companding
         /// <returns>The <see cref="float"/> representing the linear channel value.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
         public static float Expand(float channel)
-            => channel <= 0.08 ? 100 * channel / CieConstants.Kappa : ImageMaths.Pow3((channel + 0.16F) / 1.16F);
+            => channel <= 0.08F ? (100F * channel) / CieConstants.Kappa : ImageMaths.Pow3((channel + 0.16F) / 1.16F);
 
         /// <summary>
         /// Compresses an uncompanded channel (linear) to its nonlinear equivalent.
@@ -33,6 +33,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Companding
         /// <returns>The <see cref="float"/> representing the nonlinear channel value.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
         public static float Compress(float channel)
-            => channel <= CieConstants.Epsilon ? channel * CieConstants.Kappa / 100F : MathF.Pow(1.16F * channel, 0.3333333F) - 0.16F;
+            => channel <= CieConstants.Epsilon ? (channel * CieConstants.Kappa) / 100F : (1.16F * MathF.Pow(channel, 0.3333333F)) - 0.16F;
     }
 }

src/ImageSharp/ColorSpaces/Companding/Rec2020Companding.cs

@@ -7,14 +7,19 @@ using System.Runtime.CompilerServices;
 namespace SixLabors.ImageSharp.ColorSpaces.Companding
 {
     /// <summary>
-    /// Implements Rec. 2020 companding function (for 12-bits).
+    /// Implements Rec. 2020 companding function.
     /// </summary>
     /// <remarks>
     /// <see href="http://en.wikipedia.org/wiki/Rec._2020"/>
-    /// For 10-bits, companding is identical to <see cref="Rec709Companding"/>
     /// </remarks>
     public static class Rec2020Companding
     {
+        private const float Alpha = 1.09929682680944F;
+        private const float AlphaMinusOne = Alpha - 1F;
+        private const float Beta = 0.018053968510807F;
+        private const float InverseBeta = Beta * 4.5F;
+        private const float Epsilon = 1 / 0.45F;
+
         /// <summary>
         /// Expands a companded channel to its linear equivalent with respect to the energy.
         /// </summary>
@@ -22,7 +27,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Companding
         /// <returns>The <see cref="float"/> representing the linear channel value.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
         public static float Expand(float channel)
-            => channel < 0.08145F ? channel / 4.5F : MathF.Pow((channel + 0.0993F) / 1.0993F, 2.222222F);
+            => channel < InverseBeta ? channel / 4.5F : MathF.Pow((channel + AlphaMinusOne) / Alpha, Epsilon);
 
         /// <summary>
         /// Compresses an uncompanded channel (linear) to its nonlinear equivalent.
@@ -31,6 +36,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Companding
         /// <returns>The <see cref="float"/> representing the nonlinear channel value.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
         public static float Compress(float channel)
-            => channel < 0.0181F ? 4500F * channel : (1.0993F * channel) - 0.0993F;
+            => channel < Beta ? 4.5F * channel : (Alpha * MathF.Pow(channel, 0.45F)) - AlphaMinusOne;
     }
 }

src/ImageSharp/ColorSpaces/Companding/Rec709Companding.cs

@@ -14,6 +14,8 @@ namespace SixLabors.ImageSharp.ColorSpaces.Companding
     /// </remarks>
     public static class Rec709Companding
     {
+        private const float Epsilon = 1 / 0.45F;
+
         /// <summary>
         /// Expands a companded channel to its linear equivalent with respect to the energy.
         /// </summary>
@@ -21,7 +23,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Companding
         /// <returns>The <see cref="float"/> representing the linear channel value.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
         public static float Expand(float channel)
-            => channel < 0.081F ? channel / 4.5F : MathF.Pow((channel + 0.099F) / 1.099F, 2.222222F);
+            => channel < 0.081F ? channel / 4.5F : MathF.Pow((channel + 0.099F) / 1.099F, Epsilon);
 
         /// <summary>
         /// Compresses an uncompanded channel (linear) to its nonlinear equivalent.
@@ -30,6 +32,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Companding
         /// <returns>The <see cref="float"/> representing the nonlinear channel value.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
         public static float Compress(float channel)
-            => channel < 0.018F ? 4500F * channel : (1.099F * channel) - 0.099F;
+            => channel < 0.018F ? 4.5F * channel : (1.099F * MathF.Pow(channel, 0.45F)) - 0.099F;
     }
 }

src/ImageSharp/ColorSpaces/Companding/SRgbCompanding.cs

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 namespace SixLabors.ImageSharp.ColorSpaces.Companding
 {
     /// <summary>
-    /// Implements sRGB companding
+    /// Implements sRGB companding.
     /// </summary>
     /// <remarks>
     /// For more info see:
@@ -30,9 +30,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Companding
             for (int i = 0; i < vectors.Length; i++)
             {
                 ref Vector4 v = ref Unsafe.Add(ref baseRef, i);
-                v.X = Expand(v.X);
-                v.Y = Expand(v.Y);
-                v.Z = Expand(v.Z);
+                Expand(ref v);
             }
         }
 
@@ -48,9 +46,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Companding
             for (int i = 0; i < vectors.Length; i++)
             {
                 ref Vector4 v = ref Unsafe.Add(ref baseRef, i);
-                v.X = Compress(v.X);
-                v.Y = Compress(v.Y);
-                v.Z = Compress(v.Z);
+                Compress(ref v);
             }
         }
 
@@ -58,17 +54,25 @@ namespace SixLabors.ImageSharp.ColorSpaces.Companding
         /// Expands a companded vector to its linear equivalent with respect to the energy.
         /// </summary>
         /// <param name="vector">The vector.</param>
-        /// <returns>The <see cref="Vector4"/> representing the linear channel values.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
-        public static Vector4 Expand(Vector4 vector) => new Vector4(Expand(vector.X), Expand(vector.Y), Expand(vector.Z), vector.W);
+        public static void Expand(ref Vector4 vector)
+        {
+            vector.X = Expand(vector.X);
+            vector.Y = Expand(vector.Y);
+            vector.Z = Expand(vector.Z);
+        }
 
         /// <summary>
         /// Compresses an uncompanded vector (linear) to its nonlinear equivalent.
         /// </summary>
         /// <param name="vector">The vector.</param>
-        /// <returns>The <see cref="Vector4"/> representing the nonlinear channel values.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
-        public static Vector4 Compress(Vector4 vector) => new Vector4(Compress(vector.X), Compress(vector.Y), Compress(vector.Z), vector.W);
+        public static void Compress(ref Vector4 vector)
+        {
+            vector.X = Compress(vector.X);
+            vector.Y = Compress(vector.Y);
+            vector.Z = Compress(vector.Z);
+        }
 
         /// <summary>
         /// Expands a companded channel to its linear equivalent with respect to the energy.

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs

@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         private static readonly CieLchToCieLabConverter CieLchToCieLabConverter = new CieLchToCieLabConverter();
 
         /// <summary>
-        /// Converts a <see cref="CieLch"/> into a <see cref="CieLab"/>
+        /// Converts a <see cref="CieLch"/> into a <see cref="CieLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
@@ -28,12 +28,11 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             // Conversion (perserving white point)
             CieLab unadapted = CieLchToCieLabConverter.Convert(color);
 
-            // Adaptation
             return this.Adapt(unadapted);
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="CieLab"/>
+        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="CieLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -54,7 +53,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLchuv"/> into a <see cref="CieLab"/>
+        /// Converts a <see cref="CieLchuv"/> into a <see cref="CieLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
@@ -66,7 +65,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="CieLab"/>
+        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="CieLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -87,7 +86,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLuv"/> into a <see cref="CieLab"/>
+        /// Converts a <see cref="CieLuv"/> into a <see cref="CieLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
@@ -99,7 +98,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="CieLab"/>
+        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="CieLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -120,7 +119,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyy"/> into a <see cref="CieLab"/>
+        /// Converts a <see cref="CieXyy"/> into a <see cref="CieLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
@@ -132,7 +131,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieLab"/>
+        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -159,10 +158,8 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieLab"/></returns>
         public CieLab ToCieLab(in CieXyz color)
         {
-            // Adaptation
             CieXyz adapted = this.Adapt(color, this.whitePoint, this.targetLabWhitePoint);
 
-            // Conversion
             return this.cieXyzToCieLabConverter.Convert(adapted);
         }
 
@@ -199,7 +196,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieLab"/>
+        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -220,7 +217,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsl"/> into a <see cref="CieLab"/>
+        /// Converts a <see cref="Hsl"/> into a <see cref="CieLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
@@ -232,7 +229,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieLab"/>
+        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -253,7 +250,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsv"/> into a <see cref="CieLab"/>
+        /// Converts a <see cref="Hsv"/> into a <see cref="CieLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
@@ -264,7 +261,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieLab"/>
+        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -285,7 +282,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="HunterLab"/> into a <see cref="CieLab"/>
+        /// Converts a <see cref="HunterLab"/> into a <see cref="CieLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
@@ -297,7 +294,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieLab"/>
+        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -318,7 +315,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Lms"/> into a <see cref="CieLab"/>
+        /// Converts a <see cref="Lms"/> into a <see cref="CieLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
@@ -330,7 +327,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieLab"/>
+        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -351,7 +348,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="LinearRgb"/> into a <see cref="CieLab"/>
+        /// Converts a <see cref="LinearRgb"/> into a <see cref="CieLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
@@ -363,7 +360,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLab"/>
+        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -384,7 +381,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Rgb"/> into a <see cref="CieLab"/>
+        /// Converts a <see cref="Rgb"/> into a <see cref="CieLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
@@ -396,7 +393,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLab"/>
+        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -429,7 +426,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieLab"/>
+        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLch.cs

@@ -26,15 +26,13 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieLch"/></returns>
         public CieLch ToCieLch(in CieLab color)
         {
-            // Adaptation
             CieLab adapted = this.Adapt(color);
 
-            // Conversion
             return CieLabToCieLchConverter.Convert(adapted);
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="CieLch"/>
+        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="CieLch"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -55,7 +53,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLchuv"/> into a <see cref="CieLch"/>
+        /// Converts a <see cref="CieLchuv"/> into a <see cref="CieLch"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
@@ -67,7 +65,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="CieLch"/>
+        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="CieLch"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -88,7 +86,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLuv"/> into a <see cref="CieLch"/>
+        /// Converts a <see cref="CieLuv"/> into a <see cref="CieLch"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
@@ -100,7 +98,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="CieLch"/>
+        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="CieLch"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -121,7 +119,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyy"/> into a <see cref="CieLch"/>
+        /// Converts a <see cref="CieXyy"/> into a <see cref="CieLch"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
@@ -133,7 +131,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieLch"/>
+        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieLch"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -166,7 +164,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="CieLch"/>
+        /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="CieLch"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -187,7 +185,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Cmyk"/> into a <see cref="CieLch"/>
+        /// Converts a <see cref="Cmyk"/> into a <see cref="CieLch"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
@@ -198,7 +196,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieLch"/>
+        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieLch"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -219,7 +217,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsl"/> into a <see cref="CieLch"/>
+        /// Converts a <see cref="Hsl"/> into a <see cref="CieLch"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
@@ -231,7 +229,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieLch"/>
+        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieLch"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -252,7 +250,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsv"/> into a <see cref="CieLch"/>
+        /// Converts a <see cref="Hsv"/> into a <see cref="CieLch"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
@@ -264,7 +262,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieLch"/>
+        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieLch"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -285,7 +283,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="HunterLab"/> into a <see cref="CieLch"/>
+        /// Converts a <see cref="HunterLab"/> into a <see cref="CieLch"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
@@ -297,7 +295,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieLch"/>
+        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieLch"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -318,7 +316,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="LinearRgb"/> into a <see cref="CieLch"/>
+        /// Converts a <see cref="LinearRgb"/> into a <see cref="CieLch"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
@@ -330,7 +328,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLch"/>
+        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLch"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -351,7 +349,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Lms"/> into a <see cref="CieLch"/>
+        /// Converts a <see cref="Lms"/> into a <see cref="CieLch"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
@@ -363,7 +361,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieLch"/>
+        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieLch"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -384,7 +382,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Rgb"/> into a <see cref="CieLch"/>
+        /// Converts a <see cref="Rgb"/> into a <see cref="CieLch"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
@@ -396,7 +394,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="CieLch"/>
+        /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="CieLch"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -417,7 +415,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="YCbCr"/> into a <see cref="CieLch"/>
+        /// Converts a <see cref="YCbCr"/> into a <see cref="CieLch"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
@@ -429,7 +427,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieLch"/>
+        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieLch"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLchuv.cs

@@ -32,7 +32,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="CieLchuv"/>
+        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -53,7 +53,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLch"/> into a <see cref="CieLchuv"/>
+        /// Converts a <see cref="CieLch"/> into a <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
@@ -65,7 +65,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="CieLchuv"/>
+        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -86,21 +86,19 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLuv"/> into a <see cref="CieLchuv"/>
+        /// Converts a <see cref="CieLuv"/> into a <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
         public CieLchuv ToCieLchuv(in CieLuv color)
         {
-            // Adaptation
             CieLuv adapted = this.Adapt(color);
 
-            // Conversion
             return CieLuvToCieLchuvConverter.Convert(adapted);
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="CieLchuv"/>
+        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -121,7 +119,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyy"/> into a <see cref="CieLchuv"/>
+        /// Converts a <see cref="CieXyy"/> into a <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
@@ -133,7 +131,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieLchuv"/>
+        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -154,7 +152,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyz"/> into a <see cref="CieLchuv"/>
+        /// Converts a <see cref="CieXyz"/> into a <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
@@ -166,7 +164,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="CieLchuv"/>
+        /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -187,7 +185,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Cmyk"/> into a <see cref="CieLchuv"/>
+        /// Converts a <see cref="Cmyk"/> into a <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
@@ -199,7 +197,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieLchuv"/>
+        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -220,7 +218,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsl"/> into a <see cref="CieLchuv"/>
+        /// Converts a <see cref="Hsl"/> into a <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
@@ -253,7 +251,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsv"/> into a <see cref="CieLchuv"/>
+        /// Converts a <see cref="Hsv"/> into a <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
@@ -265,7 +263,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieLchuv"/>
+        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -286,7 +284,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="HunterLab"/> into a <see cref="CieLchuv"/>
+        /// Converts a <see cref="HunterLab"/> into a <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
@@ -298,7 +296,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieLchuv"/>
+        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -319,7 +317,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="LinearRgb"/> into a <see cref="CieLchuv"/>
+        /// Converts a <see cref="LinearRgb"/> into a <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
@@ -331,7 +329,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLchuv"/>
+        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -352,7 +350,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Lms"/> into a <see cref="CieLchuv"/>
+        /// Converts a <see cref="Lms"/> into a <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
@@ -364,7 +362,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieLchuv"/>
+        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -385,7 +383,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Rgb"/> into a <see cref="CieLchuv"/>
+        /// Converts a <see cref="Rgb"/> into a <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
@@ -397,7 +395,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="CieLchuv"/>
+        /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -418,7 +416,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="YCbCr"/> into a <see cref="CieLchuv"/>
+        /// Converts a <see cref="YCbCr"/> into a <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
@@ -429,7 +427,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieLchuv"/>
+        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieLchuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLuv.cs

@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         private static readonly CieLchuvToCieLuvConverter CieLchuvToCieLuvConverter = new CieLchuvToCieLuvConverter();
 
         /// <summary>
-        /// Converts a <see cref="CieLab"/> into a <see cref="CieLuv"/>
+        /// Converts a <see cref="CieLab"/> into a <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
@@ -28,7 +28,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="CieLuv"/>
+        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -49,7 +49,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLch"/> into a <see cref="CieLuv"/>
+        /// Converts a <see cref="CieLch"/> into a <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
@@ -60,7 +60,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="CieLuv"/>
+        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -81,7 +81,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLchuv"/> into a <see cref="CieLuv"/>
+        /// Converts a <see cref="CieLchuv"/> into a <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
@@ -95,7 +95,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="CieLuv"/>
+        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -116,7 +116,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyy"/> into a <see cref="CieLuv"/>
+        /// Converts a <see cref="CieXyy"/> into a <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
@@ -127,7 +127,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieLuv"/>
+        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -148,7 +148,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyz"/> into a <see cref="CieLuv"/>
+        /// Converts a <see cref="CieXyz"/> into a <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
@@ -162,7 +162,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="CieLuv"/>
+        /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -183,7 +183,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Cmyk"/> into a <see cref="CieLuv"/>
+        /// Converts a <see cref="Cmyk"/> into a <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
@@ -194,7 +194,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieLuv"/>
+        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -226,7 +226,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieLuv"/>
+        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -247,7 +247,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsv"/> into a <see cref="CieLuv"/>
+        /// Converts a <see cref="Hsv"/> into a <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
@@ -258,7 +258,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieLuv"/>
+        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -279,7 +279,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="HunterLab"/> into a <see cref="CieLuv"/>
+        /// Converts a <see cref="HunterLab"/> into a <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
@@ -290,7 +290,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieLuv"/>
+        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -311,7 +311,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Lms"/> into a <see cref="CieLuv"/>
+        /// Converts a <see cref="Lms"/> into a <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
@@ -322,7 +322,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieLuv"/>
+        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -343,7 +343,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="LinearRgb"/> into a <see cref="CieLuv"/>
+        /// Converts a <see cref="LinearRgb"/> into a <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
@@ -354,7 +354,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLuv"/>
+        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -375,7 +375,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Rgb"/> into a <see cref="CieLuv"/>
+        /// Converts a <see cref="Rgb"/> into a <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
@@ -386,7 +386,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="CieLuv"/>
+        /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -407,7 +407,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="YCbCr"/> into a <see cref="CieLuv"/>
+        /// Converts a <see cref="YCbCr"/> into a <see cref="CieLuv"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
@@ -418,10 +418,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieLuv"/>
+        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieLuv"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<YCbCr> source, Span<CieLuv> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyz.cs

@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         private LinearRgbToCieXyzConverter linearRgbToCieXyzConverter;
 
         /// <summary>
-        /// Converts a <see cref="CieLab"/> into a <see cref="CieXyz"/>
+        /// Converts a <see cref="CieLab"/> into a <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
@@ -38,7 +38,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="CieXyz"/>
+        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLch"/> into a <see cref="CieXyz"/>
+        /// Converts a <see cref="CieLch"/> into a <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
@@ -73,7 +73,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="CieXyz"/>
+        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -94,7 +94,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLuv"/> into a <see cref="CieXyz"/>
+        /// Converts a <see cref="CieLuv"/> into a <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
@@ -108,7 +108,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="CieXyz"/>
+        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -143,7 +143,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="CieXyz"/>
+        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -164,7 +164,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyy"/> into a <see cref="CieXyz"/>
+        /// Converts a <see cref="CieXyy"/> into a <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
@@ -175,7 +175,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieXyz"/>
+        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -196,20 +196,19 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Cmyk"/> into a <see cref="CieXyz"/>
+        /// Converts a <see cref="Cmyk"/> into a <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(in Cmyk color)
         {
-            // Conversion
             var rgb = this.ToRgb(color);
 
             return this.ToCieXyz(rgb);
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieXyz"/>
+        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -230,23 +229,22 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsl"/> into a <see cref="CieXyz"/>
+        /// Converts a <see cref="Hsl"/> into a <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(in Hsl color)
         {
-            // Conversion
             var rgb = this.ToRgb(color);
 
             return this.ToCieXyz(rgb);
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieXyz"/>
+        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieXyz"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<Hsl> source, Span<CieXyz> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -264,7 +262,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsv"/> into a <see cref="CieXyz"/>
+        /// Converts a <see cref="Hsv"/> into a <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
@@ -277,7 +275,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieXyz"/>
+        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -298,21 +296,19 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="HunterLab"/> into a <see cref="CieXyz"/>
+        /// Converts a <see cref="HunterLab"/> into a <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(in HunterLab color)
         {
-            // Conversion
             CieXyz unadapted = HunterLabToCieXyzConverter.Convert(color);
 
-            // Adaptation
             return this.Adapt(unadapted, color.WhitePoint);
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieXyz"/>
+        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -333,7 +329,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="LinearRgb"/> into a <see cref="CieXyz"/>
+        /// Converts a <see cref="LinearRgb"/> into a <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
@@ -343,15 +339,14 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
             LinearRgbToCieXyzConverter converter = this.GetLinearRgbToCieXyzConverter(color.WorkingSpace);
             CieXyz unadapted = converter.Convert(color);
 
-            // Adaptation
             return this.Adapt(unadapted, color.WorkingSpace.WhitePoint);
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieXyz"/>
+        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieXyz"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<LinearRgb> source, Span<CieXyz> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -369,18 +364,17 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Lms"/> into a <see cref="CieXyz"/>
+        /// Converts a <see cref="Lms"/> into a <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(in Lms color)
         {
-            // Conversion
             return this.cieXyzAndLmsConverter.Convert(color);
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieXyz"/>
+        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -440,7 +434,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(in YCbCr color)
         {
-            // Conversion
             var rgb = this.ToRgb(color);
 
             return this.ToCieXyz(rgb);
@@ -472,7 +465,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="workingSpace">The source working space</param>
         /// <returns>The <see cref="LinearRgbToCieXyzConverter"/></returns>
-        private LinearRgbToCieXyzConverter GetLinearRgbToCieXyzConverter(RgbWorkingSpaceBase workingSpace)
+        private LinearRgbToCieXyzConverter GetLinearRgbToCieXyzConverter(RgbWorkingSpace workingSpace)
         {
             if (this.linearRgbToCieXyzConverter?.SourceWorkingSpace.Equals(workingSpace) == true)
             {

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Cmyk.cs

@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         private static readonly CmykAndRgbConverter CmykAndRgbConverter = new CmykAndRgbConverter();
 
         /// <summary>
-        /// Converts a <see cref="CieLab"/> into a <see cref="Cmyk"/>
+        /// Converts a <see cref="CieLab"/> into a <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="Cmyk"/>
+        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -50,7 +50,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLch"/> into a <see cref="Cmyk"/>
+        /// Converts a <see cref="CieLch"/> into a <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
@@ -62,7 +62,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="Cmyk"/>
+        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -149,7 +149,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyy"/> into a <see cref="Cmyk"/>
+        /// Converts a <see cref="CieXyy"/> into a <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
@@ -161,7 +161,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="Cmyk"/>
+        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -182,7 +182,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyz"/> into a <see cref="Cmyk"/>
+        /// Converts a <see cref="CieXyz"/> into a <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
@@ -215,7 +215,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsl"/> into a <see cref="Cmyk"/>
+        /// Converts a <see cref="Hsl"/> into a <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
@@ -227,7 +227,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="Cmyk"/>
+        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -248,7 +248,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsv"/> into a <see cref="Cmyk"/>
+        /// Converts a <see cref="Hsv"/> into a <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
@@ -260,7 +260,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="Cmyk"/>
+        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -281,7 +281,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="HunterLab"/> into a <see cref="Cmyk"/>
+        /// Converts a <see cref="HunterLab"/> into a <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
@@ -293,7 +293,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="Cmyk"/>
+        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -314,7 +314,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="LinearRgb"/> into a <see cref="Cmyk"/>
+        /// Converts a <see cref="LinearRgb"/> into a <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
@@ -326,7 +326,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="Cmyk"/>
+        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -347,7 +347,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Lms"/> into a <see cref="Cmyk"/>
+        /// Converts a <see cref="Lms"/> into a <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
@@ -359,9 +359,9 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="Cmyk"/>
+        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="Cmyk"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
+        /// <param name="source">The span to the source colors,</param>
         /// <param name="destination">The span to the destination colors</param>
         public void Convert(ReadOnlySpan<Lms> source, Span<Cmyk> destination)
         {
@@ -380,7 +380,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Rgb"/> into a <see cref="Cmyk"/>
+        /// Converts a <see cref="Rgb"/> into a <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
@@ -408,7 +408,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="YCbCr"/> into a <see cref="Cmyk"/>
+        /// Converts a <see cref="YCbCr"/> into a <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
@@ -420,7 +420,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="Cmyk"/>
+        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsl.cs

@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         private static readonly HslAndRgbConverter HslAndRgbConverter = new HslAndRgbConverter();
 
         /// <summary>
-        /// Converts a <see cref="CieLab"/> into a <see cref="Hsl"/>
+        /// Converts a <see cref="CieLab"/> into a <see cref="Hsl"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="Hsl"/>
+        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="Hsl"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -50,7 +50,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLch"/> into a <see cref="Hsl"/>
+        /// Converts a <see cref="CieLch"/> into a <see cref="Hsl"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
@@ -62,7 +62,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="Hsl"/>
+        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="Hsl"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -83,7 +83,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLchuv"/> into a <see cref="Hsl"/>
+        /// Converts a <see cref="CieLchuv"/> into a <see cref="Hsl"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
@@ -95,7 +95,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="Hsl"/>
+        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="Hsl"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -116,7 +116,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLuv"/> into a <see cref="Hsl"/>
+        /// Converts a <see cref="CieLuv"/> into a <see cref="Hsl"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
@@ -128,7 +128,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="Hsl"/>
+        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="Hsl"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -149,7 +149,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyy"/> into a <see cref="Hsl"/>
+        /// Converts a <see cref="CieXyy"/> into a <see cref="Hsl"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
@@ -281,7 +281,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="HunterLab"/> into a <see cref="Hsl"/>
+        /// Converts a <see cref="HunterLab"/> into a <see cref="Hsl"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
@@ -293,7 +293,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="Hsl"/>
+        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="Hsl"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -314,7 +314,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="LinearRgb"/> into a <see cref="Hsl"/>
+        /// Converts a <see cref="LinearRgb"/> into a <see cref="Hsl"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
@@ -326,7 +326,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="Hsl"/>
+        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="Hsl"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -347,7 +347,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Lms"/> into a <see cref="Hsl"/>
+        /// Converts a <see cref="Lms"/> into a <see cref="Hsl"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
@@ -359,7 +359,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="Hsl"/>
+        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="Hsl"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -387,7 +387,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         public Hsl ToHsl(in Rgb color) => HslAndRgbConverter.Convert(color);
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="Hsl"/>
+        /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="Hsl"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -408,7 +408,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="YCbCr"/> into a <see cref="Hsl"/>
+        /// Converts a <see cref="YCbCr"/> into a <see cref="Hsl"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
@@ -420,7 +420,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="Hsl"/>
+        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="Hsl"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs

@@ -263,7 +263,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="Hsv"/>
         /// </summary>
         /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<Hsl> source, Span<Hsv> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.HunterLab.cs

@@ -13,10 +13,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
     public partial class ColorSpaceConverter
     {
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="HunterLab"/>
+        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="HunterLab"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<CieLab> source, Span<HunterLab> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -34,10 +34,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="HunterLab"/>
+        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="HunterLab"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<CieLch> source, Span<HunterLab> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -55,7 +55,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="HunterLab"/>
+        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -76,7 +76,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="HunterLab"/>
+        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -97,10 +97,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="HunterLab"/>
+        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="HunterLab"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<CieXyy> source, Span<HunterLab> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -118,10 +118,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="HunterLab"/>
+        /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="HunterLab"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<CieXyz> source, Span<HunterLab> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -139,7 +139,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="HunterLab"/>
+        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -160,10 +160,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="HunterLab"/>
+        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<Hsl> source, Span<HunterLab> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -181,7 +181,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="HunterLab"/>
+        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -223,7 +223,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="HunterLab"/>
+        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -244,7 +244,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="HunterLab"/>
+        /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -265,7 +265,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="HunterLab"/>
+        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -286,7 +286,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLab"/> into a <see cref="HunterLab"/>
+        /// Converts a <see cref="CieLab"/> into a <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
@@ -297,7 +297,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLch"/> into a <see cref="HunterLab"/>
+        /// Converts a <see cref="CieLch"/> into a <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
@@ -308,7 +308,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLchuv"/> into a <see cref="HunterLab"/>
+        /// Converts a <see cref="CieLchuv"/> into a <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
@@ -319,7 +319,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLuv"/> into a <see cref="HunterLab"/>
+        /// Converts a <see cref="CieLuv"/> into a <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
@@ -330,7 +330,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyy"/> into a <see cref="HunterLab"/>
+        /// Converts a <see cref="CieXyy"/> into a <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
@@ -341,21 +341,19 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyz"/> into a <see cref="HunterLab"/>
+        /// Converts a <see cref="CieXyz"/> into a <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
         public HunterLab ToHunterLab(in CieXyz color)
         {
-            // Adaptation
             CieXyz adapted = this.Adapt(color, this.whitePoint, this.targetHunterLabWhitePoint);
 
-            // Conversion
             return this.cieXyzToHunterLabConverter.Convert(adapted);
         }
 
         /// <summary>
-        /// Converts a <see cref="Cmyk"/> into a <see cref="HunterLab"/>
+        /// Converts a <see cref="Cmyk"/> into a <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
@@ -366,7 +364,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsl"/> into a <see cref="HunterLab"/>
+        /// Converts a <see cref="Hsl"/> into a <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
@@ -377,7 +375,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsv"/> into a <see cref="HunterLab"/>
+        /// Converts a <see cref="Hsv"/> into a <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
@@ -388,7 +386,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="LinearRgb"/> into a <see cref="HunterLab"/>
+        /// Converts a <see cref="LinearRgb"/> into a <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
@@ -399,7 +397,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Lms"/> into a <see cref="HunterLab"/>
+        /// Converts a <see cref="Lms"/> into a <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
@@ -421,7 +419,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="YCbCr"/> into a <see cref="HunterLab"/>
+        /// Converts a <see cref="YCbCr"/> into a <see cref="HunterLab"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.LinearRgb.cs

@@ -17,10 +17,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         private static readonly RgbToLinearRgbConverter RgbToLinearRgbConverter = new RgbToLinearRgbConverter();
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="LinearRgb"/>
+        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="LinearRgb"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<CieLab> source, Span<LinearRgb> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -38,10 +38,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="LinearRgb"/>
+        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="LinearRgb"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<CieLch> source, Span<LinearRgb> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -59,10 +59,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="LinearRgb"/>
+        /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="LinearRgb"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<CieLchuv> source, Span<LinearRgb> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -80,10 +80,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="LinearRgb"/>
+        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="LinearRgb"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<CieLuv> source, Span<LinearRgb> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -101,10 +101,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="LinearRgb"/>
+        /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="LinearRgb"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<CieXyy> source, Span<LinearRgb> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -122,10 +122,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="LinearRgb"/>
+        /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="LinearRgb"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<CieXyz> source, Span<LinearRgb> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -143,10 +143,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="LinearRgb"/>
+        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="LinearRgb"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<Cmyk> source, Span<LinearRgb> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -164,10 +164,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="LinearRgb"/>
+        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="LinearRgb"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<Hsl> source, Span<LinearRgb> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -185,10 +185,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="LinearRgb"/>
+        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="LinearRgb"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<Hsv> source, Span<LinearRgb> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -206,10 +206,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="LinearRgb"/>
+        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="LinearRgb"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<HunterLab> source, Span<LinearRgb> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -227,10 +227,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="LinearRgb"/>
+        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="LinearRgb"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<Lms> source, Span<LinearRgb> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -248,7 +248,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="LinearRgb"/>
+        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="LinearRgb"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -269,7 +269,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="LinearRgb"/>
+        /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="LinearRgb"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -290,7 +290,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLab"/> into a <see cref="LinearRgb"/>
+        /// Converts a <see cref="CieLab"/> into a <see cref="LinearRgb"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
@@ -301,7 +301,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLch"/> into a <see cref="LinearRgb"/>
+        /// Converts a <see cref="CieLch"/> into a <see cref="LinearRgb"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
@@ -312,7 +312,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLchuv"/> into a <see cref="LinearRgb"/>
+        /// Converts a <see cref="CieLchuv"/> into a <see cref="LinearRgb"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
@@ -323,7 +323,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLuv"/> into a <see cref="LinearRgb"/>
+        /// Converts a <see cref="CieLuv"/> into a <see cref="LinearRgb"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
@@ -345,7 +345,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyz"/> into a <see cref="LinearRgb"/>
+        /// Converts a <see cref="CieXyz"/> into a <see cref="LinearRgb"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
@@ -359,7 +359,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Cmyk"/> into a <see cref="LinearRgb"/>
+        /// Converts a <see cref="Cmyk"/> into a <see cref="LinearRgb"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
@@ -370,7 +370,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsl"/> into a <see cref="LinearRgb"/>
+        /// Converts a <see cref="Hsl"/> into a <see cref="LinearRgb"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
@@ -381,7 +381,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsv"/> into a <see cref="LinearRgb"/>
+        /// Converts a <see cref="Hsv"/> into a <see cref="LinearRgb"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
@@ -392,7 +392,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="HunterLab"/> into a <see cref="LinearRgb"/>
+        /// Converts a <see cref="HunterLab"/> into a <see cref="LinearRgb"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
@@ -403,7 +403,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Lms"/> into a <see cref="LinearRgb"/>
+        /// Converts a <see cref="Lms"/> into a <see cref="LinearRgb"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
@@ -425,7 +425,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="YCbCr"/> into a <see cref="LinearRgb"/>
+        /// Converts a <see cref="YCbCr"/> into a <see cref="LinearRgb"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.YCbCr.cs

@@ -17,10 +17,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         private static readonly YCbCrAndRgbConverter YCbCrAndRgbConverter = new YCbCrAndRgbConverter();
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="YCbCr"/>
+        /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="YCbCr"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<CieLab> source, Span<YCbCr> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -38,10 +38,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="YCbCr"/>
+        /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="YCbCr"/>.
         /// </summary>
-        /// <param name="source">The span to the source colors</param>
-        /// <param name="destination">The span to the destination colors</param>
+        /// <param name="source">The span to the source colors.</param>
+        /// <param name="destination">The span to the destination colors.</param>
         public void Convert(ReadOnlySpan<CieLch> source, Span<YCbCr> destination)
         {
             Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="YCbCr"/>
+        /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -101,7 +101,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="YCbCr"/>
+        /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -122,7 +122,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="YCbCr"/>
+        /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -143,7 +143,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="YCbCr"/>
+        /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -164,7 +164,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="YCbCr"/>
+        /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -185,7 +185,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="YCbCr"/>
+        /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -206,7 +206,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="YCbCr"/>
+        /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -227,7 +227,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="YCbCr"/>
+        /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -248,7 +248,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="YCbCr"/>
+        /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="source">The span to the source colors</param>
         /// <param name="destination">The span to the destination colors</param>
@@ -269,7 +269,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLab"/> into a <see cref="YCbCr"/>
+        /// Converts a <see cref="CieLab"/> into a <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
@@ -281,7 +281,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLch"/> into a <see cref="YCbCr"/>
+        /// Converts a <see cref="CieLch"/> into a <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
@@ -293,7 +293,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieLuv"/> into a <see cref="YCbCr"/>
+        /// Converts a <see cref="CieLuv"/> into a <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
@@ -305,7 +305,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyy"/> into a <see cref="YCbCr"/>
+        /// Converts a <see cref="CieXyy"/> into a <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
@@ -317,7 +317,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="CieXyz"/> into a <see cref="YCbCr"/>
+        /// Converts a <see cref="CieXyz"/> into a <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
@@ -329,7 +329,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Cmyk"/> into a <see cref="YCbCr"/>
+        /// Converts a <see cref="Cmyk"/> into a <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
@@ -341,7 +341,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsl"/> into a <see cref="YCbCr"/>
+        /// Converts a <see cref="Hsl"/> into a <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
@@ -353,7 +353,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Hsv"/> into a <see cref="YCbCr"/>
+        /// Converts a <see cref="Hsv"/> into a <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
@@ -365,7 +365,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="HunterLab"/> into a <see cref="YCbCr"/>
+        /// Converts a <see cref="HunterLab"/> into a <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
@@ -377,7 +377,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="LinearRgb"/> into a <see cref="YCbCr"/>
+        /// Converts a <see cref="LinearRgb"/> into a <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
@@ -389,7 +389,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Lms"/> into a <see cref="YCbCr"/>
+        /// Converts a <see cref="Lms"/> into a <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
@@ -401,7 +401,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <summary>
-        /// Converts a <see cref="Rgb"/> into a <see cref="YCbCr"/>
+        /// Converts a <see cref="Rgb"/> into a <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.cs

@@ -18,7 +18,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         private readonly CieXyz targetLuvWhitePoint;
         private readonly CieXyz targetLabWhitePoint;
         private readonly CieXyz targetHunterLabWhitePoint;
-        private readonly RgbWorkingSpaceBase targetRgbWorkingSpace;
+        private readonly RgbWorkingSpace targetRgbWorkingSpace;
         private readonly IChromaticAdaptation chromaticAdaptation;
         private readonly bool performChromaticAdaptation;
         private readonly CieXyzAndLmsConverter cieXyzAndLmsConverter;

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverterOptions.cs

@@ -40,7 +40,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// Gets or sets the target working space used *when creating* RGB colors. (RGB colors on the input already contain the working space information)
         /// Defaults to: <see cref="Rgb.DefaultWorkingSpace"/>.
         /// </summary>
-        public RgbWorkingSpaceBase TargetRgbWorkingSpace { get; set; } = Rgb.DefaultWorkingSpace;
+        public RgbWorkingSpace TargetRgbWorkingSpace { get; set; } = Rgb.DefaultWorkingSpace;
 
         /// <summary>
         /// Gets or sets the chromatic adaptation method used. When <value>null</value>, no adaptation will be performed.

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzAndCieXyyConverter.cs

@@ -7,7 +7,7 @@ using System.Runtime.CompilerServices;
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {
     /// <summary>
-    /// Color converter between CIE XYZ and CIE xyY
+    /// Color converter between CIE XYZ and CIE xyY.
     /// <see href="http://www.brucelindbloom.com/"/> for formulas.
     /// </summary>
     internal sealed class CieXyzAndCieXyyConverter

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToLinearRgbConverter.cs

@@ -25,27 +25,31 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
         /// Initializes a new instance of the <see cref="CieXyzToLinearRgbConverter"/> class.
         /// </summary>
         /// <param name="workingSpace">The target working space.</param>
-        public CieXyzToLinearRgbConverter(RgbWorkingSpaceBase workingSpace)
+        public CieXyzToLinearRgbConverter(RgbWorkingSpace workingSpace)
         {
             this.TargetWorkingSpace = workingSpace;
-            this.conversionMatrix = GetRgbToCieXyzMatrix(workingSpace);
+
+            // Gets the inverted Rgb -> Xyz matrix
+            Matrix4x4.Invert(GetRgbToCieXyzMatrix(workingSpace), out Matrix4x4 inverted);
+
+            this.conversionMatrix = inverted;
         }
 
         /// <summary>
-        /// Gets the target working space
+        /// Gets the target working space.
         /// </summary>
-        public RgbWorkingSpaceBase TargetWorkingSpace { get; }
+        public RgbWorkingSpace TargetWorkingSpace { get; }
 
         /// <summary>
         /// Performs the conversion from the <see cref="CieXyz"/> input to an instance of <see cref="LinearRgb"/> type.
         /// </summary>
         /// <param name="input">The input color instance.</param>
-        /// <returns>The converted result</returns>
+        /// <returns>The converted result.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
         public LinearRgb Convert(in CieXyz input)
         {
-            Matrix4x4.Invert(this.conversionMatrix, out Matrix4x4 inverted);
-            var vector = Vector3.Transform(input.ToVector3(), inverted);
+            var vector = Vector3.Transform(input.ToVector3(), this.conversionMatrix);
+
             return new LinearRgb(vector, this.TargetWorkingSpace);
         }
     }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CmykAndRgbConverter.cs

@@ -8,7 +8,7 @@ using System.Runtime.CompilerServices;
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {
     /// <summary>
-    /// Color converter between <see cref="Cmyk"/> and <see cref="Rgb"/>
+    /// Color converter between <see cref="Cmyk"/> and <see cref="Rgb"/>.
     /// </summary>
     internal sealed class CmykAndRgbConverter
     {
@@ -28,7 +28,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
         /// Performs the conversion from the <see cref="Rgb"/> input to an instance of <see cref="Cmyk"/> type.
         /// </summary>
         /// <param name="input">The input color instance.</param>
-        /// <returns>The converted result</returns>
+        /// <returns>The converted result.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
         public Cmyk Convert(in Rgb input)
         {

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/LinearRgbAndCieXyzConverterBase.cs

@@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
         /// </summary>
         /// <param name="workingSpace">The Rgb working space.</param>
         /// <returns>The <see cref="Matrix4x4"/> based on the chromaticity and working space.</returns>
-        public static Matrix4x4 GetRgbToCieXyzMatrix(RgbWorkingSpaceBase workingSpace)
+        public static Matrix4x4 GetRgbToCieXyzMatrix(RgbWorkingSpace workingSpace)
         {
             DebugGuard.NotNull(workingSpace, nameof(workingSpace));
             RgbPrimariesChromaticityCoordinates chromaticity = workingSpace.ChromaticityCoordinates;

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/LinearRgbToCieXyzConverter.cs

@@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
         /// Initializes a new instance of the <see cref="LinearRgbToCieXyzConverter"/> class.
         /// </summary>
         /// <param name="workingSpace">The target working space.</param>
-        public LinearRgbToCieXyzConverter(RgbWorkingSpaceBase workingSpace)
+        public LinearRgbToCieXyzConverter(RgbWorkingSpace workingSpace)
         {
             this.SourceWorkingSpace = workingSpace;
             this.conversionMatrix = GetRgbToCieXyzMatrix(workingSpace);
@@ -34,7 +34,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
         /// <summary>
         /// Gets the source working space
         /// </summary>
-        public RgbWorkingSpaceBase SourceWorkingSpace { get; }
+        public RgbWorkingSpace SourceWorkingSpace { get; }
 
         /// <summary>
         /// Performs the conversion from the <see cref="LinearRgb"/> input to an instance of <see cref="CieXyz"/> type.

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/LinearRgbToRgbConverter.cs

@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {
     /// <summary>
-    /// Color converter between <see cref="LinearRgb"/> and <see cref="Rgb"/>
+    /// Color converter between <see cref="LinearRgb"/> and <see cref="Rgb"/>.
     /// </summary>
     internal sealed class LinearRgbToRgbConverter
     {
@@ -14,16 +14,15 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
         /// Performs the conversion from the <see cref="LinearRgb"/> input to an instance of <see cref="Rgb"/> type.
         /// </summary>
         /// <param name="input">The input color instance.</param>
-        /// <returns>The converted result</returns>
+        /// <returns>The converted result.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
         public Rgb Convert(in LinearRgb input)
         {
-            var vector = input.ToVector3();
-            vector.X = input.WorkingSpace.Compress(vector.X);
-            vector.Y = input.WorkingSpace.Compress(vector.Y);
-            vector.Z = input.WorkingSpace.Compress(vector.Z);
-
-            return new Rgb(vector, input.WorkingSpace);
+            return new Rgb(
+                r: input.WorkingSpace.Compress(input.R),
+                g: input.WorkingSpace.Compress(input.G),
+                b: input.WorkingSpace.Compress(input.B),
+                workingSpace: input.WorkingSpace);
         }
     }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/RgbToLinearRgbConverter.cs

@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {
     /// <summary>
-    /// Color converter between Rgb and LinearRgb
+    /// Color converter between Rgb and LinearRgb.
     /// </summary>
     internal class RgbToLinearRgbConverter
     {
@@ -14,16 +14,15 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
         /// Performs the conversion from the <see cref="Rgb"/> input to an instance of <see cref="LinearRgb"/> type.
         /// </summary>
         /// <param name="input">The input color instance.</param>
-        /// <returns>The converted result</returns>
+        /// <returns>The converted result.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
         public LinearRgb Convert(in Rgb input)
         {
-            var vector = input.ToVector3();
-            vector.X = input.WorkingSpace.Expand(vector.X);
-            vector.Y = input.WorkingSpace.Expand(vector.Y);
-            vector.Z = input.WorkingSpace.Expand(vector.Z);
-
-            return new LinearRgb(vector, input.WorkingSpace);
+            return new LinearRgb(
+                r: input.WorkingSpace.Expand(input.R),
+                g: input.WorkingSpace.Expand(input.G),
+                b: input.WorkingSpace.Expand(input.B),
+                workingSpace: input.WorkingSpace);
         }
     }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/YCbCrAndRgbConverter.cs

@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
         /// Performs the conversion from the <see cref="YCbCr"/> input to an instance of <see cref="Rgb"/> type.
         /// </summary>
         /// <param name="input">The input color instance.</param>
-        /// <returns>The converted result</returns>
+        /// <returns>The converted result.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
         public Rgb Convert(in YCbCr input)
         {
@@ -38,7 +38,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
         /// Performs the conversion from the <see cref="Rgb"/> input to an instance of <see cref="YCbCr"/> type.
         /// </summary>
         /// <param name="input">The input color instance.</param>
-        /// <returns>The converted result</returns>
+        /// <returns>The converted result.</returns>
         [MethodImpl(InliningOptions.ShortMethod)]
         public YCbCr Convert(in Rgb input)
         {

src/ImageSharp/ColorSpaces/Conversion/Implementation/RGBPrimariesChromaticityCoordinates.cs

@@ -7,7 +7,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {
     /// <summary>
     /// Represents the chromaticity coordinates of RGB primaries.
-    /// One of the specifiers of <see cref="RgbWorkingSpaceBase"/>.
+    /// One of the specifiers of <see cref="RgbWorkingSpace"/>.
     /// </summary>
     public readonly struct RgbPrimariesChromaticityCoordinates : IEquatable<RgbPrimariesChromaticityCoordinates>
     {

src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/GammaWorkingSpace.cs

@@ -10,7 +10,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
     /// <summary>
     /// The gamma working space.
     /// </summary>
-    public class GammaWorkingSpace : RgbWorkingSpaceBase
+    public sealed class GammaWorkingSpace : RgbWorkingSpace
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GammaWorkingSpace" /> class.

src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/LWorkingSpace.cs

@@ -9,7 +9,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
     /// <summary>
     /// L* working space.
     /// </summary>
-    public sealed class LWorkingSpace : RgbWorkingSpaceBase
+    public sealed class LWorkingSpace : RgbWorkingSpace
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LWorkingSpace" /> class.

src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/Rec2020WorkingSpace.cs

@@ -9,7 +9,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
     /// <summary>
     /// Rec. 2020 (ITU-R Recommendation BT.2020F) working space.
     /// </summary>
-    public sealed class Rec2020WorkingSpace : RgbWorkingSpaceBase
+    public sealed class Rec2020WorkingSpace : RgbWorkingSpace
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Rec2020WorkingSpace" /> class.