Merge "ColorSpace.java,cosmetics: fix some typos" am: 65240d6ee5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2468880 Change-Id: Ic5baa7db6ce3db42b01fd8214f3a4907ee9fa980 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
cd3bbf1e70
@ -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}
|
||||
|
Loading…
x
Reference in New Issue
Block a user