diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-16 21:58:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-16 21:58:39 +0000 |
| commit | 2851d7d0fd55972290ae9ed8a8bd0f3e67bae5b4 (patch) | |
| tree | fc1393f9335a61c1d99d5c23ca7c4f219f74e152 /core/java/android/hardware | |
| parent | da81fa569ed2f955252d69c1e000ebc1a2850191 (diff) | |
| parent | 7f95a1bc3271318d7f08f19426be24b17186f9f0 (diff) | |
| download | frameworks_base-2851d7d0fd55972290ae9ed8a8bd0f3e67bae5b4.zip frameworks_base-2851d7d0fd55972290ae9ed8a8bd0f3e67bae5b4.tar.gz frameworks_base-2851d7d0fd55972290ae9ed8a8bd0f3e67bae5b4.tar.bz2 | |
am 7f95a1bc: am 5eb42122: Merge "Frameworks/base: Force long computation"
* commit '7f95a1bc3271318d7f08f19426be24b17186f9f0':
Frameworks/base: Force long computation
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/DngCreator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/DngCreator.java b/core/java/android/hardware/camera2/DngCreator.java index 33d539c..f16d650 100644 --- a/core/java/android/hardware/camera2/DngCreator.java +++ b/core/java/android/hardware/camera2/DngCreator.java @@ -453,7 +453,7 @@ public final class DngCreator implements AutoCloseable { height + ") passed to write"); } long capacity = pixels.capacity(); - long totalSize = rowStride * height + offset; + long totalSize = ((long) rowStride) * height + offset; if (capacity < totalSize) { throw new IllegalArgumentException("Image size " + capacity + " is too small (must be larger than " + totalSize + ")"); |