Skip to content

Commit 79abd19

Browse files
committed
Merge branch 'release/1.0.5'
Conflicts: README.md
2 parents b7cf29c + a1b5b38 commit 79abd19

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

README.md

+1-8
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,9 @@ Android SDK Build-tools 21.1.2
1414
(You can change other sdk and build-tools)
1515

1616
## Usage
17-
##### Maven
18-
<dependency>
19-
<groupId>com.naver.android.helloyako</groupId>
20-
<artifactId>imagecropview</artifactId>
21-
<version>1.0.3</version>
22-
</dependency>
23-
2417
##### Gradle
2518
dependencies {
26-
compile 'com.naver.android.helloyako:imagecropview:1.0.3'
19+
compile 'com.naver.android.helloyako:imagecropview:1.0.5'
2720
}
2821

2922
## Grid Option

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VERSION_NAME=1.0.3
2-
VERSION_CODE=4
1+
VERSION_NAME=1.0.5
2+
VERSION_CODE=5
33
GROUP=com.naver.android.helloyako
44

55
POM_DESCRIPTION=Android Image Crop View

imagecropview/src/main/java/com/naver/android/helloyako/imagecrop/util/GLUtils.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static int getMaxTextureSize(){
3838
EGLConfig mEGLConfig;
3939
EGLContext mEGLContext;
4040
EGLSurface mEGLSurface;
41-
GL10 mGL;
41+
// GL10 mGL;
4242

4343
// No error checking performed, minimum required code to elucidate logic
4444
mEGL = (EGL10) EGLContext.getEGL();
@@ -80,10 +80,15 @@ public static int getMaxTextureSize(){
8080
mEGLSurface = mEGL.eglCreatePbufferSurface(mEGLDisplay, mEGLConfig, attribList);
8181
mEGL.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext);
8282

83-
mGL = (GL10) mEGLContext.getGL();
83+
// mGL = (GL10) mEGLContext.getGL();
8484

8585
int[] maxTextureSize = new int[1];
8686
GLES20.glGetIntegerv(GLES20.GL_MAX_TEXTURE_SIZE, maxTextureSize, 0);
87+
88+
mEGL.eglDestroySurface(mEGLDisplay,mEGLSurface);
89+
mEGL.eglDestroyContext(mEGLDisplay,mEGLContext);
90+
mEGL.eglTerminate(mEGLDisplay);
91+
8792
return maxTextureSize[0];
8893
}
8994
}

0 commit comments

Comments
 (0)