Merge pull request cats-oss#64 from lukesleeman/patch-1

pboos · pboos · commit fe83f48cf7ef · 2013-07-31T20:11:42.000-07:00
Fixed deadlock in getBitmapWithFilterApplied
diff --git a/library/src/jp/co/cyberagent/android/gpuimage/GPUImage.java b/library/src/jp/co/cyberagent/android/gpuimage/GPUImage.java
@@ -268,8 +268,8 @@ public void run() {
                     }
                 }
             });
-            requestRender();
             synchronized(mFilter) {
+                requestRender();
                 try {
                     mFilter.wait();
                 } catch (InterruptedException e) {

Original file line number	Diff line number	Diff line change
`@@ -268,8 +268,8 @@ public void run() {`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`	`});`
`271`		`- requestRender();`
`272`	`271`	`synchronized(mFilter) {`
	`272`	`+ requestRender();`
`273`	`273`	`try {`
`274`	`274`	`mFilter.wait();`
`275`	`275`	`} catch (InterruptedException e) {`