Skip to content

Commit

Permalink
Merge branch 'trc' into 'main'
Browse files Browse the repository at this point in the history 
Add ICC profile support (TRC transforms, Input device, Display device)

See merge request Wacton/Unicolour!71
  • Loading branch information
@waacton
waacton committed Jan 5, 2025
2 parents 93ff867 + 7e64e5d commit 601b118
Show file tree
Hide file tree
Showing 103 changed files with 30,131 additions and 735 deletions.
37 changes: 27 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![GitLab](https://badgen.net/static/gitlab/source/ff1493?icon=gitlab)](https://gitlab.com/Wacton/Unicolour)
[![NuGet](https://badgen.net/nuget/v/Wacton.Unicolour?icon)](https://www.nuget.org/packages/Wacton.Unicolour/)
[![pipeline status](https://gitlab.com/Wacton/Unicolour/badges/main/pipeline.svg)](https://gitlab.com/Wacton/Unicolour/-/commits/main)
[![tests passed](https://badgen.net/static/tests/188,115/green/)](https://gitlab.com/Wacton/Unicolour/-/pipelines)
[![tests passed](https://badgen.net/static/tests/216,552/green/)](https://gitlab.com/Wacton/Unicolour/-/pipelines)
[![coverage report](https://gitlab.com/Wacton/Unicolour/badges/main/coverage.svg)](https://gitlab.com/Wacton/Unicolour/-/pipelines)

Unicolour is the most comprehensive .NET library for working with colour:
Expand Down Expand Up @@ -404,13 +404,30 @@ var navyCmyk = new Unicolour(config, new Channels(1.0, 1.0, 0.0, 0.5));
Console.WriteLine(navyCmyk.Rgb.Byte255); // 46 37 87
```

Only ICC profiles that meet the following criteria are supported:

| Restriction | Criteria | Tag signature |
|---------------|----------------------|-------------------------------------------------------------------------------------|
| Device class | Output or ColorSpace | `prtr` or `spac` |
| PCS | CIELAB or CIEXYZ | `Lab ` or `XYZ ` |
| Transform | A2B and B2A | `A2B0` and `B2A0` (`A2B1` `B2A1` and `A2B2` `B2A2` are used accordingly if present) |
The following tables summarise which ICC profiles are compatible with Unicolour:

| | Profile version |
|---|-------------------|
| ✅ | 2 |
| ✅ | 4 |
| ❌ | 5 / iccMAX |

| | Profile/device class |
|---|----------------------|
| ✅ | Input `scnr` |
| ✅ | Display `mntr` |
| ✅ | Output `prtr` |
| ✅ | ColorSpace `spac` |
| ❌ | DeviceLink `link` |
| ❌ | Abstract `abst` |
| ❌ | NamedColor `nmcl` |

| | Transform |
|---|---------------------------------------------------------------------|
| ✅ | AToB / BToA `A2B0` `A2B1` `A2B2` `B2A0` `B2A1` `B2A2` |
| ✅ | TRC matrix `rTRC` `gTRC` `bTRC` `rXYZ` `gXYZ` `bXYZ` |
| ✅ | TRC grey `kTRC` |
| ❌ | DToB / BToD `D2B0` `D2B1` `D2B2` `D2B3` `B2D0` `B2D1` `B2D2` `B2D3` |

A wider variety of ICC profiles will be supported in future releases.
If a problem is encountered using an ICC profile that meets the above criteria, please [raise an issue](https://github.com/waacton/Unicolour/issues).
Expand Down Expand Up @@ -627,7 +644,7 @@ When a [conversion to or from XYZ space](#convert-between-colour-spaces) involve

### Convert between configurations
A `Unicolour` can be converted to a different configuration,
in turn enabling conversions between different RGB models, XYZ white points, CAM viewing conditions, etc.
in turn enabling conversions between different RGB models, XYZ white points, CAM viewing conditions, ICC profiles, etc.

```c#
/* pure sRGB green */
Expand Down Expand Up @@ -790,4 +807,4 @@ var mapped = Colourmaps.Viridis.Map(0.5);

---

[Wacton.Unicolour](https://github.com/waacton/Unicolour) is licensed under the [MIT License](https://choosealicense.com/licenses/mit/), copyright © 2022-2024 William Acton.
[Wacton.Unicolour](https://github.com/waacton/Unicolour) is licensed under the [MIT License](https://choosealicense.com/licenses/mit/), copyright © 2022-2025 William Acton.
37 changes: 27 additions & 10 deletions Unicolour.Readme/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![GitLab](https://badgen.net/static/gitlab/source/ff1493?icon=gitlab)](https://gitlab.com/Wacton/Unicolour)
[![NuGet](https://badgen.net/nuget/v/Wacton.Unicolour?icon)](https://www.nuget.org/packages/Wacton.Unicolour/)
[![pipeline status](https://gitlab.com/Wacton/Unicolour/badges/main/pipeline.svg)](https://gitlab.com/Wacton/Unicolour/-/commits/main)
[![tests passed](https://badgen.net/static/tests/188,115/green/)](https://gitlab.com/Wacton/Unicolour/-/pipelines)
[![tests passed](https://badgen.net/static/tests/216,552/green/)](https://gitlab.com/Wacton/Unicolour/-/pipelines)
[![coverage report](https://gitlab.com/Wacton/Unicolour/badges/main/coverage.svg)](https://gitlab.com/Wacton/Unicolour/-/pipelines)

Unicolour is the most comprehensive .NET library for working with colour:
Expand Down Expand Up @@ -404,13 +404,30 @@ var navyCmyk = new Unicolour(config, new Channels(1.0, 1.0, 0.0, 0.5));
Console.WriteLine(navyCmyk.Rgb.Byte255); // 46 37 87
```

Only ICC profiles that meet the following criteria are supported:

| Restriction | Criteria | Tag signature |
|---------------|----------------------|-------------------------------------------------------------------------------------|
| Device class | Output or ColorSpace | `prtr` or `spac` |
| PCS | CIELAB or CIEXYZ | `Lab ` or `XYZ ` |
| Transform | A2B and B2A | `A2B0` and `B2A0` (`A2B1` `B2A1` and `A2B2` `B2A2` are used accordingly if present) |
The following tables summarise which ICC profiles are compatible with Unicolour:

| | Profile version |
|---|-------------------|
| ✅ | 2 |
| ✅ | 4 |
| ❌ | 5 / iccMAX |

| | Profile/device class |
|---|----------------------|
| ✅ | Input `scnr` |
| ✅ | Display `mntr` |
| ✅ | Output `prtr` |
| ✅ | ColorSpace `spac` |
| ❌ | DeviceLink `link` |
| ❌ | Abstract `abst` |
| ❌ | NamedColor `nmcl` |

| | Transform |
|---|---------------------------------------------------------------------|
| ✅ | AToB / BToA `A2B0` `A2B1` `A2B2` `B2A0` `B2A1` `B2A2` |
| ✅ | TRC matrix `rTRC` `gTRC` `bTRC` `rXYZ` `gXYZ` `bXYZ` |
| ✅ | TRC grey `kTRC` |
| ❌ | DToB / BToD `D2B0` `D2B1` `D2B2` `D2B3` `B2D0` `B2D1` `B2D2` `B2D3` |

A wider variety of ICC profiles will be supported in future releases.
If a problem is encountered using an ICC profile that meets the above criteria, please [raise an issue](https://github.com/waacton/Unicolour/issues).
Expand Down Expand Up @@ -627,7 +644,7 @@ When a [conversion to or from XYZ space](#convert-between-colour-spaces) involve

### Convert between configurations
A `Unicolour` can be converted to a different configuration,
in turn enabling conversions between different RGB models, XYZ white points, CAM viewing conditions, etc.
in turn enabling conversions between different RGB models, XYZ white points, CAM viewing conditions, ICC profiles, etc.

```c#
/* pure sRGB green */
Expand Down Expand Up @@ -790,4 +807,4 @@ var mapped = Colourmaps.Viridis.Map(0.5);

---

[Wacton.Unicolour](https://github.com/waacton/Unicolour) is licensed under the [MIT License](https://choosealicense.com/licenses/mit/), copyright © 2022-2024 William Acton.
[Wacton.Unicolour](https://github.com/waacton/Unicolour) is licensed under the [MIT License](https://choosealicense.com/licenses/mit/), copyright © 2022-2025 William Acton.
37 changes: 27 additions & 10 deletions Unicolour.Readme/README_nuget.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![GitLab](https://badgen.net/static/gitlab/source/ff1493?icon=gitlab)](https://gitlab.com/Wacton/Unicolour)
[![NuGet](https://badgen.net/nuget/v/Wacton.Unicolour?icon)](https://www.nuget.org/packages/Wacton.Unicolour/)
[![pipeline status](https://gitlab.com/Wacton/Unicolour/badges/main/pipeline.svg)](https://gitlab.com/Wacton/Unicolour/-/commits/main)
[![tests passed](https://badgen.net/static/tests/188,115/green/)](https://gitlab.com/Wacton/Unicolour/-/pipelines)
[![tests passed](https://badgen.net/static/tests/216,552/green/)](https://gitlab.com/Wacton/Unicolour/-/pipelines)
[![coverage report](https://gitlab.com/Wacton/Unicolour/badges/main/coverage.svg)](https://gitlab.com/Wacton/Unicolour/-/pipelines)

Unicolour is the most comprehensive .NET library for working with colour:
Expand Down Expand Up @@ -295,13 +295,30 @@ var navyCmyk = new Unicolour(config, new Channels(1.0, 1.0, 0.0, 0.5));
Console.WriteLine(navyCmyk.Rgb.Byte255); // 46 37 87
```
Only ICC profiles that meet the following criteria are supported:
| Restriction | Criteria | Tag signature |
|---------------|----------------------|-------------------------------------------------------------------------------------|
| Device class | Output or ColorSpace | `prtr` or `spac` |
| PCS | CIELAB or CIEXYZ | `Lab ` or `XYZ ` |
| Transform | A2B and B2A | `A2B0` and `B2A0` (`A2B1` `B2A1` and `A2B2` `B2A2` are used accordingly if present) |
The following tables summarise which ICC profiles are compatible with Unicolour:
| | Profile version |
|---|-------------------|
| ✅ | 2 |
| ✅ | 4 |
| ❌ | 5 / iccMAX |
| | Profile/device class |
|---|----------------------|
| ✅ | Input `scnr` |
| ✅ | Display `mntr` |
| ✅ | Output `prtr` |
| ✅ | ColorSpace `spac` |
| ❌ | DeviceLink `link` |
| ❌ | Abstract `abst` |
| ❌ | NamedColor `nmcl` |
| | Transform |
|---|---------------------------------------------------------------------|
| ✅ | AToB / BToA `A2B0` `A2B1` `A2B2` `B2A0` `B2A1` `B2A2` |
| ✅ | TRC matrix `rTRC` `gTRC` `bTRC` `rXYZ` `gXYZ` `bXYZ` |
| ✅ | TRC grey `kTRC` |
| ❌ | DToB / BToD `D2B0` `D2B1` `D2B2` `D2B3` `B2D0` `B2D1` `B2D2` `B2D3` |
A wider variety of ICC profiles will be supported in future releases.
If a problem is encountered using an ICC profile that meets the above criteria, please [raise an issue](https://github.com/waacton/Unicolour/issues).
Expand Down Expand Up @@ -466,7 +483,7 @@ When a [conversion to or from XYZ space](https://github.com/waacton/Unicolour#co
### Convert between configurations
A `Unicolour` can be converted to a different configuration,
in turn enabling conversions between different RGB models, XYZ white points, CAM viewing conditions, etc.
in turn enabling conversions between different RGB models, XYZ white points, CAM viewing conditions, ICC profiles, etc.
```cs
/* pure sRGB green */
Expand Down Expand Up @@ -630,4 +647,4 @@ var mapped = Colourmaps.Viridis.Map(0.5);
---
[Wacton.Unicolour](https://github.com/waacton/Unicolour) is licensed under the [MIT License](https://choosealicense.com/licenses/mit/), copyright © 2022-2024 William Acton.
[Wacton.Unicolour](https://github.com/waacton/Unicolour) is licensed under the [MIT License](https://choosealicense.com/licenses/mit/), copyright © 2022-2025 William Acton.
5 changes: 3 additions & 2 deletions Unicolour.Tests/ConfigureIccTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ public void ConvertBetweenIccProfiles(string sourceFileName, string destinationF
var sourceFile = IccFile.Lookup[sourceFileName];
var sourceIccConfig = new IccConfiguration(sourceFile.Path, Intent.Unspecified, "source");
var sourceConfig = new Configuration(iccConfiguration: sourceIccConfig);
var sourceCmyk = new double[sourceFile.DeviceChannels];
for (var i = 0; i < sourceFile.DeviceChannels; i++)
var sourceDeviceChannels = IccFile.GetDeviceChannels(sourceFile);
var sourceCmyk = new double[sourceDeviceChannels];
for (var i = 0; i < sourceDeviceChannels; i++)
{
sourceCmyk[i] = TestUtils.RandomDouble();
}
Expand Down
Binary file added Unicolour.Tests/Data/ICC/CX_CMYK_ProofTest_PCS_RGB.icc
View file
Binary file not shown.
Loading

0 comments on commit 601b118

Please sign in to comment.