From 4c23e382069c420f64027ff6d92863880d5cee4e Mon Sep 17 00:00:00 2001 From: wasabeef Date: Mon, 9 Mar 2015 00:08:53 +0900 Subject: [PATCH] fix Transparency --- gradle.properties | 4 ++-- .../transformations/CropCircleTransformation.java | 14 +++++++------- .../RoundedCornersTransformation.java | 6 ++---- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index 746cf61..5028fd3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -VERSION_NAME=1.0.4 -VERSION_CODE=4 +VERSION_NAME=1.0.5 +VERSION_CODE=5 GROUP=jp.wasabeef ARTIFACT_ID=glide-transformations diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleTransformation.java index 5d61220..5e1f535 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleTransformation.java @@ -43,20 +43,20 @@ public class CropCircleTransformation implements Transformation { int width = (source.getWidth() - size) / 2; int height = (source.getHeight() - size) / 2; - Bitmap.Config config = - source.getConfig() != null ? source.getConfig() : Bitmap.Config.ARGB_8888; - Bitmap bitmap = mBitmapPool.get(size, size, config); + Bitmap bitmap = mBitmapPool.get(size, size, Bitmap.Config.ARGB_8888); if (bitmap == null) { - bitmap = Bitmap.createBitmap(size, size, config); + bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888); } Canvas canvas = new Canvas(bitmap); Paint paint = new Paint(); BitmapShader shader = new BitmapShader(source, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP); - Matrix matrix = new Matrix(); - matrix.setTranslate(-width, -height); - shader.setLocalMatrix(matrix); + if (width != 0 || height != 0) { + Matrix matrix = new Matrix(); + matrix.setTranslate(-width, -height); + shader.setLocalMatrix(matrix); + } paint.setShader(shader); paint.setAntiAlias(true); diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/RoundedCornersTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/RoundedCornersTransformation.java index 6c50d3b..d345af9 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/RoundedCornersTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/RoundedCornersTransformation.java @@ -48,11 +48,9 @@ public class RoundedCornersTransformation implements Transformation { int width = source.getWidth(); int height = source.getHeight(); - Bitmap.Config config = - source.getConfig() != null ? source.getConfig() : Bitmap.Config.ARGB_8888; - Bitmap bitmap = mBitmapPool.get(width, height, config); + Bitmap bitmap = mBitmapPool.get(width, height, Bitmap.Config.ARGB_8888); if (bitmap == null) { - bitmap = Bitmap.createBitmap(width, height, config); + bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); } Canvas canvas = new Canvas(bitmap);