diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-03 23:23:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-03 23:23:11 +0000 |
| commit | d8e6a8b7643ffa037fbd0e409674c450f0296809 (patch) | |
| tree | 2052a8e55067e051a4be7133ebeb105b277d9796 /core/java/android/hardware/camera2 | |
| parent | b35275a25e1a0775458fcbda5b6e8180a0e3311a (diff) | |
| parent | 6999ef348818ec62a931f539c2caa799728b8a90 (diff) | |
| download | frameworks_base-d8e6a8b7643ffa037fbd0e409674c450f0296809.zip frameworks_base-d8e6a8b7643ffa037fbd0e409674c450f0296809.tar.gz frameworks_base-d8e6a8b7643ffa037fbd0e409674c450f0296809.tar.bz2 | |
am 6999ef34: camera2: limit flexYUV array size in DngCreator automerge: fdb2112
* commit '6999ef348818ec62a931f539c2caa799728b8a90':
camera2: limit flexYUV array size in DngCreator
Diffstat (limited to 'core/java/android/hardware/camera2')
| -rw-r--r-- | core/java/android/hardware/camera2/DngCreator.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/hardware/camera2/DngCreator.java b/core/java/android/hardware/camera2/DngCreator.java index 6fc99ac..33d539c 100644 --- a/core/java/android/hardware/camera2/DngCreator.java +++ b/core/java/android/hardware/camera2/DngCreator.java @@ -530,9 +530,9 @@ public final class DngCreator implements AutoCloseable { int uPixStride = uPlane.getPixelStride(); byte[] yuvPixel = { 0, 0, 0 }; - byte[] yFullRow = new byte[yPixStride * width]; - byte[] uFullRow = new byte[uPixStride * width / 2]; - byte[] vFullRow = new byte[vPixStride * width / 2]; + byte[] yFullRow = new byte[yPixStride * (width - 1) + 1]; + byte[] uFullRow = new byte[uPixStride * (width / 2 - 1) + 1]; + byte[] vFullRow = new byte[vPixStride * (width / 2 - 1) + 1]; byte[] finalRow = new byte[BYTES_PER_RGB_PIX * width]; for (int i = 0; i < height; i++) { int halfH = i / 2; |