Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1527320 authored by Miao Wang's avatar Miao Wang Committed by Android Git Automerger
Browse files

am 5f178d00: am 8afff945: am e71248e4: am 1bfb4e42: Create RenderScript ScriptC without resourceID. 

* commit '5f178d00':
  Create RenderScript ScriptC without resourceID.
parents 738e8bbc 5f178d00

Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni 


LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_MULTILIB := 32



LOCAL_JAVA_LIBRARIES += org.apache.http.legacy



include $(BUILD_PACKAGE)

src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public class ImageFilterChanSat extends ImageFilterRS { 
        Type.Builder tb_float = new Type.Builder(rsCtx, Element.F32_4(rsCtx));

        tb_float.setX(in.getType().getX());

        tb_float.setY(in.getType().getY());

        mScript = new ScriptC_saturation(rsCtx, res, R.raw.saturation);

        mScript = new ScriptC_saturation(rsCtx);

    }

src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public class ImageFilterGrad extends ImageFilterRS { 
        Type.Builder tb_float = new Type.Builder(rsCtx, Element.F32_4(rsCtx));

        tb_float.setX(in.getType().getX());

        tb_float.setY(in.getType().getY());

        mScript = new ScriptC_grad(rsCtx, res, R.raw.grad);

        mScript = new ScriptC_grad(rsCtx);

    }

src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java

+1 −2
Original line number Diff line number Diff line
@@ -159,8 +159,7 @@ public abstract class ImageFilterRS extends ImageFilter { 


    private static Allocation convertRGBAtoA(RenderScript RS, Bitmap bitmap) {

        if (RS != mRScache || mGreyConvert == null) {

            mGreyConvert = new ScriptC_grey(RS, RS.getApplicationContext().getResources(),

                                            R.raw.grey);

            mGreyConvert = new ScriptC_grey(RS);

            mRScache = RS;

        }

src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class ImageFilterSharpen extends ImageFilterRS { 
    protected void createFilter(android.content.res.Resources res, float scaleFactor,

            int quality) {

        if (mScript == null) {

            mScript = new ScriptC_convolve3x3(getRenderScriptContext(), res, R.raw.convolve3x3);

            mScript = new ScriptC_convolve3x3(getRenderScriptContext());

        }

    }