Skip to content

Commit 27e9a9e

Browse files
authored
Merge branch 'master' into master
2 parents 366df58 + 342297c commit 27e9a9e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

library/src/main/java/jp/co/cyberagent/android/gpuimage/filter/GPUImageFilter.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,10 @@ protected void onDrawArraysPre() {
135135
}
136136

137137
protected void runPendingOnDrawTasks() {
138-
while (!runOnDraw.isEmpty()) {
139-
runOnDraw.removeFirst().run();
138+
synchronized (runOnDraw) {
139+
while (!runOnDraw.isEmpty()) {
140+
runOnDraw.removeFirst().run();
141+
}
140142
}
141143
}
142144

library/src/main/java/jp/co/cyberagent/android/gpuimage/filter/GPUImageZoomBlurFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ public void setBlurCenter(final PointF blurCenter) {
6666

6767
public void setBlurSize(final float blurSize) {
6868
this.blurSize = blurSize;
69-
setFloat(blurSizeLocation, blurSizeLocation);
69+
setFloat(blurSizeLocation, blurSize);
7070
}
7171
}

0 commit comments

Comments
 (0)