From a330118112d1f236e767828e1b5a4213ba9d4c5b Mon Sep 17 00:00:00 2001 From: wasabeef Date: Mon, 12 Jan 2015 21:29:58 +0900 Subject: [PATCH] Refactor --- .../gpu/BrightnessFilterTransformation.java | 9 +++------ .../gpu/ContrastFilterTransformation.java | 9 +++------ .../gpu/PixelationFilterTransformation.java | 9 +++------ .../gpu/SepiaFilterTransformation.java | 9 +++------ .../gpu/SwirlFilterTransformation.java | 17 +++++------------ .../gpu/ToonFilterTransformation.java | 13 ++++--------- 6 files changed, 21 insertions(+), 45 deletions(-) diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/BrightnessFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/BrightnessFilterTransformation.java index bdd36dc..b55de1b 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/BrightnessFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/BrightnessFilterTransformation.java @@ -35,6 +35,7 @@ public class BrightnessFilterTransformation implements Transformation { private Context mContext; private BitmapPool mBitmapPool; + private GPUImageBrightnessFilter mFilter = new GPUImageBrightnessFilter(); private float mBrightness; public BrightnessFilterTransformation(Context context, BitmapPool pool) { @@ -46,6 +47,7 @@ public class BrightnessFilterTransformation implements Transformation { mContext = context; mBitmapPool = pool; mBrightness = brightness; + mFilter.setBrightness(mBrightness); } @Override @@ -54,12 +56,7 @@ public class BrightnessFilterTransformation implements Transformation { GPUImage gpuImage = new GPUImage(mContext); gpuImage.setImage(source); - GPUImageBrightnessFilter filter = new GPUImageBrightnessFilter(); - if (mBrightness != 0) { - filter.setBrightness(mBrightness); - } - - gpuImage.setFilter(filter); + gpuImage.setFilter(mFilter); Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); source.recycle(); diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java index ec02e1b..94dad50 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java @@ -35,6 +35,7 @@ public class ContrastFilterTransformation implements Transformation { private Context mContext; private BitmapPool mBitmapPool; + private GPUImageContrastFilter mFilter = new GPUImageContrastFilter(); private float mContrast; public ContrastFilterTransformation(Context context, BitmapPool pool) { @@ -46,6 +47,7 @@ public class ContrastFilterTransformation implements Transformation { mContext = context; mBitmapPool = pool; mContrast = contrast; + mFilter.setContrast(mContrast); } @Override @@ -54,12 +56,7 @@ public class ContrastFilterTransformation implements Transformation { GPUImage gpuImage = new GPUImage(mContext); gpuImage.setImage(source); - GPUImageContrastFilter filter = new GPUImageContrastFilter(); - if (mContrast != 0) { - filter.setContrast(mContrast); - } - - gpuImage.setFilter(filter); + gpuImage.setFilter(mFilter); Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); source.recycle(); diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java index 7d54ef0..7585f5b 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java @@ -32,6 +32,7 @@ public class PixelationFilterTransformation implements Transformation { private Context mContext; private BitmapPool mBitmapPool; + private GPUImagePixelationFilter mFilter = new GPUImagePixelationFilter(); private float mPixel; public PixelationFilterTransformation(Context context, BitmapPool pool) { @@ -43,6 +44,7 @@ public class PixelationFilterTransformation implements Transformation { mContext = context; mBitmapPool = pool; mPixel = pixel; + mFilter.setPixel(mPixel); } @Override @@ -51,12 +53,7 @@ public class PixelationFilterTransformation implements Transformation { GPUImage gpuImage = new GPUImage(mContext); gpuImage.setImage(source); - GPUImagePixelationFilter filter = new GPUImagePixelationFilter(); - if (mPixel != 0) { - filter.setPixel(mPixel); - } - - gpuImage.setFilter(filter); + gpuImage.setFilter(mFilter); Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); source.recycle(); diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java index 9e7efbb..e2e057f 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java @@ -32,6 +32,7 @@ public class SepiaFilterTransformation implements Transformation { private Context mContext; private BitmapPool mBitmapPool; + private GPUImageSepiaFilter mFilter = new GPUImageSepiaFilter(); private float mIntensity; public SepiaFilterTransformation(Context context, BitmapPool pool) { @@ -43,6 +44,7 @@ public class SepiaFilterTransformation implements Transformation { mContext = context; mBitmapPool = pool; mIntensity = intensity; + mFilter.setIntensity(mIntensity); } @Override @@ -51,12 +53,7 @@ public class SepiaFilterTransformation implements Transformation { GPUImage gpuImage = new GPUImage(mContext); gpuImage.setImage(source); - GPUImageSepiaFilter filter = new GPUImageSepiaFilter(); - if (mIntensity != 0) { - filter.setIntensity(mIntensity); - } - - gpuImage.setFilter(filter); + gpuImage.setFilter(mFilter); Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); source.recycle(); diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java index acc21fd..66243c6 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java @@ -33,6 +33,7 @@ public class SwirlFilterTransformation implements Transformation { private Context mContext; private BitmapPool mBitmapPool; + private GPUImageSwirlFilter mFilter = new GPUImageSwirlFilter(); private float mRadius; private float mAngle; private PointF mCenter; @@ -54,6 +55,9 @@ public class SwirlFilterTransformation implements Transformation { mRadius = radius; mAngle = angle; mCenter = center; + mFilter.setRadius(mRadius); + mFilter.setAngle(mAngle); + mFilter.setCenter(mCenter); } @Override @@ -62,18 +66,7 @@ public class SwirlFilterTransformation implements Transformation { GPUImage gpuImage = new GPUImage(mContext); gpuImage.setImage(source); - GPUImageSwirlFilter filter = new GPUImageSwirlFilter(); - if (mRadius != 0) { - filter.setRadius(mRadius); - } - if (mAngle != 0) { - filter.setAngle(mAngle); - } - if (mCenter != null) { - filter.setCenter(mCenter); - } - - gpuImage.setFilter(filter); + gpuImage.setFilter(mFilter); Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); source.recycle(); diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java index 3b7b124..f9edc07 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java @@ -32,6 +32,7 @@ public class ToonFilterTransformation implements Transformation { private Context mContext; private BitmapPool mBitmapPool; + private GPUImageToonFilter mFilter = new GPUImageToonFilter(); private float mThreshold; private float mQuantizationLevels; @@ -46,6 +47,8 @@ public class ToonFilterTransformation implements Transformation { mBitmapPool = pool; mThreshold = threshold; mQuantizationLevels = quantizationLevels; + mFilter.setThreshold(mThreshold); + mFilter.setQuantizationLevels(mQuantizationLevels); } @Override @@ -54,15 +57,7 @@ public class ToonFilterTransformation implements Transformation { GPUImage gpuImage = new GPUImage(mContext); gpuImage.setImage(source); - GPUImageToonFilter filter = new GPUImageToonFilter(); - if (mThreshold != 0) { - filter.setThreshold(mThreshold); - } - if (mQuantizationLevels != 0) { - filter.setQuantizationLevels(mQuantizationLevels); - } - - gpuImage.setFilter(filter); + gpuImage.setFilter(mFilter); Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); source.recycle();