v1.4.1.3 fix some subtle crash

Author: ChillingVan

README-en.md

@@ -43,7 +43,7 @@ allprojects {
 
 // module build.gradle
 dependencies {
-    implementation 'com.github.ChillingVan:android-openGL-canvas:v1.4.1.2'
+    implementation 'com.github.ChillingVan:android-openGL-canvas:v1.4.1.3'
 }
 ```
 
@@ -129,6 +129,7 @@ It has sync and async modes.
   This is kind of heavy so I do not update call this for every drawn.
 
 ## Latest Update
+* Fix subtle crash issue
 * Add OrthoBitmapMatrix as One BitmapMatrix. Default BitmapMatrix uses perspective matrix.
 * Fix BitmapMatrix cut by small viewport issue when Bitmap out of screen.
 * Support cut bitmap with CropFilter

README.md

@@ -48,7 +48,7 @@ allprojects {
 
 // module build.gradle
 dependencies {
-    implementation 'com.github.ChillingVan:android-openGL-canvas:v1.4.1.2'
+    implementation 'com.github.ChillingVan:android-openGL-canvas:v1.4.1.3'
 }
 ```
 
@@ -139,6 +139,7 @@ public class MyGLView extends GLView {
 
 
 ## 最近更新
+* 修复潜在的IndexOutOfBound exception
 * 添加OrthoBitmapMatrix以支持正交投影。 默认BitmapMatrix用的是透视投影。
 * 修复BitmapMatrix被过小的viewport剪切的问题。支持更大的放大倍数及离屏距离。
 * 支持裁切图片的CropFilter

build.gradle

@@ -27,7 +27,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

canvasgl/build.gradle

@@ -21,15 +21,16 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.ChillingVan'
+def VERSION_NAME="1.4.1.3"
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 27
-        versionCode 104011
-        versionName "1.4.1.2"
+        targetSdkVersion 28
+        versionCode 104013
+        versionName VERSION_NAME
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -79,3 +80,15 @@ artifacts {
     archives sourcesJar
     archives javadocJar
 }
+
+/**
+ * Used to support other project uses mavenLocal() to refer this project which is convenient to debug
+ */
+install {
+    repositories.mavenInstaller {
+        pom.version = 'v' + VERSION_NAME
+        pom.artifactId = 'android-openGL-canvas'
+    }
+}
+
+

canvasgl/src/main/java/com/chillingvan/canvasgl/glcanvas/BitmapTexture.java

@@ -22,8 +22,6 @@
 
 import android.graphics.Bitmap;
 
-import junit.framework.Assert;
-
 // BitmapTexture is a secondBitmap whose content is specified by a fixed Bitmap.
 //
 // The secondBitmap does not own the Bitmap. The user should make sure the Bitmap
@@ -38,7 +36,7 @@ public BitmapTexture(Bitmap bitmap) {
 
     public BitmapTexture(Bitmap bitmap, boolean hasBorder) {
         super(hasBorder);
-        Assert.assertTrue(bitmap != null && !bitmap.isRecycled());
+//        Assert.assertTrue(bitmap != null && !bitmap.isRecycled());
         mContentBitmap = bitmap;
     }
 

canvasgl/src/main/java/com/chillingvan/canvasgl/glcanvas/GLPaint.java

@@ -23,7 +23,6 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 
-import junit.framework.Assert;
 
 public class GLPaint {
     private float mLineWidth = 1f;
@@ -39,7 +38,6 @@ public int getColor() {
     }
 
     public void setLineWidth(float width) {
-        Assert.assertTrue(width >= 0);
         mLineWidth = width;
     }
 

canvasgl/src/main/java/com/chillingvan/canvasgl/glcanvas/UploadedTexture.java

@@ -24,8 +24,6 @@
 import android.graphics.Bitmap.Config;
 import android.opengl.GLUtils;
 
-import junit.framework.Assert;
-
 import java.util.HashMap;
 
 import javax.microedition.khronos.opengles.GL11;
@@ -148,7 +146,7 @@ private Bitmap getBitmap() {
     }
 
     private void freeBitmap() {
-        Assert.assertTrue(mBitmap != null);
+//        Assert.assertTrue(mBitmap != null);
         onFreeBitmap(mBitmap);
         mBitmap = null;
     }
@@ -223,7 +221,7 @@ private void uploadToCanvas(GLCanvas canvas) {
                 int texWidth = getTextureWidth();
                 int texHeight = getTextureHeight();
 
-                Assert.assertTrue(bWidth <= texWidth && bHeight <= texHeight);
+//                Assert.assertTrue(bWidth <= texWidth && bHeight <= texHeight);
 
                 // Upload the bitmap to a new secondBitmap.
                 mId = canvas.getGLId().generateTexture();

canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/GLMultiTexProducerView.java

@@ -106,15 +106,16 @@ public GLTexture addProducedGLTexture(int width, int height, boolean opaque, int
     @Override
     public void onSurfaceChanged(int width, int height) {
         super.onSurfaceChanged(width, height);
-        Loggers.d(TAG, "onSurfaceChanged: ");
+        Loggers.d(TAG, "onSurfaceChanged: " + width + ", " + height);
         if (producedTextureList.isEmpty()) {
             for (int i = 0; i < getInitialTexCount(); i++) {
+                // This must be in this thread because it relies on the GLContext of this thread
                 producedTextureList.add(GLTexture.createRaw(width, height, false, producedTextureTarget, mCanvas));
             }
             post(new Runnable() {
                 @Override
                 public void run() {
-                    if (surfaceTextureCreatedListener != null) {
+                    if (!producedTextureList.isEmpty() && surfaceTextureCreatedListener != null) {
                         surfaceTextureCreatedListener.onCreated(producedTextureList);
                     }
                 }
@@ -139,6 +140,7 @@ public void onDrawFrame() {
     @Override
     public void onPause() {
         super.onPause();
+        Loggers.d(TAG, "onPause");
         recycleProduceTexture();
         if (mGLThread == null) {
             Log.w(TAG, "!!!!!! You may not call setShareEglContext !!!");

canvasglsample/build.gradle

@@ -21,13 +21,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "com.chillingvan.canvasglsample"
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 5
         versionName "1.4"
 

canvasglsample/src/main/res/layout/activity_multi_tex_off_screen.xml

@@ -32,7 +32,7 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="70dp"
         android:textColor="@android:color/black"
-        android:text="touch empty area and do not cover the camera"
+        android:text="touch the TOP empty area and do not cover the camera"
         android:textSize="15sp"
         />