Merge "ColorSpace.java,cosmetics: fix some typos" (65240d6e) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/ColorSpace.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -170,7 +170,7 @@ public abstract class ColorSpace {
	/**		/**
	* Standard CIE 1931 2° illuminant D65, encoded in xyY.		* Standard CIE 1931 2° illuminant D65, encoded in xyY.
	* This illuminant has a color temperature of 6504K. This illuminant		* 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 };		public static final float[] ILLUMINANT_D65 = { 0.31271f, 0.32902f };
	/**		/**
	@@ -832,8 +832,8 @@ public abstract class ColorSpace {
	public enum Model {		public enum Model {
	/**		/**
	* The RGB model is a color model with 3 components that		* The RGB model is a color model with 3 components that
	* refer to the three additive primiaries: red, green		* refer to the three additive primaries: red, green
	* andd blue.		* and blue.
	*/		*/
	RGB(3),		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		* does not need to be specified and is assumed to be 1.0. Only the xy components
	* are required.</p>		* 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>		* this constructor is always {@link #MIN_ID}.</p>
	*		*
	* @param name Name of the color space, cannot be null, its length must be >= 1		* @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		* <p>We can only connect color spaces if they use the same profile
	* connection space. We assume the connection space is always		* 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		* match the white points. If an adaptation is needed, we use the
	* CIE standard illuminant D50. The unmatched color space is adapted		* CIE standard illuminant D50. The unmatched color space is adapted
	* using the von Kries transform and the {@link Adaptation#BRADFORD}		* using the von Kries transform and the {@link Adaptation#BRADFORD}