bump up 1.4.0

Author: wasabeef

CHANGELOG.md

@@ -1,6 +1,12 @@
 Change Log
 ==========
 
+Version 1.4.0 *(2016-02-28)*
+----------------------------
+
+fix Issue [#29](https://github.com/wasabeef/glide-transformations/issues/29)
+ Use FastBlur as a fallback upon RenderScript failure.
+
 Version 1.3.1 *(2015-11-27)*
 ----------------------------
 

README.md

@@ -33,7 +33,7 @@ repositories {
 }
 
 dependencies {
-    compile 'jp.wasabeef:glide-transformations:1.3.1'
+    compile 'jp.wasabeef:glide-transformations:1.4.0'
     // If you want to use the GPU Filters
     compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.3.0'
 }
@@ -97,10 +97,6 @@ android {
 `SwirlFilterTransformation`, `BrightnessFilterTransformation`, `KuwaharaFilterTransformation`
 `VignetteFilterTransformation`
 
-### Proguard
-```
--dontwarn jp.co.cyberagent.android.gpuimage.**
-```
 
 Applications using Glide Transformations
 ---

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-alpha1'
+        classpath 'com.android.tools.build:gradle:2.0.0-beta6'
         classpath 'com.novoda:bintray-release:0.3.4'
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=1.3.1
+VERSION_NAME=1.4.0
 GROUP=jp.wasabeef
 ARTIFACT_ID=glide-transformations
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip

transformations/build.gradle

@@ -14,6 +14,8 @@ android {
         // Warning:Renderscript support mode is not currently supported with renderscript target 21+
         renderscriptTargetApi RENDERSCRIPT_TARGET_API as int
         renderscriptSupportModeEnabled true
+
+        consumerProguardFiles 'proguard-rules.txt'
     }
 }
 
@@ -22,6 +24,26 @@ dependencies {
     provided "jp.co.cyberagent.android.gpuimage:gpuimage-library:${GPUIMAGE_VERSION}"
 }
 
+task androidJavadocs(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+    classifier = 'javadoc'
+    from androidJavadocs.destinationDir
+}
+
+task androidSourcesJar(type: Jar) {
+    classifier = 'sources'
+    from android.sourceSets.main.java.srcDirs
+}
+
+artifacts {
+    archives androidSourcesJar
+    archives androidJavadocsJar
+}
+
 publish {
     userOrg = POM_DEVELOPER_ID
     groupId = GROUP

transformations/proguard-rules.txt

@@ -0,0 +1,7 @@
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+-keep class android.support.v8.renderscript.** { *; }
+
+-dontwarn jp.co.cyberagent.android.gpuimage.**

transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java

@@ -22,13 +22,15 @@
 import android.graphics.Paint;
 import android.support.v8.renderscript.Allocation;
 import android.support.v8.renderscript.Element;
+import android.support.v8.renderscript.RSRuntimeException;
 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;
+import jp.wasabeef.glide.transformations.internal.FastBlur;
 
 public class BlurTransformation implements Transformation<Bitmap> {
 
@@ -88,18 +90,26 @@ public Resource<Bitmap> transform(Resource<Bitmap> resource, int outWidth, int o
     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();
+    RenderScript rs = null;
+    try {
+      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);
+    } catch (RSRuntimeException e) {
+      bitmap = FastBlur.doBlur(bitmap, mRadius, true);
+    } finally {
+      if (rs != null) {
+        rs.destroy();
+      }
+    }
 
     return BitmapResource.obtain(bitmap, mBitmapPool);
   }