From f83e5ef85abd3c8be1933b8335ac8e3b820fc529 Mon Sep 17 00:00:00 2001 From: wasabeef Date: Sun, 6 Sep 2015 01:24:12 +0900 Subject: [PATCH] change the codestyle --- example/src/main/AndroidManifest.xml | 33 +-- .../wasabeef/example/glide/MainActivity.java | 58 ++--- .../wasabeef/example/glide/MainAdapter.java | 245 +++++++++--------- example/src/main/res/layout/activity_main.xml | 18 +- .../src/main/res/layout/layout_list_item.xml | 37 +-- example/src/main/res/values-w820dp/dimens.xml | 8 +- example/src/main/res/values/dimens.xml | 6 +- example/src/main/res/values/strings.xml | 6 +- example/src/main/res/values/styles.xml | 8 +- .../transformations/BlurTransformation.java | 148 ++++++----- .../ColorFilterTransformation.java | 78 +++--- .../CropCircleTransformation.java | 86 +++--- .../CropSquareTransformation.java | 64 +++-- .../transformations/CropTransformation.java | 170 ++++++------ .../GrayscaleTransformation.java | 76 +++--- .../RoundedCornersTransformation.java | 80 +++--- .../gpu/BrightnessFilterTransformation.java | 71 +++-- .../gpu/ContrastFilterTransformation.java | 71 +++-- .../gpu/InvertFilterTransformation.java | 51 ++-- .../gpu/KuwaharaFilterTransformation.java | 74 +++--- .../gpu/PixelationFilterTransformation.java | 71 +++-- .../gpu/SepiaFilterTransformation.java | 71 +++-- .../gpu/SketchFilterTransformation.java | 51 ++-- .../gpu/SwirlFilterTransformation.java | 100 ++++--- .../gpu/ToonFilterTransformation.java | 81 +++--- .../gpu/VignetteFilterTransformation.java | 100 ++++--- 26 files changed, 906 insertions(+), 956 deletions(-) diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml index ab4fd5e..2e838d2 100644 --- a/example/src/main/AndroidManifest.xml +++ b/example/src/main/AndroidManifest.xml @@ -1,21 +1,24 @@ + package="jp.wasabeef.example.glide" + > - - - - + + + + - - - - + + + + diff --git a/example/src/main/java/jp/wasabeef/example/glide/MainActivity.java b/example/src/main/java/jp/wasabeef/example/glide/MainActivity.java index fdcf5dd..20074c6 100644 --- a/example/src/main/java/jp/wasabeef/example/glide/MainActivity.java +++ b/example/src/main/java/jp/wasabeef/example/glide/MainActivity.java @@ -4,44 +4,40 @@ import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.RecyclerView; - import java.util.ArrayList; import java.util.List; - import jp.wasabeef.example.glide.MainAdapter.Type; - public class MainActivity extends AppCompatActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); + @Override protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); - RecyclerView recyclerView = (RecyclerView) findViewById(R.id.list); - recyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + RecyclerView recyclerView = (RecyclerView) findViewById(R.id.list); + recyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - List dataSet = new ArrayList<>(); - dataSet.add(Type.CropTop); - dataSet.add(Type.CropCenter); - dataSet.add(Type.CropBottom); - dataSet.add(Type.CropSquare); - dataSet.add(Type.CropCircle); - dataSet.add(Type.ColorFilter); - dataSet.add(Type.Grayscale); - dataSet.add(Type.RoundedCorners); - dataSet.add(Type.Blur); - dataSet.add(Type.Toon); - dataSet.add(Type.Sepia); - dataSet.add(Type.Contrast); - dataSet.add(Type.Invert); - dataSet.add(Type.Pixel); - dataSet.add(Type.Sketch); - dataSet.add(Type.Swirl); - dataSet.add(Type.Brightness); - dataSet.add(Type.Kuawahara); - dataSet.add(Type.Vignette); + List dataSet = new ArrayList<>(); + dataSet.add(Type.CropTop); + dataSet.add(Type.CropCenter); + dataSet.add(Type.CropBottom); + dataSet.add(Type.CropSquare); + dataSet.add(Type.CropCircle); + dataSet.add(Type.ColorFilter); + dataSet.add(Type.Grayscale); + dataSet.add(Type.RoundedCorners); + dataSet.add(Type.Blur); + dataSet.add(Type.Toon); + dataSet.add(Type.Sepia); + dataSet.add(Type.Contrast); + dataSet.add(Type.Invert); + dataSet.add(Type.Pixel); + dataSet.add(Type.Sketch); + dataSet.add(Type.Swirl); + dataSet.add(Type.Brightness); + dataSet.add(Type.Kuawahara); + dataSet.add(Type.Vignette); - recyclerView.setAdapter(new MainAdapter(this, dataSet)); - } + recyclerView.setAdapter(new MainAdapter(this, dataSet)); + } } diff --git a/example/src/main/java/jp/wasabeef/example/glide/MainAdapter.java b/example/src/main/java/jp/wasabeef/example/glide/MainAdapter.java index 5abad33..86df8ab 100644 --- a/example/src/main/java/jp/wasabeef/example/glide/MainAdapter.java +++ b/example/src/main/java/jp/wasabeef/example/glide/MainAdapter.java @@ -1,8 +1,5 @@ package jp.wasabeef.example.glide; -import com.bumptech.glide.Glide; -import com.bumptech.glide.load.Transformation; - import android.content.Context; import android.graphics.Color; import android.graphics.PointF; @@ -12,9 +9,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; - +import com.bumptech.glide.Glide; +import com.bumptech.glide.load.Transformation; import java.util.List; - import jp.wasabeef.glide.transformations.BlurTransformation; import jp.wasabeef.glide.transformations.ColorFilterTransformation; import jp.wasabeef.glide.transformations.CropCircleTransformation; @@ -38,130 +35,124 @@ import jp.wasabeef.glide.transformations.gpu.VignetteFilterTransformation; */ public class MainAdapter extends RecyclerView.Adapter { - private Context mContext; - private List mDataSet; + private Context mContext; + private List mDataSet; - enum Type { - CropTop, - CropCenter, - CropBottom, - CropSquare, - CropCircle, - ColorFilter, - Grayscale, - RoundedCorners, - Blur, - Toon, - Sepia, - Contrast, - Invert, - Pixel, - Sketch, - Swirl, - Brightness, - Kuawahara, - Vignette + enum Type { + CropTop, + CropCenter, + CropBottom, + CropSquare, + CropCircle, + ColorFilter, + Grayscale, + RoundedCorners, + Blur, + Toon, + Sepia, + Contrast, + Invert, + Pixel, + Sketch, + Swirl, + Brightness, + Kuawahara, + Vignette + } + + public MainAdapter(Context context, List dataSet) { + mContext = context; + mDataSet = dataSet; + } + + @Override public MainAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View v = LayoutInflater.from(mContext).inflate(R.layout.layout_list_item, parent, false); + return new ViewHolder(v); + } + + @Override public void onBindViewHolder(MainAdapter.ViewHolder holder, int position) { + Transformation transformation = null; + switch (mDataSet.get(position)) { + case CropTop: + transformation = + new CropTransformation(mContext, 300, 100, CropTransformation.CropType.TOP); + break; + case CropCenter: + transformation = new CropTransformation(mContext, 300, 100); + break; + case CropBottom: + transformation = + new CropTransformation(mContext, 300, 100, CropTransformation.CropType.BOTTOM); + break; + case CropSquare: + transformation = new CropSquareTransformation(mContext); + break; + case CropCircle: + transformation = new CropCircleTransformation(mContext); + break; + case ColorFilter: + transformation = new ColorFilterTransformation(mContext, Color.argb(80, 255, 0, 0)); + break; + case Grayscale: + transformation = new GrayscaleTransformation(mContext); + break; + case RoundedCorners: + transformation = new RoundedCornersTransformation(mContext, 100, 0); + break; + case Blur: + transformation = new BlurTransformation(mContext, 25, 1); + break; + case Toon: + transformation = new ToonFilterTransformation(mContext); + break; + case Sepia: + transformation = new SepiaFilterTransformation(mContext); + break; + case Contrast: + transformation = new ContrastFilterTransformation(mContext, 2.0f); + break; + case Invert: + transformation = new InvertFilterTransformation(mContext); + break; + case Pixel: + transformation = new PixelationFilterTransformation(mContext, 20); + break; + case Sketch: + transformation = new SketchFilterTransformation(mContext); + break; + case Swirl: + transformation = + new SwirlFilterTransformation(mContext, 0.5f, 1.0f, new PointF(0.5f, 0.5f)); + break; + case Brightness: + transformation = new BrightnessFilterTransformation(mContext, 0.5f); + break; + case Kuawahara: + transformation = new KuwaharaFilterTransformation(mContext, 25); + break; + case Vignette: + transformation = new VignetteFilterTransformation(mContext, new PointF(0.5f, 0.5f), + new float[] { 0.0f, 0.0f, 0.0f }, 0f, 0.75f); + break; } - public MainAdapter(Context context, List dataSet) { - mContext = context; - mDataSet = dataSet; - } - - @Override - public MainAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View v = LayoutInflater.from(mContext) - .inflate(R.layout.layout_list_item, parent, false); - return new ViewHolder(v); - } - - @Override - public void onBindViewHolder(MainAdapter.ViewHolder holder, int position) { - Transformation transformation = null; - switch (mDataSet.get(position)) { - case CropTop: - transformation = - new CropTransformation(mContext, 300, 100, CropTransformation.CropType.TOP); - break; - case CropCenter: - transformation = new CropTransformation(mContext, 300, 100); - break; - case CropBottom: - transformation = - new CropTransformation(mContext, 300, 100, - CropTransformation.CropType.BOTTOM); - break; - case CropSquare: - transformation = new CropSquareTransformation(mContext); - break; - case CropCircle: - transformation = new CropCircleTransformation(mContext); - break; - case ColorFilter: - transformation = new ColorFilterTransformation(mContext, Color.argb(80, 255, 0, 0)); - break; - case Grayscale: - transformation = new GrayscaleTransformation(mContext); - break; - case RoundedCorners: - transformation = new RoundedCornersTransformation(mContext, 100, 0); - break; - case Blur: - transformation = new BlurTransformation(mContext, 25, 1); - break; - case Toon: - transformation = new ToonFilterTransformation(mContext); - break; - case Sepia: - transformation = new SepiaFilterTransformation(mContext); - break; - case Contrast: - transformation = new ContrastFilterTransformation(mContext, 2.0f); - break; - case Invert: - transformation = new InvertFilterTransformation(mContext); - break; - case Pixel: - transformation = new PixelationFilterTransformation(mContext, 20); - break; - case Sketch: - transformation = new SketchFilterTransformation(mContext); - break; - case Swirl: - transformation = new SwirlFilterTransformation(mContext, - 0.5f, 1.0f, new PointF(0.5f, 0.5f)); - break; - case Brightness: - transformation = new BrightnessFilterTransformation(mContext, 0.5f); - break; - case Kuawahara: - transformation = new KuwaharaFilterTransformation(mContext, 25); - break; - case Vignette: - transformation = new VignetteFilterTransformation(mContext, - new PointF(0.5f, 0.5f), new float[]{0.0f, 0.0f, 0.0f}, 0f, 0.75f); - break; - } - - Glide.with(mContext).load(R.drawable.demo) - .bitmapTransform(transformation).into(holder.image); - holder.title.setText(mDataSet.get(position).name()); - } - - @Override - public int getItemCount() { - return mDataSet.size(); - } - - static class ViewHolder extends RecyclerView.ViewHolder { - - public ImageView image; - public TextView title; - - ViewHolder(View itemView) { - super(itemView); - image = (ImageView) itemView.findViewById(R.id.image); - title = (TextView) itemView.findViewById(R.id.title); - } + Glide.with(mContext).load(R.drawable.demo).bitmapTransform(transformation).into(holder.image); + holder.title.setText(mDataSet.get(position).name()); + } + + @Override public int getItemCount() { + return mDataSet.size(); + } + + static class ViewHolder extends RecyclerView.ViewHolder { + + public ImageView image; + public TextView title; + + ViewHolder(View itemView) { + super(itemView); + image = (ImageView) itemView.findViewById(R.id.image); + title = (TextView) itemView.findViewById(R.id.title); } + } } diff --git a/example/src/main/res/layout/activity_main.xml b/example/src/main/res/layout/activity_main.xml index ccb1aeb..528d0d9 100644 --- a/example/src/main/res/layout/activity_main.xml +++ b/example/src/main/res/layout/activity_main.xml @@ -1,13 +1,15 @@ + + - - + /> diff --git a/example/src/main/res/layout/layout_list_item.xml b/example/src/main/res/layout/layout_list_item.xml index 005b7e4..23549a7 100644 --- a/example/src/main/res/layout/layout_list_item.xml +++ b/example/src/main/res/layout/layout_list_item.xml @@ -1,23 +1,26 @@ + + + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:contentDescription="@null" + /> - - - + \ No newline at end of file diff --git a/example/src/main/res/values-w820dp/dimens.xml b/example/src/main/res/values-w820dp/dimens.xml index 63fc816..1e656d6 100644 --- a/example/src/main/res/values-w820dp/dimens.xml +++ b/example/src/main/res/values-w820dp/dimens.xml @@ -1,6 +1,6 @@ - - 64dp + + 64dp diff --git a/example/src/main/res/values/dimens.xml b/example/src/main/res/values/dimens.xml index 47c8224..acf94cc 100644 --- a/example/src/main/res/values/dimens.xml +++ b/example/src/main/res/values/dimens.xml @@ -1,5 +1,5 @@ - - 16dp - 16dp + + 16dp + 16dp diff --git a/example/src/main/res/values/strings.xml b/example/src/main/res/values/strings.xml index cf8dc33..9a2e2e6 100644 --- a/example/src/main/res/values/strings.xml +++ b/example/src/main/res/values/strings.xml @@ -1,8 +1,8 @@ - glide-transformations - Hello world! - Settings + glide-transformations + Hello world! + Settings diff --git a/example/src/main/res/values/styles.xml b/example/src/main/res/values/styles.xml index 766ab99..1355d09 100644 --- a/example/src/main/res/values/styles.xml +++ b/example/src/main/res/values/styles.xml @@ -1,8 +1,8 @@ - - + + diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java index 14d1f2f..053d9b8 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java @@ -16,12 +16,6 @@ package jp.wasabeef.glide.transformations; * limitations under the License. */ -import com.bumptech.glide.Glide; -import com.bumptech.glide.load.Transformation; -import com.bumptech.glide.load.engine.Resource; -import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; -import com.bumptech.glide.load.resource.bitmap.BitmapResource; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -30,86 +24,90 @@ import android.support.v8.renderscript.Allocation; import android.support.v8.renderscript.Element; import android.support.v8.renderscript.RenderScript; import android.support.v8.renderscript.ScriptIntrinsicBlur; +import com.bumptech.glide.Glide; +import com.bumptech.glide.load.Transformation; +import com.bumptech.glide.load.engine.Resource; +import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; +import com.bumptech.glide.load.resource.bitmap.BitmapResource; public class BlurTransformation implements Transformation { - private static int MAX_RADIUS = 25; - private static int DEFAULT_DOWN_SAMPLING = 1; + private static int MAX_RADIUS = 25; + private static int DEFAULT_DOWN_SAMPLING = 1; - private Context mContext; - private BitmapPool mBitmapPool; + private Context mContext; + private BitmapPool mBitmapPool; - private int mRadius; - private int mSampling; + private int mRadius; + private int mSampling; - public BlurTransformation(Context context) { - this(context, Glide.get(context).getBitmapPool(), MAX_RADIUS, DEFAULT_DOWN_SAMPLING); + public BlurTransformation(Context context) { + this(context, Glide.get(context).getBitmapPool(), MAX_RADIUS, DEFAULT_DOWN_SAMPLING); + } + + public BlurTransformation(Context context, BitmapPool pool) { + this(context, pool, MAX_RADIUS, DEFAULT_DOWN_SAMPLING); + } + + public BlurTransformation(Context context, BitmapPool pool, int radius) { + this(context, pool, radius, DEFAULT_DOWN_SAMPLING); + } + + public BlurTransformation(Context context, int radius) { + this(context, Glide.get(context).getBitmapPool(), radius, DEFAULT_DOWN_SAMPLING); + } + + public BlurTransformation(Context context, BitmapPool pool, int radius, int sampling) { + mContext = context; + mBitmapPool = pool; + mRadius = radius; + mSampling = sampling; + } + + public BlurTransformation(Context context, int radius, int sampling) { + mContext = context; + mBitmapPool = Glide.get(context).getBitmapPool(); + mRadius = radius; + mSampling = sampling; + } + + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); + + int width = source.getWidth(); + int height = source.getHeight(); + int scaledWidth = width / mSampling; + int scaledHeight = height / mSampling; + + Bitmap bitmap = mBitmapPool.get(scaledWidth, scaledHeight, Bitmap.Config.ARGB_8888); + if (bitmap == null) { + bitmap = Bitmap.createBitmap(scaledWidth, scaledHeight, Bitmap.Config.ARGB_8888); } - public BlurTransformation(Context context, BitmapPool pool) { - this(context, pool, MAX_RADIUS, DEFAULT_DOWN_SAMPLING); - } + Canvas canvas = new Canvas(bitmap); + canvas.scale(1 / (float) mSampling, 1 / (float) mSampling); + Paint paint = new Paint(); + paint.setFlags(Paint.FILTER_BITMAP_FLAG); + canvas.drawBitmap(source, 0, 0, paint); - public BlurTransformation(Context context, BitmapPool pool, int radius) { - this(context, pool, radius, DEFAULT_DOWN_SAMPLING); - } + RenderScript rs = RenderScript.create(mContext); + Allocation input = Allocation.createFromBitmap(rs, bitmap, Allocation.MipmapControl.MIPMAP_NONE, + Allocation.USAGE_SCRIPT); + Allocation output = Allocation.createTyped(rs, input.getType()); + ScriptIntrinsicBlur blur = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs)); - public BlurTransformation(Context context, int radius) { - this(context, Glide.get(context).getBitmapPool(), radius, DEFAULT_DOWN_SAMPLING); - } + blur.setInput(input); + blur.setRadius(mRadius); + blur.forEach(output); + output.copyTo(bitmap); - public BlurTransformation(Context context, BitmapPool pool, int radius, int sampling) { - mContext = context; - mBitmapPool = pool; - mRadius = radius; - mSampling = sampling; - } + rs.destroy(); - public BlurTransformation(Context context, int radius, int sampling) { - mContext = context; - mBitmapPool = Glide.get(context).getBitmapPool(); - mRadius = radius; - mSampling = sampling; - } + return BitmapResource.obtain(bitmap, mBitmapPool); + } - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); - - int width = source.getWidth(); - int height = source.getHeight(); - int scaledWidth = width / mSampling; - int scaledHeight = height / mSampling; - - Bitmap bitmap = mBitmapPool.get(scaledWidth, scaledHeight, Bitmap.Config.ARGB_8888); - if (bitmap == null) { - bitmap = Bitmap.createBitmap(scaledWidth, scaledHeight, Bitmap.Config.ARGB_8888); - } - - Canvas canvas = new Canvas(bitmap); - canvas.scale(1 / (float) mSampling, 1 / (float) mSampling); - Paint paint = new Paint(); - paint.setFlags(Paint.FILTER_BITMAP_FLAG); - canvas.drawBitmap(source, 0, 0, paint); - - RenderScript rs = RenderScript.create(mContext); - Allocation input = Allocation.createFromBitmap(rs, bitmap, - Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); - Allocation output = Allocation.createTyped(rs, input.getType()); - ScriptIntrinsicBlur blur = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs)); - - blur.setInput(input); - blur.setRadius(mRadius); - blur.forEach(output); - output.copyTo(bitmap); - - rs.destroy(); - - return BitmapResource.obtain(bitmap, mBitmapPool); - } - - @Override - public String getId() { - return "BlurTransformation(radius=" + mRadius + ", sampling=" + mSampling + ")"; - } + @Override public String getId() { + return "BlurTransformation(radius=" + mRadius + ", sampling=" + mSampling + ")"; + } } diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/ColorFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/ColorFilterTransformation.java index de903fa..8279afb 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/ColorFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/ColorFilterTransformation.java @@ -16,59 +16,57 @@ package jp.wasabeef.glide.transformations; * limitations under the License. */ -import com.bumptech.glide.Glide; -import com.bumptech.glide.load.Transformation; -import com.bumptech.glide.load.engine.Resource; -import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; -import com.bumptech.glide.load.resource.bitmap.BitmapResource; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; +import com.bumptech.glide.Glide; +import com.bumptech.glide.load.Transformation; +import com.bumptech.glide.load.engine.Resource; +import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; +import com.bumptech.glide.load.resource.bitmap.BitmapResource; public class ColorFilterTransformation implements Transformation { - private BitmapPool mBitmapPool; + private BitmapPool mBitmapPool; - private int mColor; + private int mColor; - public ColorFilterTransformation(Context context, int color) { - this(Glide.get(context).getBitmapPool(), color); + public ColorFilterTransformation(Context context, int color) { + this(Glide.get(context).getBitmapPool(), color); + } + + public ColorFilterTransformation(BitmapPool pool, int color) { + mBitmapPool = pool; + mColor = color; + } + + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); + + 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); + if (bitmap == null) { + bitmap = Bitmap.createBitmap(width, height, config); } - public ColorFilterTransformation(BitmapPool pool, int color) { - mBitmapPool = pool; - mColor = color; - } + Canvas canvas = new Canvas(bitmap); + Paint paint = new Paint(); + paint.setAntiAlias(true); + paint.setColorFilter(new PorterDuffColorFilter(mColor, PorterDuff.Mode.SRC_ATOP)); + canvas.drawBitmap(source, 0, 0, paint); - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); + return BitmapResource.obtain(bitmap, mBitmapPool); + } - 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); - if (bitmap == null) { - bitmap = Bitmap.createBitmap(width, height, config); - } - - Canvas canvas = new Canvas(bitmap); - Paint paint = new Paint(); - paint.setAntiAlias(true); - paint.setColorFilter(new PorterDuffColorFilter(mColor, PorterDuff.Mode.SRC_ATOP)); - canvas.drawBitmap(source, 0, 0, paint); - - return BitmapResource.obtain(bitmap, mBitmapPool); - } - - @Override - public String getId() { - return "ColorFilterTransformation(color=" + mColor + ")"; - } + @Override public String getId() { + return "ColorFilterTransformation(color=" + mColor + ")"; + } } 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 2bfd99d..5192a6e 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleTransformation.java @@ -16,64 +16,62 @@ package jp.wasabeef.glide.transformations; * limitations under the License. */ -import com.bumptech.glide.Glide; -import com.bumptech.glide.load.Transformation; -import com.bumptech.glide.load.engine.Resource; -import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; -import com.bumptech.glide.load.resource.bitmap.BitmapResource; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapShader; import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.Paint; +import com.bumptech.glide.Glide; +import com.bumptech.glide.load.Transformation; +import com.bumptech.glide.load.engine.Resource; +import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; +import com.bumptech.glide.load.resource.bitmap.BitmapResource; public class CropCircleTransformation implements Transformation { - private BitmapPool mBitmapPool; + private BitmapPool mBitmapPool; - public CropCircleTransformation(Context context) { - this(Glide.get(context).getBitmapPool()); + public CropCircleTransformation(Context context) { + this(Glide.get(context).getBitmapPool()); + } + + public CropCircleTransformation(BitmapPool pool) { + this.mBitmapPool = pool; + } + + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); + int size = Math.min(source.getWidth(), source.getHeight()); + + int width = (source.getWidth() - size) / 2; + int height = (source.getHeight() - size) / 2; + + Bitmap bitmap = mBitmapPool.get(size, size, Bitmap.Config.ARGB_8888); + if (bitmap == null) { + bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888); } - public CropCircleTransformation(BitmapPool pool) { - this.mBitmapPool = pool; + Canvas canvas = new Canvas(bitmap); + Paint paint = new Paint(); + BitmapShader shader = + new BitmapShader(source, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP); + if (width != 0 || height != 0) { + Matrix matrix = new Matrix(); + matrix.setTranslate(-width, -height); + shader.setLocalMatrix(matrix); } + paint.setShader(shader); + paint.setAntiAlias(true); - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); - int size = Math.min(source.getWidth(), source.getHeight()); + float r = size / 2f; + canvas.drawCircle(r, r, r, paint); - int width = (source.getWidth() - size) / 2; - int height = (source.getHeight() - size) / 2; + return BitmapResource.obtain(bitmap, mBitmapPool); + } - Bitmap bitmap = mBitmapPool.get(size, size, Bitmap.Config.ARGB_8888); - if (bitmap == null) { - 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); - if (width != 0 || height != 0) { - Matrix matrix = new Matrix(); - matrix.setTranslate(-width, -height); - shader.setLocalMatrix(matrix); - } - paint.setShader(shader); - paint.setAntiAlias(true); - - float r = size / 2f; - canvas.drawCircle(r, r, r, paint); - - return BitmapResource.obtain(bitmap, mBitmapPool); - } - - @Override - public String getId() { - return "CropCircleTransformation()"; - } + @Override public String getId() { + return "CropCircleTransformation()"; + } } diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java index cecd0d9..3113b0a 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java @@ -16,49 +16,47 @@ package jp.wasabeef.glide.transformations; * limitations under the License. */ +import android.content.Context; +import android.graphics.Bitmap; import com.bumptech.glide.Glide; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapResource; -import android.content.Context; -import android.graphics.Bitmap; - public class CropSquareTransformation implements Transformation { - private BitmapPool mBitmapPool; - private int mWidth; - private int mHeight; + private BitmapPool mBitmapPool; + private int mWidth; + private int mHeight; - public CropSquareTransformation(Context context) { - this(Glide.get(context).getBitmapPool()); + public CropSquareTransformation(Context context) { + this(Glide.get(context).getBitmapPool()); + } + + public CropSquareTransformation(BitmapPool pool) { + this.mBitmapPool = pool; + } + + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); + int size = Math.min(source.getWidth(), source.getHeight()); + + mWidth = (source.getWidth() - size) / 2; + mHeight = (source.getHeight() - size) / 2; + + Bitmap.Config config = + source.getConfig() != null ? source.getConfig() : Bitmap.Config.ARGB_8888; + Bitmap bitmap = mBitmapPool.get(mWidth, mHeight, config); + if (bitmap == null) { + bitmap = Bitmap.createBitmap(source, mWidth, mHeight, size, size); } - public CropSquareTransformation(BitmapPool pool) { - this.mBitmapPool = pool; - } + return BitmapResource.obtain(bitmap, mBitmapPool); + } - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); - int size = Math.min(source.getWidth(), source.getHeight()); - - mWidth = (source.getWidth() - size) / 2; - mHeight = (source.getHeight() - size) / 2; - - Bitmap.Config config = - source.getConfig() != null ? source.getConfig() : Bitmap.Config.ARGB_8888; - Bitmap bitmap = mBitmapPool.get(mWidth, mHeight, config); - if (bitmap == null) { - bitmap = Bitmap.createBitmap(source, mWidth, mHeight, size, size); - } - - return BitmapResource.obtain(bitmap, mBitmapPool); - } - - @Override - public String getId() { - return "CropSquareTransformation(width=" + mWidth + ", height=" + mHeight + ")"; - } + @Override public String getId() { + return "CropSquareTransformation(width=" + mWidth + ", height=" + mHeight + ")"; + } } diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropTransformation.java index 797813a..959dba2 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropTransformation.java @@ -16,103 +16,101 @@ package jp.wasabeef.glide.transformations; * limitations under the License. */ +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.RectF; import com.bumptech.glide.Glide; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapResource; -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.RectF; - public class CropTransformation implements Transformation { - public enum CropType { - TOP, - CENTER, - BOTTOM + public enum CropType { + TOP, + CENTER, + BOTTOM + } + + private BitmapPool mBitmapPool; + private int mWidth; + private int mHeight; + + private CropType mCropType = CropType.CENTER; + + public CropTransformation(Context context) { + this(Glide.get(context).getBitmapPool()); + } + + public CropTransformation(BitmapPool pool) { + this(pool, 0, 0); + } + + public CropTransformation(Context context, int width, int height) { + this(Glide.get(context).getBitmapPool(), width, height); + } + + public CropTransformation(BitmapPool pool, int width, int height) { + this(pool, width, height, CropType.CENTER); + } + + public CropTransformation(Context context, int width, int height, CropType cropType) { + this(Glide.get(context).getBitmapPool(), width, height, cropType); + } + + public CropTransformation(BitmapPool pool, int width, int height, CropType cropType) { + mBitmapPool = pool; + mWidth = width; + mHeight = height; + mCropType = cropType; + } + + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); + mWidth = mWidth == 0 ? source.getWidth() : mWidth; + mHeight = mHeight == 0 ? source.getHeight() : mHeight; + + Bitmap.Config config = + source.getConfig() != null ? source.getConfig() : Bitmap.Config.ARGB_8888; + Bitmap bitmap = mBitmapPool.get(mWidth, mHeight, config); + if (bitmap == null) { + bitmap = Bitmap.createBitmap(mWidth, mHeight, config); } - private BitmapPool mBitmapPool; - private int mWidth; - private int mHeight; + float scaleX = (float) mWidth / source.getWidth(); + float scaleY = (float) mHeight / source.getHeight(); + float scale = Math.max(scaleX, scaleY); - private CropType mCropType = CropType.CENTER; + float scaledWidth = scale * source.getWidth(); + float scaledHeight = scale * source.getHeight(); + float left = (mWidth - scaledWidth) / 2; + float top = getTop(scaledHeight); + RectF targetRect = new RectF(left, top, left + scaledWidth, top + scaledHeight); - public CropTransformation(Context context) { - this(Glide.get(context).getBitmapPool()); - } - - public CropTransformation(BitmapPool pool) { - this(pool, 0, 0); - } - - public CropTransformation(Context context, int width, int height) { - this(Glide.get(context).getBitmapPool(), width, height); - } - - public CropTransformation(BitmapPool pool, int width, int height) { - this(pool, width, height, CropType.CENTER); - } - - public CropTransformation(Context context, int width, int height, CropType cropType) { - this(Glide.get(context).getBitmapPool(), width, height, cropType); - } - - public CropTransformation(BitmapPool pool, int width, int height, CropType cropType) { - mBitmapPool = pool; - mWidth = width; - mHeight = height; - mCropType = cropType; - } - - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); - mWidth = mWidth == 0 ? source.getWidth() : mWidth; - mHeight = mHeight == 0 ? source.getHeight() : mHeight; - - Bitmap.Config config = - source.getConfig() != null ? source.getConfig() : Bitmap.Config.ARGB_8888; - Bitmap bitmap = mBitmapPool.get(mWidth, mHeight, config); - if (bitmap == null) { - bitmap = Bitmap.createBitmap(mWidth, mHeight, config); - } - - float scaleX = (float) mWidth / source.getWidth(); - float scaleY = (float) mHeight / source.getHeight(); - float scale = Math.max(scaleX, scaleY); - - float scaledWidth = scale * source.getWidth(); - float scaledHeight = scale * source.getHeight(); - float left = (mWidth - scaledWidth) / 2; - float top = getTop(scaledHeight); - RectF targetRect = new RectF(left, top, left + scaledWidth, top + scaledHeight); - - Canvas canvas = new Canvas(bitmap); - canvas.drawBitmap(source, null, targetRect, null); - - return BitmapResource.obtain(bitmap, mBitmapPool); - } - - @Override - public String getId() { - return "CropTransformation(width=" + mWidth + ", height=" + mHeight + ", cropType=" - + mCropType + ")"; - } - - private float getTop(float scaledHeight) { - switch (mCropType) { - case TOP: - return 0; - case CENTER: - return (mHeight - scaledHeight) / 2; - case BOTTOM: - return mHeight - scaledHeight; - default: - return 0; - } + Canvas canvas = new Canvas(bitmap); + canvas.drawBitmap(source, null, targetRect, null); + + return BitmapResource.obtain(bitmap, mBitmapPool); + } + + @Override public String getId() { + return "CropTransformation(width=" + mWidth + ", height=" + mHeight + ", cropType=" + mCropType + + ")"; + } + + private float getTop(float scaledHeight) { + switch (mCropType) { + case TOP: + return 0; + case CENTER: + return (mHeight - scaledHeight) / 2; + case BOTTOM: + return mHeight - scaledHeight; + default: + return 0; } + } } diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/GrayscaleTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/GrayscaleTransformation.java index 5893f3c..e7b3f4c 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/GrayscaleTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/GrayscaleTransformation.java @@ -16,57 +16,55 @@ package jp.wasabeef.glide.transformations; * limitations under the License. */ -import com.bumptech.glide.Glide; -import com.bumptech.glide.load.Transformation; -import com.bumptech.glide.load.engine.Resource; -import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; -import com.bumptech.glide.load.resource.bitmap.BitmapResource; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.ColorMatrix; import android.graphics.ColorMatrixColorFilter; import android.graphics.Paint; +import com.bumptech.glide.Glide; +import com.bumptech.glide.load.Transformation; +import com.bumptech.glide.load.engine.Resource; +import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; +import com.bumptech.glide.load.resource.bitmap.BitmapResource; public class GrayscaleTransformation implements Transformation { - private BitmapPool mBitmapPool; + private BitmapPool mBitmapPool; - public GrayscaleTransformation(Context context) { - this(Glide.get(context).getBitmapPool()); + public GrayscaleTransformation(Context context) { + this(Glide.get(context).getBitmapPool()); + } + + public GrayscaleTransformation(BitmapPool pool) { + mBitmapPool = pool; + } + + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); + + 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); + if (bitmap == null) { + bitmap = Bitmap.createBitmap(width, height, config); } - public GrayscaleTransformation(BitmapPool pool) { - mBitmapPool = pool; - } + Canvas canvas = new Canvas(bitmap); + ColorMatrix saturation = new ColorMatrix(); + saturation.setSaturation(0f); + Paint paint = new Paint(); + paint.setColorFilter(new ColorMatrixColorFilter(saturation)); + canvas.drawBitmap(source, 0, 0, paint); - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); + return BitmapResource.obtain(bitmap, mBitmapPool); + } - 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); - if (bitmap == null) { - bitmap = Bitmap.createBitmap(width, height, config); - } - - Canvas canvas = new Canvas(bitmap); - ColorMatrix saturation = new ColorMatrix(); - saturation.setSaturation(0f); - Paint paint = new Paint(); - paint.setColorFilter(new ColorMatrixColorFilter(saturation)); - canvas.drawBitmap(source, 0, 0, paint); - - return BitmapResource.obtain(bitmap, mBitmapPool); - } - - @Override - public String getId() { - return "GrayscaleTransformation()"; - } + @Override public String getId() { + return "GrayscaleTransformation()"; + } } 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 ae637af..d55dd40 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/RoundedCornersTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/RoundedCornersTransformation.java @@ -16,12 +16,6 @@ package jp.wasabeef.glide.transformations; * limitations under the License. */ -import com.bumptech.glide.Glide; -import com.bumptech.glide.load.Transformation; -import com.bumptech.glide.load.engine.Resource; -import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; -import com.bumptech.glide.load.resource.bitmap.BitmapResource; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapShader; @@ -29,48 +23,52 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.RectF; import android.graphics.Shader; +import com.bumptech.glide.Glide; +import com.bumptech.glide.load.Transformation; +import com.bumptech.glide.load.engine.Resource; +import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; +import com.bumptech.glide.load.resource.bitmap.BitmapResource; public class RoundedCornersTransformation implements Transformation { - private BitmapPool mBitmapPool; + private BitmapPool mBitmapPool; - private int radius; - private int margin; + private int radius; + private int margin; - public RoundedCornersTransformation(Context context, int radius, int margin) { - this(Glide.get(context).getBitmapPool(), radius, margin); + public RoundedCornersTransformation(Context context, int radius, int margin) { + this(Glide.get(context).getBitmapPool(), radius, margin); + } + + public RoundedCornersTransformation(BitmapPool pool, int radius, int margin) { + mBitmapPool = pool; + this.radius = radius; + this.margin = margin; + } + + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); + + int width = source.getWidth(); + int height = source.getHeight(); + + Bitmap bitmap = mBitmapPool.get(width, height, Bitmap.Config.ARGB_8888); + if (bitmap == null) { + bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); } - public RoundedCornersTransformation(BitmapPool pool, int radius, int margin) { - mBitmapPool = pool; - this.radius = radius; - this.margin = margin; - } + Canvas canvas = new Canvas(bitmap); + Paint paint = new Paint(); + paint.setAntiAlias(true); + paint.setShader(new BitmapShader(source, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)); + canvas.drawRoundRect(new RectF(margin, margin, width - margin, height - margin), radius, radius, + paint); - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); + return BitmapResource.obtain(bitmap, mBitmapPool); + } - int width = source.getWidth(); - int height = source.getHeight(); - - Bitmap bitmap = mBitmapPool.get(width, height, Bitmap.Config.ARGB_8888); - if (bitmap == null) { - bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); - } - - Canvas canvas = new Canvas(bitmap); - Paint paint = new Paint(); - paint.setAntiAlias(true); - paint.setShader(new BitmapShader(source, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)); - canvas.drawRoundRect(new RectF(margin, margin, width - margin, height - margin), - radius, radius, paint); - - return BitmapResource.obtain(bitmap, mBitmapPool); - } - - @Override - public String getId() { - return "RoundedTransformation(radius=" + radius + ", margin=" + margin + ")"; - } + @Override public String getId() { + return "RoundedTransformation(radius=" + radius + ", margin=" + margin + ")"; + } } 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 160dd99..9180f9f 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 @@ -16,15 +16,13 @@ package jp.wasabeef.glide.transformations.gpu; * limitations under the License. */ +import android.content.Context; +import android.graphics.Bitmap; import com.bumptech.glide.Glide; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapResource; - -import android.content.Context; -import android.graphics.Bitmap; - import jp.co.cyberagent.android.gpuimage.GPUImage; import jp.co.cyberagent.android.gpuimage.GPUImageBrightnessFilter; @@ -33,47 +31,46 @@ import jp.co.cyberagent.android.gpuimage.GPUImageBrightnessFilter; */ public class BrightnessFilterTransformation implements Transformation { - private Context mContext; - private BitmapPool mBitmapPool; + private Context mContext; + private BitmapPool mBitmapPool; - private GPUImageBrightnessFilter mFilter = new GPUImageBrightnessFilter(); - private float mBrightness; + private GPUImageBrightnessFilter mFilter = new GPUImageBrightnessFilter(); + private float mBrightness; - public BrightnessFilterTransformation(Context context) { - this(context, Glide.get(context).getBitmapPool()); - } + public BrightnessFilterTransformation(Context context) { + this(context, Glide.get(context).getBitmapPool()); + } - public BrightnessFilterTransformation(Context context, BitmapPool pool) { - this(context, pool, 0.0f); - } + public BrightnessFilterTransformation(Context context, BitmapPool pool) { + this(context, pool, 0.0f); + } - public BrightnessFilterTransformation(Context context, float brightness) { - this(context, Glide.get(context).getBitmapPool(), brightness); - } + public BrightnessFilterTransformation(Context context, float brightness) { + this(context, Glide.get(context).getBitmapPool(), brightness); + } - public BrightnessFilterTransformation(Context context, BitmapPool pool, float brightness) { - mContext = context; - mBitmapPool = pool; - mBrightness = brightness; - mFilter.setBrightness(mBrightness); - } + public BrightnessFilterTransformation(Context context, BitmapPool pool, float brightness) { + mContext = context; + mBitmapPool = pool; + mBrightness = brightness; + mFilter.setBrightness(mBrightness); + } - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); - GPUImage gpuImage = new GPUImage(mContext); - gpuImage.setImage(source); - gpuImage.setFilter(mFilter); - Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); + GPUImage gpuImage = new GPUImage(mContext); + gpuImage.setImage(source); + gpuImage.setFilter(mFilter); + Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); - source.recycle(); + source.recycle(); - return BitmapResource.obtain(bitmap, mBitmapPool); - } + return BitmapResource.obtain(bitmap, mBitmapPool); + } - @Override - public String getId() { - return "BrightnessFilterTransformation(brightness=" + mBrightness + ")"; - } + @Override public String getId() { + return "BrightnessFilterTransformation(brightness=" + mBrightness + ")"; + } } 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 0350aca..95c907d 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 @@ -16,15 +16,13 @@ package jp.wasabeef.glide.transformations.gpu; * limitations under the License. */ +import android.content.Context; +import android.graphics.Bitmap; import com.bumptech.glide.Glide; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapResource; - -import android.content.Context; -import android.graphics.Bitmap; - import jp.co.cyberagent.android.gpuimage.GPUImage; import jp.co.cyberagent.android.gpuimage.GPUImageContrastFilter; @@ -33,47 +31,46 @@ import jp.co.cyberagent.android.gpuimage.GPUImageContrastFilter; */ public class ContrastFilterTransformation implements Transformation { - private Context mContext; - private BitmapPool mBitmapPool; + private Context mContext; + private BitmapPool mBitmapPool; - private GPUImageContrastFilter mFilter = new GPUImageContrastFilter(); - private float mContrast; + private GPUImageContrastFilter mFilter = new GPUImageContrastFilter(); + private float mContrast; - public ContrastFilterTransformation(Context context) { - this(context, Glide.get(context).getBitmapPool()); - } + public ContrastFilterTransformation(Context context) { + this(context, Glide.get(context).getBitmapPool()); + } - public ContrastFilterTransformation(Context context, BitmapPool pool) { - this(context, pool, 1.0f); - } + public ContrastFilterTransformation(Context context, BitmapPool pool) { + this(context, pool, 1.0f); + } - public ContrastFilterTransformation(Context context, float contrast) { - this(context, Glide.get(context).getBitmapPool(), contrast); - } + public ContrastFilterTransformation(Context context, float contrast) { + this(context, Glide.get(context).getBitmapPool(), contrast); + } - public ContrastFilterTransformation(Context context, BitmapPool pool, float contrast) { - mContext = context; - mBitmapPool = pool; - mContrast = contrast; - mFilter.setContrast(mContrast); - } + public ContrastFilterTransformation(Context context, BitmapPool pool, float contrast) { + mContext = context; + mBitmapPool = pool; + mContrast = contrast; + mFilter.setContrast(mContrast); + } - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); - GPUImage gpuImage = new GPUImage(mContext); - gpuImage.setImage(source); - gpuImage.setFilter(mFilter); - Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); + GPUImage gpuImage = new GPUImage(mContext); + gpuImage.setImage(source); + gpuImage.setFilter(mFilter); + Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); - source.recycle(); + source.recycle(); - return BitmapResource.obtain(bitmap, mBitmapPool); - } + return BitmapResource.obtain(bitmap, mBitmapPool); + } - @Override - public String getId() { - return "ContrastFilterTransformation(contrast=" + mContrast + ")"; - } + @Override public String getId() { + return "ContrastFilterTransformation(contrast=" + mContrast + ")"; + } } diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/InvertFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/InvertFilterTransformation.java index 3f1787e..2650a68 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/InvertFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/InvertFilterTransformation.java @@ -16,15 +16,13 @@ package jp.wasabeef.glide.transformations.gpu; * limitations under the License. */ +import android.content.Context; +import android.graphics.Bitmap; import com.bumptech.glide.Glide; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapResource; - -import android.content.Context; -import android.graphics.Bitmap; - import jp.co.cyberagent.android.gpuimage.GPUImage; import jp.co.cyberagent.android.gpuimage.GPUImageColorInvertFilter; @@ -33,34 +31,33 @@ import jp.co.cyberagent.android.gpuimage.GPUImageColorInvertFilter; */ public class InvertFilterTransformation implements Transformation { - private Context mContext; - private BitmapPool mBitmapPool; + private Context mContext; + private BitmapPool mBitmapPool; - public InvertFilterTransformation(Context context) { - this(context, Glide.get(context).getBitmapPool()); - } + public InvertFilterTransformation(Context context) { + this(context, Glide.get(context).getBitmapPool()); + } - public InvertFilterTransformation(Context context, BitmapPool pool) { - mContext = context; - mBitmapPool = pool; - } + public InvertFilterTransformation(Context context, BitmapPool pool) { + mContext = context; + mBitmapPool = pool; + } - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); - GPUImage gpuImage = new GPUImage(mContext); - gpuImage.setImage(source); - gpuImage.setFilter(new GPUImageColorInvertFilter()); - Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); + GPUImage gpuImage = new GPUImage(mContext); + gpuImage.setImage(source); + gpuImage.setFilter(new GPUImageColorInvertFilter()); + Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); - source.recycle(); + source.recycle(); - return BitmapResource.obtain(bitmap, mBitmapPool); - } + return BitmapResource.obtain(bitmap, mBitmapPool); + } - @Override - public String getId() { - return "InvertFilterTransformation()"; - } + @Override public String getId() { + return "InvertFilterTransformation()"; + } } diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java index 0e23947..3b956f0 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java @@ -16,15 +16,13 @@ package jp.wasabeef.glide.transformations.gpu; * limitations under the License. */ +import android.content.Context; +import android.graphics.Bitmap; import com.bumptech.glide.Glide; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapResource; - -import android.content.Context; -import android.graphics.Bitmap; - import jp.co.cyberagent.android.gpuimage.GPUImage; import jp.co.cyberagent.android.gpuimage.GPUImageKuwaharaFilter; @@ -32,7 +30,8 @@ import jp.co.cyberagent.android.gpuimage.GPUImageKuwaharaFilter; * Kuwahara image abstraction, drawn from the work of Kyprianidis, et. al. in their publication * "Anisotropic Kuwahara Filtering on the GPU" within the GPU Pro collection. This produces an * oil-painting-like - * image, but it is extremely computationally expensive, so it can take seconds to render a frame on + * image, but it is extremely computationally expensive, so it can take seconds to render a frame + * on * an iPad 2. * This might be best used for still images. * @@ -41,47 +40,46 @@ import jp.co.cyberagent.android.gpuimage.GPUImageKuwaharaFilter; */ public class KuwaharaFilterTransformation implements Transformation { - private Context mContext; - private BitmapPool mBitmapPool; + private Context mContext; + private BitmapPool mBitmapPool; - private GPUImageKuwaharaFilter mFilter = new GPUImageKuwaharaFilter(); - private int mRadius; + private GPUImageKuwaharaFilter mFilter = new GPUImageKuwaharaFilter(); + private int mRadius; - public KuwaharaFilterTransformation(Context context) { - this(context, Glide.get(context).getBitmapPool()); - } + public KuwaharaFilterTransformation(Context context) { + this(context, Glide.get(context).getBitmapPool()); + } - public KuwaharaFilterTransformation(Context context, BitmapPool pool) { - this(context, pool, 25); - } + public KuwaharaFilterTransformation(Context context, BitmapPool pool) { + this(context, pool, 25); + } - public KuwaharaFilterTransformation(Context context, int radius) { - this(context, Glide.get(context).getBitmapPool(), radius); - } + public KuwaharaFilterTransformation(Context context, int radius) { + this(context, Glide.get(context).getBitmapPool(), radius); + } - public KuwaharaFilterTransformation(Context context, BitmapPool pool, int radius) { - mContext = context; - mBitmapPool = pool; - mRadius = radius; - mFilter.setRadius(mRadius); - } + public KuwaharaFilterTransformation(Context context, BitmapPool pool, int radius) { + mContext = context; + mBitmapPool = pool; + mRadius = radius; + mFilter.setRadius(mRadius); + } - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); - GPUImage gpuImage = new GPUImage(mContext); - gpuImage.setImage(source); - gpuImage.setFilter(mFilter); - Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); + GPUImage gpuImage = new GPUImage(mContext); + gpuImage.setImage(source); + gpuImage.setFilter(mFilter); + Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); - source.recycle(); + source.recycle(); - return BitmapResource.obtain(bitmap, mBitmapPool); - } + return BitmapResource.obtain(bitmap, mBitmapPool); + } - @Override - public String getId() { - return "KuwaharaFilterTransformation(radius=" + mRadius + ")"; - } + @Override public String getId() { + return "KuwaharaFilterTransformation(radius=" + mRadius + ")"; + } } 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 72d61d5..4fe787c 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 @@ -16,15 +16,13 @@ package jp.wasabeef.glide.transformations.gpu; * limitations under the License. */ +import android.content.Context; +import android.graphics.Bitmap; import com.bumptech.glide.Glide; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapResource; - -import android.content.Context; -import android.graphics.Bitmap; - import jp.co.cyberagent.android.gpuimage.GPUImage; import jp.co.cyberagent.android.gpuimage.GPUImagePixelationFilter; @@ -35,47 +33,46 @@ import jp.co.cyberagent.android.gpuimage.GPUImagePixelationFilter; */ public class PixelationFilterTransformation implements Transformation { - private Context mContext; - private BitmapPool mBitmapPool; + private Context mContext; + private BitmapPool mBitmapPool; - private GPUImagePixelationFilter mFilter = new GPUImagePixelationFilter(); - private float mPixel; + private GPUImagePixelationFilter mFilter = new GPUImagePixelationFilter(); + private float mPixel; - public PixelationFilterTransformation(Context context) { - this(context, Glide.get(context).getBitmapPool()); - } + public PixelationFilterTransformation(Context context) { + this(context, Glide.get(context).getBitmapPool()); + } - public PixelationFilterTransformation(Context context, BitmapPool pool) { - this(context, pool, 10f); - } + public PixelationFilterTransformation(Context context, BitmapPool pool) { + this(context, pool, 10f); + } - public PixelationFilterTransformation(Context context, float pixel) { - this(context, Glide.get(context).getBitmapPool(), pixel); - } + public PixelationFilterTransformation(Context context, float pixel) { + this(context, Glide.get(context).getBitmapPool(), pixel); + } - public PixelationFilterTransformation(Context context, BitmapPool pool, float pixel) { - mContext = context; - mBitmapPool = pool; - mPixel = pixel; - mFilter.setPixel(mPixel); - } + public PixelationFilterTransformation(Context context, BitmapPool pool, float pixel) { + mContext = context; + mBitmapPool = pool; + mPixel = pixel; + mFilter.setPixel(mPixel); + } - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); - GPUImage gpuImage = new GPUImage(mContext); - gpuImage.setImage(source); - gpuImage.setFilter(mFilter); - Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); + GPUImage gpuImage = new GPUImage(mContext); + gpuImage.setImage(source); + gpuImage.setFilter(mFilter); + Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); - source.recycle(); + source.recycle(); - return BitmapResource.obtain(bitmap, mBitmapPool); - } + return BitmapResource.obtain(bitmap, mBitmapPool); + } - @Override - public String getId() { - return "PixelationFilterTransformation(pixel=" + mPixel + ")"; - } + @Override public String getId() { + return "PixelationFilterTransformation(pixel=" + mPixel + ")"; + } } 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 13d581e..4f532e3 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 @@ -16,15 +16,13 @@ package jp.wasabeef.glide.transformations.gpu; * limitations under the License. */ +import android.content.Context; +import android.graphics.Bitmap; import com.bumptech.glide.Glide; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapResource; - -import android.content.Context; -import android.graphics.Bitmap; - import jp.co.cyberagent.android.gpuimage.GPUImage; import jp.co.cyberagent.android.gpuimage.GPUImageSepiaFilter; @@ -35,47 +33,46 @@ import jp.co.cyberagent.android.gpuimage.GPUImageSepiaFilter; */ public class SepiaFilterTransformation implements Transformation { - private Context mContext; - private BitmapPool mBitmapPool; + private Context mContext; + private BitmapPool mBitmapPool; - private GPUImageSepiaFilter mFilter = new GPUImageSepiaFilter(); - private float mIntensity; + private GPUImageSepiaFilter mFilter = new GPUImageSepiaFilter(); + private float mIntensity; - public SepiaFilterTransformation(Context context) { - this(context, Glide.get(context).getBitmapPool()); - } + public SepiaFilterTransformation(Context context) { + this(context, Glide.get(context).getBitmapPool()); + } - public SepiaFilterTransformation(Context context, BitmapPool pool) { - this(context, pool, 1.0f); - } + public SepiaFilterTransformation(Context context, BitmapPool pool) { + this(context, pool, 1.0f); + } - public SepiaFilterTransformation(Context context, float intensity) { - this(context, Glide.get(context).getBitmapPool(), intensity); - } + public SepiaFilterTransformation(Context context, float intensity) { + this(context, Glide.get(context).getBitmapPool(), intensity); + } - public SepiaFilterTransformation(Context context, BitmapPool pool, float intensity) { - mContext = context; - mBitmapPool = pool; - mIntensity = intensity; - mFilter.setIntensity(mIntensity); - } + public SepiaFilterTransformation(Context context, BitmapPool pool, float intensity) { + mContext = context; + mBitmapPool = pool; + mIntensity = intensity; + mFilter.setIntensity(mIntensity); + } - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); - GPUImage gpuImage = new GPUImage(mContext); - gpuImage.setImage(source); - gpuImage.setFilter(mFilter); - Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); + GPUImage gpuImage = new GPUImage(mContext); + gpuImage.setImage(source); + gpuImage.setFilter(mFilter); + Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); - source.recycle(); + source.recycle(); - return BitmapResource.obtain(bitmap, mBitmapPool); - } + return BitmapResource.obtain(bitmap, mBitmapPool); + } - @Override - public String getId() { - return "SepiaFilterTransformation(intensity=" + mIntensity + ")"; - } + @Override public String getId() { + return "SepiaFilterTransformation(intensity=" + mIntensity + ")"; + } } diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java index b35daad..942d9ec 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java @@ -16,48 +16,45 @@ package jp.wasabeef.glide.transformations.gpu; * limitations under the License. */ +import android.content.Context; +import android.graphics.Bitmap; import com.bumptech.glide.Glide; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapResource; - -import android.content.Context; -import android.graphics.Bitmap; - import jp.co.cyberagent.android.gpuimage.GPUImage; import jp.co.cyberagent.android.gpuimage.GPUImageSketchFilter; public class SketchFilterTransformation implements Transformation { - private Context mContext; - private BitmapPool mBitmapPool; + private Context mContext; + private BitmapPool mBitmapPool; - public SketchFilterTransformation(Context context) { - this(context, Glide.get(context).getBitmapPool()); - } + public SketchFilterTransformation(Context context) { + this(context, Glide.get(context).getBitmapPool()); + } - public SketchFilterTransformation(Context context, BitmapPool pool) { - mContext = context; - mBitmapPool = pool; - } + public SketchFilterTransformation(Context context, BitmapPool pool) { + mContext = context; + mBitmapPool = pool; + } - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); - GPUImage gpuImage = new GPUImage(mContext); - gpuImage.setImage(source); - gpuImage.setFilter(new GPUImageSketchFilter()); - Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); + GPUImage gpuImage = new GPUImage(mContext); + gpuImage.setImage(source); + gpuImage.setFilter(new GPUImageSketchFilter()); + Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); - source.recycle(); + source.recycle(); - return BitmapResource.obtain(bitmap, mBitmapPool); - } + return BitmapResource.obtain(bitmap, mBitmapPool); + } - @Override - public String getId() { - return "SketchFilterTransformation()"; - } + @Override public String getId() { + return "SketchFilterTransformation()"; + } } 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 88ad9a1..99a3887 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 @@ -16,16 +16,14 @@ package jp.wasabeef.glide.transformations.gpu; * limitations under the License. */ +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.PointF; import com.bumptech.glide.Glide; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapResource; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.PointF; - import jp.co.cyberagent.android.gpuimage.GPUImage; import jp.co.cyberagent.android.gpuimage.GPUImageSwirlFilter; @@ -34,61 +32,59 @@ import jp.co.cyberagent.android.gpuimage.GPUImageSwirlFilter; */ public class SwirlFilterTransformation implements Transformation { - private Context mContext; - private BitmapPool mBitmapPool; + private Context mContext; + private BitmapPool mBitmapPool; - private GPUImageSwirlFilter mFilter = new GPUImageSwirlFilter(); - private float mRadius; - private float mAngle; - private PointF mCenter; + private GPUImageSwirlFilter mFilter = new GPUImageSwirlFilter(); + private float mRadius; + private float mAngle; + private PointF mCenter; - public SwirlFilterTransformation(Context context) { - this(context, Glide.get(context).getBitmapPool()); - } + public SwirlFilterTransformation(Context context) { + this(context, Glide.get(context).getBitmapPool()); + } - public SwirlFilterTransformation(Context context, BitmapPool pool) { - this(context, pool, .5f, 1.0f, new PointF(0.5f, 0.5f)); - } + public SwirlFilterTransformation(Context context, BitmapPool pool) { + this(context, pool, .5f, 1.0f, new PointF(0.5f, 0.5f)); + } - public SwirlFilterTransformation(Context context, - float radius, float angle, PointF center) { - this(context, Glide.get(context).getBitmapPool(), radius, angle, center); - } + public SwirlFilterTransformation(Context context, float radius, float angle, PointF center) { + this(context, Glide.get(context).getBitmapPool(), radius, angle, center); + } - /** - * @param radius from 0.0 to 1.0, default 0.5 - * @param angle minimum 0.0, default 1.0 - * @param center default (0.5, 0.5) - */ - public SwirlFilterTransformation(Context context, BitmapPool pool, - float radius, float angle, PointF center) { - mContext = context; - mBitmapPool = pool; - mRadius = radius; - mAngle = angle; - mCenter = center; - mFilter.setRadius(mRadius); - mFilter.setAngle(mAngle); - mFilter.setCenter(mCenter); - } + /** + * @param radius from 0.0 to 1.0, default 0.5 + * @param angle minimum 0.0, default 1.0 + * @param center default (0.5, 0.5) + */ + public SwirlFilterTransformation(Context context, BitmapPool pool, float radius, float angle, + PointF center) { + mContext = context; + mBitmapPool = pool; + mRadius = radius; + mAngle = angle; + mCenter = center; + mFilter.setRadius(mRadius); + mFilter.setAngle(mAngle); + mFilter.setCenter(mCenter); + } - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); - GPUImage gpuImage = new GPUImage(mContext); - gpuImage.setImage(source); - gpuImage.setFilter(mFilter); - Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); + GPUImage gpuImage = new GPUImage(mContext); + gpuImage.setImage(source); + gpuImage.setFilter(mFilter); + Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); - source.recycle(); + source.recycle(); - return BitmapResource.obtain(bitmap, mBitmapPool); - } + return BitmapResource.obtain(bitmap, mBitmapPool); + } - @Override - public String getId() { - return "SwirlFilterTransformation(radius=" + mRadius + - ",angle=" + mAngle + ",center=" + mCenter.toString() + ")"; - } + @Override public String getId() { + return "SwirlFilterTransformation(radius=" + mRadius + + ",angle=" + mAngle + ",center=" + mCenter.toString() + ")"; + } } 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 dc42e8b..c03ef13 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 @@ -16,15 +16,13 @@ package jp.wasabeef.glide.transformations.gpu; * limitations under the License. */ +import android.content.Context; +import android.graphics.Bitmap; import com.bumptech.glide.Glide; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapResource; - -import android.content.Context; -import android.graphics.Bitmap; - import jp.co.cyberagent.android.gpuimage.GPUImage; import jp.co.cyberagent.android.gpuimage.GPUImageToonFilter; @@ -35,52 +33,51 @@ import jp.co.cyberagent.android.gpuimage.GPUImageToonFilter; */ public class ToonFilterTransformation implements Transformation { - private Context mContext; - private BitmapPool mBitmapPool; + private Context mContext; + private BitmapPool mBitmapPool; - private GPUImageToonFilter mFilter = new GPUImageToonFilter(); - private float mThreshold; - private float mQuantizationLevels; + private GPUImageToonFilter mFilter = new GPUImageToonFilter(); + private float mThreshold; + private float mQuantizationLevels; - public ToonFilterTransformation(Context context) { - this(context, Glide.get(context).getBitmapPool()); - } + public ToonFilterTransformation(Context context) { + this(context, Glide.get(context).getBitmapPool()); + } - public ToonFilterTransformation(Context context, BitmapPool pool) { - this(context, pool, .2f, 10.0f); - } + public ToonFilterTransformation(Context context, BitmapPool pool) { + this(context, pool, .2f, 10.0f); + } - public ToonFilterTransformation(Context context, float threshold, float quantizationLevels) { - this(context, Glide.get(context).getBitmapPool(), threshold, quantizationLevels); - } + public ToonFilterTransformation(Context context, float threshold, float quantizationLevels) { + this(context, Glide.get(context).getBitmapPool(), threshold, quantizationLevels); + } - public ToonFilterTransformation(Context context, BitmapPool pool, - float threshold, float quantizationLevels) { - mContext = context; - mBitmapPool = pool; - mThreshold = threshold; - mQuantizationLevels = quantizationLevels; - mFilter.setThreshold(mThreshold); - mFilter.setQuantizationLevels(mQuantizationLevels); - } + public ToonFilterTransformation(Context context, BitmapPool pool, float threshold, + float quantizationLevels) { + mContext = context; + mBitmapPool = pool; + mThreshold = threshold; + mQuantizationLevels = quantizationLevels; + mFilter.setThreshold(mThreshold); + mFilter.setQuantizationLevels(mQuantizationLevels); + } - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); - GPUImage gpuImage = new GPUImage(mContext); - gpuImage.setImage(source); - gpuImage.setFilter(mFilter); - Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); + GPUImage gpuImage = new GPUImage(mContext); + gpuImage.setImage(source); + gpuImage.setFilter(mFilter); + Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); - source.recycle(); + source.recycle(); - return BitmapResource.obtain(bitmap, mBitmapPool); - } + return BitmapResource.obtain(bitmap, mBitmapPool); + } - @Override - public String getId() { - return "ToonFilterTransformation(threshold=" + mThreshold + - ",quantizationLevels=" + mQuantizationLevels + ")"; - } + @Override public String getId() { + return "ToonFilterTransformation(threshold=" + mThreshold + + ",quantizationLevels=" + mQuantizationLevels + ")"; + } } diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java index 5c4e5a2..f8342cf 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java @@ -16,18 +16,15 @@ package jp.wasabeef.glide.transformations.gpu; * limitations under the License. */ +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.PointF; import com.bumptech.glide.Glide; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapResource; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.PointF; - import java.util.Arrays; - import jp.co.cyberagent.android.gpuimage.GPUImage; import jp.co.cyberagent.android.gpuimage.GPUImageVignetteFilter; @@ -38,60 +35,59 @@ import jp.co.cyberagent.android.gpuimage.GPUImageVignetteFilter; */ public class VignetteFilterTransformation implements Transformation { - private Context mContext; - private BitmapPool mBitmapPool; + private Context mContext; + private BitmapPool mBitmapPool; - private GPUImageVignetteFilter mFilter = new GPUImageVignetteFilter(); - private PointF mCenter; - private float[] mVignetteColor; - private float mVignetteStart; - private float mVignetteEnd; + private GPUImageVignetteFilter mFilter = new GPUImageVignetteFilter(); + private PointF mCenter; + private float[] mVignetteColor; + private float mVignetteStart; + private float mVignetteEnd; - public VignetteFilterTransformation(Context context) { - this(context, Glide.get(context).getBitmapPool()); - } + public VignetteFilterTransformation(Context context) { + this(context, Glide.get(context).getBitmapPool()); + } - public VignetteFilterTransformation(Context context, BitmapPool pool) { - this(context, pool, new PointF(0.5f, 0.5f), new float[]{0.0f, 0.0f, 0.0f}, 0.0f, 0.75f); - } + public VignetteFilterTransformation(Context context, BitmapPool pool) { + this(context, pool, new PointF(0.5f, 0.5f), new float[] { 0.0f, 0.0f, 0.0f }, 0.0f, 0.75f); + } - public VignetteFilterTransformation(Context context, - PointF center, float[] color, float start, float end) { - this(context, Glide.get(context).getBitmapPool(), center, color, start, end); - } + public VignetteFilterTransformation(Context context, PointF center, float[] color, float start, + float end) { + this(context, Glide.get(context).getBitmapPool(), center, color, start, end); + } - public VignetteFilterTransformation(Context context, BitmapPool pool, - PointF center, float[] color, float start, float end) { - mContext = context; - mBitmapPool = pool; - mCenter = center; - mVignetteColor = color; - mVignetteStart = start; - mVignetteEnd = end; - mFilter.setVignetteCenter(mCenter); - mFilter.setVignetteColor(mVignetteColor); - mFilter.setVignetteStart(mVignetteStart); - mFilter.setVignetteEnd(mVignetteEnd); - } + public VignetteFilterTransformation(Context context, BitmapPool pool, PointF center, + float[] color, float start, float end) { + mContext = context; + mBitmapPool = pool; + mCenter = center; + mVignetteColor = color; + mVignetteStart = start; + mVignetteEnd = end; + mFilter.setVignetteCenter(mCenter); + mFilter.setVignetteColor(mVignetteColor); + mFilter.setVignetteStart(mVignetteStart); + mFilter.setVignetteEnd(mVignetteEnd); + } - @Override - public Resource transform(Resource resource, int outWidth, int outHeight) { - Bitmap source = resource.get(); + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); - GPUImage gpuImage = new GPUImage(mContext); - gpuImage.setImage(source); - gpuImage.setFilter(mFilter); - Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); + GPUImage gpuImage = new GPUImage(mContext); + gpuImage.setImage(source); + gpuImage.setFilter(mFilter); + Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); - source.recycle(); + source.recycle(); - return BitmapResource.obtain(bitmap, mBitmapPool); - } + return BitmapResource.obtain(bitmap, mBitmapPool); + } - @Override - public String getId() { - return "VignetteFilterTransformation(center=" + mCenter.toString() + - ",color=" + Arrays.toString(mVignetteColor) + - ",start=" + mVignetteStart + ",end=" + mVignetteEnd + ")"; - } + @Override public String getId() { + return "VignetteFilterTransformation(center=" + mCenter.toString() + + ",color=" + Arrays.toString(mVignetteColor) + + ",start=" + mVignetteStart + ",end=" + mVignetteEnd + ")"; + } }