diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2014-06-05 23:37:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-05 23:37:07 +0000 |
| commit | abfaf964a59a90f666d913ca7b5db1da31649246 (patch) | |
| tree | 7fd53b37f4e901418e2f9dff29a6d22764e3b019 /core/java/android/hardware | |
| parent | 169a149d5505fcf67bd221f9592963c01f02d1af (diff) | |
| parent | ffff217134fd0de8625cf39da56fa59a32a8c643 (diff) | |
| download | frameworks_base-abfaf964a59a90f666d913ca7b5db1da31649246.zip frameworks_base-abfaf964a59a90f666d913ca7b5db1da31649246.tar.gz frameworks_base-abfaf964a59a90f666d913ca7b5db1da31649246.tar.bz2 | |
am 6d892689: Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev
* commit '6d892689f569871e2e711669c0262a7d25b3e091':
Camera2: Do not hide TonemapCurve construtor
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/params/TonemapCurve.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/core/java/android/hardware/camera2/params/TonemapCurve.java b/core/java/android/hardware/camera2/params/TonemapCurve.java index 0fcffac..481d67a 100644 --- a/core/java/android/hardware/camera2/params/TonemapCurve.java +++ b/core/java/android/hardware/camera2/params/TonemapCurve.java @@ -78,7 +78,7 @@ public final class TonemapCurve { /** * Create a new immutable TonemapCurve instance. * - * <p>Values are stored as a contiguous {@code (Pin, Pout}) point.</p> + * <p>Values are stored as a contiguous array of {@code (Pin, Pout)} points.</p> * * <p>All parameters may have independent length but should have at most * {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS} * {@value #POINT_SIZE} elements.</p> @@ -88,15 +88,16 @@ public final class TonemapCurve { * * <p>This constructor copies the array contents and does not retain ownership of the array.</p> * - * @param elements An array of elements whose length is {@code CHANNEL_COUNT * rows * columns} + * @param red An array of elements whose length is divisible by {@value #POINT_SIZE} + * @param green An array of elements whose length is divisible by {@value #POINT_SIZE} + * @param blue An array of elements whose length is divisible by {@value #POINT_SIZE} * * @throws IllegalArgumentException - * if the {@code elements} array length is invalid, - * if any of the subelems are not finite + * if any of input array length is invalid, + * or if any of the elements in the array are not in the range of + * [{@value #LEVEL_BLACK}, {@value #LEVEL_WHITE}] * @throws NullPointerException - * if any of the parameters is {@code null} - * - * @hide + * if any of the parameters are {@code null} */ public TonemapCurve(float[] red, float[] green, float[] blue) { // TODO: maxCurvePoints check? |