Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a public chromatic adaptation API to ColorSpace"

Browse Source
This commit is contained in:
Daniel Solomon
2018-11-30 18:38:15 +00:00
committed by Android (Google) Code Review
parent 3beb2e460a 6310160c4e
commit 94da729e42
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -13727,6 +13727,7 @@ package android.graphics {
public abstract class ColorSpace {
method public static android.graphics.ColorSpace adapt(android.graphics.ColorSpace, float[]);
method public static android.graphics.ColorSpace adapt(android.graphics.ColorSpace, float[], android.graphics.ColorSpace.Adaptation);
method public static float[] chromaticAdaptation(android.graphics.ColorSpace.Adaptation, float[], float[]);
method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace, android.graphics.ColorSpace);
method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace, android.graphics.ColorSpace, android.graphics.ColorSpace.RenderIntent);
method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace);

34
graphics/java/android/graphics/ColorSpace.java
View File

@@ -1778,6 +1778,40 @@ public abstract class ColorSpace {
return mul3x3(inverse3x3(matrix), mul3x3Diag(LMS, matrix));
}
/**
* <p>Computes the chromatic adaptation transform from the specified
* source white point to the specified destination white point.</p>
*
* <p>The transform is computed using the von Kries method, described
* in more details in the documentation of {@link Adaptation}. The
* {@link Adaptation} enum provides different matrices that can be
* used to perform the adaptation.</p>
*
* @param adaptation The adaptation method
* @param srcWhitePoint The white point to adapt from
* @param dstWhitePoint The white point to adapt to
* @return A 3x3 matrix as a non-null array of 9 floats
*/
@NonNull
@Size(9)
public static float[] chromaticAdaptation(@NonNull Adaptation adaptation,
@NonNull @Size(min = 2, max = 3) float[] srcWhitePoint,
@NonNull @Size(min = 2, max = 3) float[] dstWhitePoint) {
float[] srcXyz = srcWhitePoint.length == 3 ?
Arrays.copyOf(srcWhitePoint, 3) : xyYToXyz(srcWhitePoint);
float[] dstXyz = dstWhitePoint.length == 3 ?
Arrays.copyOf(dstWhitePoint, 3) : xyYToXyz(dstWhitePoint);
if (compare(srcXyz, dstXyz)) {
return new float[] {
1.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f,
0.0f, 0.0f, 1.0f
};
}
return chromaticAdaptation(adaptation.mTransform, srcXyz, dstXyz);
}
/**
* Implementation of the CIE XYZ color space. Assumes the white point is D50.
*/