Skip to content

Commit 8bdff32

Browse files
mstrengisPatrick Boos
authored andcommitted
Blending modes
GPUImageTwoInputFilter Amatorka Conflicts: library/src/jp/co/cyberagent/android/gpuimage/GPUImageFilter.java sample/src/jp/co/cyberagent/android/gpuimage/sample/GPUImageFilterTools.java
1 parent acba797 commit 8bdff32

File tree

6 files changed

+1090
-13
lines changed

6 files changed

+1090
-13
lines changed

library/src/jp/co/cyberagent/android/gpuimage/GPUImage.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,24 +50,24 @@
5050
* The main accessor for GPUImage functionality. This class helps to do common
5151
* tasks through a simple interface.
5252
*/
53-
public class GPUImage {
53+
public class GPUImage {
5454
private final Context mContext;
5555
private final GPUImageRenderer mRenderer;
5656
private GLSurfaceView mGlSurfaceView;
5757
private GPUImageFilter mFilter;
5858
private Bitmap mCurrentBitmap;
5959

60-
/**
61-
* Instantiates a new GPUImage object.
60+
/**
61+
* Instantiates a new GPUImage object.
6262
*
6363
* @param context the context
6464
*/
65-
public GPUImage(final Context context) {
65+
public GPUImage(final Context context) {
6666
if (!supportsOpenGLES2(context)) {
6767
throw new IllegalStateException("OpenGL ES 2.0 is not supported on this phone.");
6868
}
69-
70-
mContext = context;
69+
70+
mContext = context;
7171
mFilter = new GPUImageFilter();
7272
mRenderer = new GPUImageRenderer(mFilter);
7373
}

0 commit comments

Comments
 (0)