am 5eb42122: Merge "Frameworks/base: Force long computation"

* commit '5eb421221bcade4f5715d42843346f7d3c733547':
  Frameworks/base: Force long computation
This commit is contained in:
Andreas Gampe
2015-03-16 20:49:12 +00:00
committed by Android Git Automerger

View File

@@ -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 + ")");