diff options
| author | Sam Judd <judds@google.com> | 2014-09-13 16:31:52 -0700 |
|---|---|---|
| committer | Sam Judd <judds@google.com> | 2014-09-13 16:31:52 -0700 |
| commit | c168678af320bc0616635f1704f2b914799c4dec (patch) | |
| tree | 8428d0dae6f0c22c943659c5607587ba978e5131 /library/src/main | |
| parent | 6b082ebd7480c5418c20b1d539bfa16912650c50 (diff) | |
| parent | b007bfcc492551550c1566a21c2eb7a402514776 (diff) | |
| download | glide-c168678af320bc0616635f1704f2b914799c4dec.tar.gz | |
Merge branch 'jelly_bean_image_skew'
Diffstat (limited to 'library/src/main')
| -rw-r--r-- | library/src/main/java/com/bumptech/glide/load/resource/bitmap/Downsampler.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/Downsampler.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/Downsampler.java index 4571efa4..417d05ce 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/Downsampler.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/Downsampler.java @@ -252,7 +252,8 @@ public abstract class Downsampler implements BitmapDecoder<InputStream> { } private static Bitmap.Config getConfig(InputStream is, DecodeFormat format) { - if (format == DecodeFormat.ALWAYS_ARGB_8888) { + // Changing configs can cause skewing on 4.1, see issue #128. + if (format == DecodeFormat.ALWAYS_ARGB_8888 || Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN) { return Bitmap.Config.ARGB_8888; } |