diff options
| author | Daniel Lehmann <lehmannd@google.com> | 2012-03-26 22:09:20 -0700 |
|---|---|---|
| committer | Daniel Lehmann <lehmannd@google.com> | 2012-03-26 22:09:20 -0700 |
| commit | b0208fcd1c296f3eb2b8dfaa55e4fb4972b3d198 (patch) | |
| tree | c0814347673c7931fef47a7fa07d333170a93205 /src/com/android/providers/contacts/PhotoProcessor.java | |
| parent | 532f73b36ff7f23304c4f416bfac1b70cdfcf3cc (diff) | |
| download | packages_providers_ContactsProvider-b0208fcd1c296f3eb2b8dfaa55e4fb4972b3d198.zip packages_providers_ContactsProvider-b0208fcd1c296f3eb2b8dfaa55e4fb4972b3d198.tar.gz packages_providers_ContactsProvider-b0208fcd1c296f3eb2b8dfaa55e4fb4972b3d198.tar.bz2 | |
Don't upsize non-square pictures, even when cropping
Bug:6202229
Change-Id: I88a9a9bb72921f7a3ed80aebe40935656a92eb3a
Diffstat (limited to 'src/com/android/providers/contacts/PhotoProcessor.java')
| -rw-r--r-- | src/com/android/providers/contacts/PhotoProcessor.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/providers/contacts/PhotoProcessor.java b/src/com/android/providers/contacts/PhotoProcessor.java index de6e93a..d2a33d2 100644 --- a/src/com/android/providers/contacts/PhotoProcessor.java +++ b/src/com/android/providers/contacts/PhotoProcessor.java @@ -134,10 +134,10 @@ import java.io.IOException; } } float scaleFactor = ((float) maxDim) / Math.max(width, height); - if (scaleFactor < 1.0 || cropLeft != 0 || cropTop != 0) { + if (scaleFactor < 1.0f || cropLeft != 0 || cropTop != 0) { // Need to scale or crop the photo. Matrix matrix = new Matrix(); - matrix.setScale(scaleFactor, scaleFactor); + if (scaleFactor < 1.0f) matrix.setScale(scaleFactor, scaleFactor); scaledBitmap = Bitmap.createBitmap( mOriginal, cropLeft, cropTop, width, height, matrix, false); } |