Skip to content

Commit eeb5e2e

Browse files
committed
Merge pull request kikoso#9 from Dr-Emann/fix-segfault
Fix Segfault errors
2 parents 1b01830 + 9613a89 commit eeb5e2e

7 files changed

Lines changed: 37 additions & 35 deletions

File tree

‎StackBlur/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ dependencies {
66
}
77

88
android {
9-
compileSdkVersion 17
10-
buildToolsVersion '18.1.1'
9+
compileSdkVersion 19
10+
buildToolsVersion '19.0.1'
1111

1212
sourceSets {
1313
main {

‎StackBlur/jni/blur.c‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,25 @@ JNIEXPORT void JNICALL Java_com_enrique_stackblur_NativeBlurProcess_functionToBl
5959
int whMax = max(w, h);
6060
int div = radius + radius + 1;
6161

62-
int r[wh];
63-
int g[wh];
64-
int b[wh];
62+
int divsum = (div + 1) >> 1;
63+
divsum *= divsum;
64+
65+
// r, g, b, vmin, and dv
66+
int *holderArray = malloc(sizeof(int) * (3 * wh + whMax + (256 * divsum)));
67+
68+
// size: wh
69+
int *r = holderArray;
70+
// size: wh
71+
int *g = holderArray + wh;
72+
// size: wh
73+
int *b = holderArray + 2 * wh;
6574
int rsum, gsum, bsum, x, y, i, yp, yi, yw;
6675
rgba p;
67-
int vmin[whMax];
76+
// size: whMax
77+
int *vmin = holderArray + 3 * wh;
6878

69-
int divsum = (div + 1) >> 1;
70-
divsum *= divsum;
71-
int dv[256 * divsum];
79+
// size: 256 * divsum
80+
int *dv = holderArray + 3 * wh + whMax;
7281
for (i = 0; i < 256 * divsum; i++) {
7382
dv[i] = (i / divsum);
7483
}
@@ -240,6 +249,8 @@ JNIEXPORT void JNICALL Java_com_enrique_stackblur_NativeBlurProcess_functionToBl
240249
}
241250
}
242251

252+
free(holderArray);
253+
243254
// Unlocks everything
244255
AndroidBitmap_unlockPixels(env, bitmapIn);
245256
AndroidBitmap_unlockPixels(env, bitmapOut);

‎StackBlur/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-18
14+
target=android-19
1515
android.library=true

‎StackBlurDemo/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ dependencies {
66
}
77

88
android {
9-
compileSdkVersion 18
10-
buildToolsVersion "18.0.1"
9+
compileSdkVersion 19
10+
buildToolsVersion "19.0.1"
1111

1212
sourceSets {
1313
main {

‎StackBlurDemo/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-18
14+
target=android-19
1515
android.library.reference.1=../StackBlur

‎StackBlurDemo/src/com/example/stackblurdemo/BenchmarkActivity.java‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -115,30 +115,21 @@ protected Bitmap doInBackground(Integer... params) {
115115
if(isCancelled())
116116
return outBitmap;
117117

118-
/*
119118
// Native
120-
try {
121-
time = SystemClock.elapsedRealtime();
122-
blurredBitmap = blurManager.processNatively(blurAmount);
123-
result = new BlurBenchmarkResult("Native", (int) (SystemClock.elapsedRealtime() - time));
124-
canvas.save(Canvas.CLIP_SAVE_FLAG);
125-
canvas.clipRect(outBitmap.getWidth() / 3, 0, 2 * outBitmap.getWidth() / 3, inBitmap.getHeight());
126-
canvas.drawBitmap(blurredBitmap, 0, 0, paint);
127-
canvas.restore();
128-
publishProgress(result);
129-
blurredBitmap.recycle();
130-
} catch (Throwable e) {
131-
Toast.makeText(
132-
BenchmarkActivity.this,
133-
"Error occurred with native blur: " + e.getMessage(),
134-
Toast.LENGTH_SHORT
135-
).show();
136-
Log.e("NativeBlur", "Couldn't blur with radius " + blurAmount, e);
137-
}
119+
120+
time = SystemClock.elapsedRealtime();
121+
blurredBitmap = blurManager.processNatively(blurAmount);
122+
result = new BlurBenchmarkResult("Native", (int) (SystemClock.elapsedRealtime() - time));
123+
canvas.save(Canvas.CLIP_SAVE_FLAG);
124+
canvas.clipRect(outBitmap.getWidth() / 3, 0, 2 * outBitmap.getWidth() / 3, inBitmap.getHeight());
125+
canvas.drawBitmap(blurredBitmap, 0, 0, paint);
126+
canvas.restore();
127+
publishProgress(result);
128+
blurredBitmap.recycle();
138129

139130
if(isCancelled())
140131
return outBitmap;
141-
*/
132+
142133
// Renderscript
143134
time = SystemClock.elapsedRealtime();
144135
blurredBitmap = blurManager.processRenderScript(getApplicationContext(), blurAmount);

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:0.6.+'
7+
classpath 'com.android.tools.build:gradle:0.7.+'
88
}
9-
}
9+
}

0 commit comments

Comments
 (0)