summaryrefslogtreecommitdiff
path: root/graphics/java
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2023-03-08 04:54:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-08 04:54:54 +0000
commit6d46535c590957b1125d0406420f06ddd2e4f4ed (patch)
tree7e637511471bbeddee4e7d07f75862fd41cd2904 /graphics/java
parent7364292a56a9d2bc9d3163b6346859ec71d425e3 (diff)
parent9b2f7df4cdaa2f9c50d75b7573cdce887831913d (diff)
Merge "ColorSpace.java,cosmetics: fix some typos" am: 65240d6ee5 am: cd3bbf1e70 am: 9b2f7df4cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2468880 Change-Id: Iea91ac219a16e4552f3e80fc157aa2acfa4cc0cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/ColorSpace.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/graphics/java/android/graphics/ColorSpace.java b/graphics/java/android/graphics/ColorSpace.java
index 4c669b8c34f5..24fea014287d 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 };
/**
@@ -862,8 +862,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),
/**
@@ -2537,7 +2537,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
@@ -3961,7 +3961,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}