Removes all usages of ScriptC_* variables (7675f088) · Commits · e / os / android_packages_apps_Gallery2

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import com.android.gallery3d.filtershow.pipeline.FilterEnvironment;

		public class ImageFilterChanSat extends ImageFilterRS {
		private static final String LOGTAG = "ImageFilterChanSat";
		private ScriptC_saturation mScript;
		private Bitmap mSourceBitmap;

		private static final int STRIP_SIZE = 64;
		@@ -58,10 +57,6 @@ public class ImageFilterChanSat extends ImageFilterRS {

		@Override
		public void resetScripts() {
		if (mScript != null) {
		mScript.destroy();
		mScript = null;
		}
		}
		@Override
		protected void createFilter(android.content.res.Resources res, float scaleFactor,
		@@ -77,7 +72,6 @@ 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);
		}


		@@ -120,9 +114,6 @@ public class ImageFilterChanSat extends ImageFilterRS {
		Matrix m = getOriginalToScreenMatrix(width, height);


		mScript.set_saturation(sat);

		mScript.invoke_setupGradParams();
		runSelectiveAdjust(
		getInPixelsAllocation(), getOutPixelsAllocation());

		@@ -142,7 +133,6 @@ public class ImageFilterChanSat extends ImageFilterRS {
		endy = height;
		}
		options.setY(ty, endy);
		mScript.forEach_selectiveAdjust(in, out, options);
		if (checkStop()) {
		return;
		}

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

+0 −19

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import com.android.gallery3d.filtershow.pipeline.FilterEnvironment;

		public class ImageFilterGrad extends ImageFilterRS {
		private static final String LOGTAG = "ImageFilterGrad";
		private ScriptC_grad mScript;
		private Bitmap mSourceBitmap;
		private static final int RADIUS_SCALE_FACTOR = 160;

		@@ -68,10 +67,6 @@ public class ImageFilterGrad extends ImageFilterRS {

		@Override
		public void resetScripts() {
		if (mScript != null) {
		mScript.destroy();
		mScript = null;
		}
		}
		@Override
		protected void createFilter(android.content.res.Resources res, float scaleFactor,
		@@ -87,7 +82,6 @@ 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);
		}


		@@ -113,8 +107,6 @@ public class ImageFilterGrad extends ImageFilterRS {
		protected void bindScriptValues() {
		int width = getInPixelsAllocation().getType().getX();
		int height = getInPixelsAllocation().getType().getY();
		mScript.set_inputWidth(width);
		mScript.set_inputHeight(height);
		}

		@Override
		@@ -141,17 +133,7 @@ public class ImageFilterGrad extends ImageFilterRS {
		y2[i] = (int) coord[1];
		}

		mScript.set_mask(mParameters.getMask());
		mScript.set_xPos1(x1);
		mScript.set_yPos1(y1);
		mScript.set_xPos2(x2);
		mScript.set_yPos2(y2);

		mScript.set_brightness(mParameters.getBrightness());
		mScript.set_contrast(mParameters.getContrast());
		mScript.set_saturation(mParameters.getSaturation());

		mScript.invoke_setupGradParams();
		runSelectiveAdjust(
		getInPixelsAllocation(), getOutPixelsAllocation());

		@@ -171,7 +153,6 @@ public class ImageFilterGrad extends ImageFilterRS {
		endy = height;
		}
		options.setY(ty, endy);
		mScript.forEach_selectiveAdjust(in, out, options);
		if (checkStop()) {
		return;
		}

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ public abstract class ImageFilterRS extends ImageFilter {

		public static boolean PERF_LOGGING = false;

		private static ScriptC_grey mGreyConvert = null;
		private static RenderScript mRScache = null;

		private volatile boolean mResourcesLoaded = false;
		@@ -158,8 +157,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);
		if (RS != mRScache) {
		mRScache = RS;
		}

		@@ -175,7 +173,6 @@ public abstract class ImageFilterRS extends ImageFilter {
		Allocation bitmapAlloc = Allocation.createTyped(RS, tb_a8.create(),
		Allocation.MipmapControl.MIPMAP_NONE,
		Allocation.USAGE_SCRIPT \| Allocation.USAGE_GRAPHICS_TEXTURE);
		mGreyConvert.forEach_RGBAtoA(bitmapTemp, bitmapAlloc);
		bitmapTemp.destroy();
		return bitmapAlloc;
		}

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

+0 −17

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import android.util.Log;
		public class ImageFilterVignette extends ImageFilterRS {
		private static final String LOGTAG = "ImageFilterVignette";
		private Bitmap mOverlayBitmap;
		private ScriptC_vignette mScript;
		FilterVignetteRepresentation mParameters;
		public static final int MODE_VIGNETTE = FilterVignetteRepresentation.MODE_VIGNETTE;
		public static final int MODE_EXPOSURE = FilterVignetteRepresentation.MODE_EXPOSURE;
		@@ -79,7 +78,6 @@ public class ImageFilterVignette extends ImageFilterRS {
		protected void createFilter(Resources res, float scaleFactor, int quality) {
		RenderScript rsCtx = getRenderScriptContext();

		mScript = new ScriptC_vignette(rsCtx);
		}

		@Override
		@@ -110,20 +108,7 @@ public class ImageFilterVignette extends ImageFilterRS {
		ry = c[1];
		}

		mScript.set_inputWidth(w);
		mScript.set_inputHeight(h);
		int v = mParameters.getValue(MODE_VIGNETTE);
		mScript.set_finalSubtract((v < 0) ? v : 0);
		mScript.set_finalBright((v > 0) ? -v : 0);
		mScript.set_finalSaturation(mParameters.getValue(MODE_SATURATION));
		mScript.set_finalContrast(mParameters.getValue(MODE_CONTRAST));
		mScript.set_centerx(cx);
		mScript.set_centery(cy);
		mScript.set_radiusx(rx);
		mScript.set_radiusy(ry);
		mScript.set_strength(mParameters.getValue(MODE_FALLOFF)/10.f);
		mScript.invoke_setupVignetteParams();
		mScript.forEach_vignette(getInPixelsAllocation(), getOutPixelsAllocation());
		}

		@Override
		@@ -160,7 +145,5 @@ public class ImageFilterVignette extends ImageFilterRS {
		protected void bindScriptValues() {
		int width = getInPixelsAllocation().getType().getX();
		int height = getInPixelsAllocation().getType().getY();
		mScript.set_inputWidth(width);
		mScript.set_inputHeight(height);
		}
		}