diff options
| author | 2018-10-16 11:26:55 -0700 | |
|---|---|---|
| committer | 2018-10-16 11:26:55 -0700 | |
| commit | 93cd653b226da03658d550c4cb691ea43ce8440c (patch) | |
| tree | 002aaee38bf459f263c0f0cd8a40d9dee63d2e97 | |
| parent | f70e1edd6fb97f18e6e503393984021528435ba9 (diff) | |
| parent | bc56d73af292a737bb7e244fc9d37f9793bf8cd2 (diff) | |
Merge "[Graphics] Align Display P3 transfer function coefficients." am: fde18facba
am: bc56d73af2
Change-Id: Ib72ca917df3a778c4ad59dc46f672b482e8b62bf
| -rw-r--r-- | graphics/java/android/graphics/ColorSpace.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/java/android/graphics/ColorSpace.java b/graphics/java/android/graphics/ColorSpace.java index 5814df5b5cc0..8fd02c0eeb59 100644 --- a/graphics/java/android/graphics/ColorSpace.java +++ b/graphics/java/android/graphics/ColorSpace.java @@ -472,8 +472,8 @@ public abstract class ColorSpace { * <tr> * <td>Electro-optical transfer function (EOTF)</td> * <td colspan="4">\(\begin{equation} - * C_{linear} = \begin{cases}\frac{C_{DisplayP3}}{12.92} & C_{sRGB} \lt 0.039 \\ - * \left( \frac{C_{DisplayP3} + 0.055}{1.055} \right) ^{2.4} & C_{sRGB} \ge 0.039 \end{cases} + * C_{linear} = \begin{cases}\frac{C_{DisplayP3}}{12.92} & C_{sRGB} \lt 0.04045 \\ + * \left( \frac{C_{DisplayP3} + 0.055}{1.055} \right) ^{2.4} & C_{sRGB} \ge 0.04045 \end{cases} * \end{equation}\) * </td> * </tr> @@ -1484,7 +1484,7 @@ public abstract class ColorSpace { "Display P3", new float[] { 0.680f, 0.320f, 0.265f, 0.690f, 0.150f, 0.060f }, ILLUMINANT_D65, - new Rgb.TransferParameters(1 / 1.055, 0.055 / 1.055, 1 / 12.92, 0.039, 2.4), + new Rgb.TransferParameters(1 / 1.055, 0.055 / 1.055, 1 / 12.92, 0.04045, 2.4), Named.DISPLAY_P3.ordinal() ); sNamedColorSpaces[Named.NTSC_1953.ordinal()] = new ColorSpace.Rgb( |