diff options
| author | 2023-03-07 21:50:40 +0000 | |
|---|---|---|
| committer | 2023-03-07 21:50:40 +0000 | |
| commit | 9b2f7df4cdaa2f9c50d75b7573cdce887831913d (patch) | |
| tree | bbd0a6521ddc3b1a84da412f184695ec756abc13 /graphics/java/android | |
| parent | 3c7723fca7662976e9f66ae580a9d9d383c67116 (diff) | |
| parent | cd3bbf1e704653525ab99da3e8b95f832f882cfd (diff) | |
Merge "ColorSpace.java,cosmetics: fix some typos" am: 65240d6ee5 am: cd3bbf1e70
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2468880
Change-Id: Ie03329e17c1000c7243089f6a93ecc96303ecb71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'graphics/java/android')
| -rw-r--r-- | graphics/java/android/graphics/ColorSpace.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/graphics/java/android/graphics/ColorSpace.java b/graphics/java/android/graphics/ColorSpace.java index ca3c84729388..6e60e9e2df6a 100644 --- a/graphics/java/android/graphics/ColorSpace.java +++ b/graphics/java/android/graphics/ColorSpace.java @@ -170,7 +170,7 @@ public abstract class ColorSpace { /** * Standard CIE 1931 2° illuminant D65, encoded in xyY. * This illuminant has a color temperature of 6504K. This illuminant - * is commonly used in RGB color spaces such as sRGB, BT.209, etc. + * is commonly used in RGB color spaces such as sRGB, BT.709, etc. */ public static final float[] ILLUMINANT_D65 = { 0.31271f, 0.32902f }; /** @@ -832,8 +832,8 @@ public abstract class ColorSpace { public enum Model { /** * The RGB model is a color model with 3 components that - * refer to the three additive primiaries: red, green - * andd blue. + * refer to the three additive primaries: red, green + * and blue. */ RGB(3), /** @@ -2405,7 +2405,7 @@ public abstract class ColorSpace { * does not need to be specified and is assumed to be 1.0. Only the xy components * are required.</p> * - * <p class="note">The ID, areturned by {@link #getId()}, of an object created by + * <p class="note">The ID, as returned by {@link #getId()}, of an object created by * this constructor is always {@link #MIN_ID}.</p> * * @param name Name of the color space, cannot be null, its length must be >= 1 @@ -3832,7 +3832,7 @@ public abstract class ColorSpace { * * <p>We can only connect color spaces if they use the same profile * connection space. We assume the connection space is always - * CIE XYZ but we maye need to perform a chromatic adaptation to + * CIE XYZ but we maybe need to perform a chromatic adaptation to * match the white points. If an adaptation is needed, we use the * CIE standard illuminant D50. The unmatched color space is adapted * using the von Kries transform and the {@link Adaptation#BRADFORD} |