diff --git a/contrib/mobile/Android/src/org/geuz/onelab/StringTexture.java b/contrib/mobile/Android/src/org/geuz/onelab/StringTexture.java index c53de7209922d8616b8f8f5f3d6a470c5f06ee27..120610664389174c470456cdc01d8c24a29b20a8 100644 --- a/contrib/mobile/Android/src/org/geuz/onelab/StringTexture.java +++ b/contrib/mobile/Android/src/org/geuz/onelab/StringTexture.java @@ -122,14 +122,6 @@ public class StringTexture { Canvas canvas = new Canvas(bitmap); canvas.setBitmap(bitmap); canvas.drawText(s, 0, baseline, paint); - // TMP - try { - FileOutputStream stream = new FileOutputStream(Environment.getExternalStorageDirectory()+"/test.jpg"); - bitmap.compress(CompressFormat.JPEG, 80, stream); - } catch (FileNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } // Get the pixel in a map ByteBuffer buffer = ByteBuffer.allocateDirect(width*height); buffer.order(ByteOrder.nativeOrder()); diff --git a/contrib/mobile/androidGModel.cpp b/contrib/mobile/androidGModel.cpp index c8de0ccc44746805ed1a2c0a82840d1173ae96af..5b354dde242b6e2bfca17104de20b7cf994d4a35 100644 --- a/contrib/mobile/androidGModel.cpp +++ b/contrib/mobile/androidGModel.cpp @@ -109,15 +109,15 @@ void getBitmapFromString(const char *text, int textsize, unsigned char **map, jstring jtext = env->NewStringUTF(text); jmethodID mid = env->GetStaticMethodID(jClass, "getHeightFromString", "(Ljava/lang/String;I)I"); - *height = env->CallIntMethod(gCallbackObject, mid, jtext, textsize); + *height = env->CallStaticIntMethod(jClass, mid, jtext, textsize); mid = env->GetStaticMethodID(jClass, "getWidthFromString", "(Ljava/lang/String;I)I"); - *width =env->CallIntMethod(gCallbackObject, mid, jtext, textsize); + *width =env->CallStaticIntMethod(jClass, mid, jtext, textsize); if(realWidth != NULL){ mid = env->GetStaticMethodID(jClass, "getRealWidthFromString", "(Ljava/lang/String;I)I"); - *realWidth = env->CallIntMethod(gCallbackObject, mid, jtext, textsize); + *realWidth = env->CallStaticIntMethod(jClass, mid, jtext, textsize); } mid = env->GetStaticMethodID(jClass, "getBytesFromString", "(Ljava/lang/String;I)[B"); - jobject jbuffer = env->CallObjectMethod(gCallbackObject, mid, jtext, textsize); + jobject jbuffer = env->CallStaticObjectMethod(jClass, mid, jtext, textsize); jbyteArray *jarray = reinterpret_cast<jbyteArray*>(&jbuffer); *map = (unsigned char *) malloc((*height)*(*width)); env->GetByteArrayRegion(*jarray, 0, (*height)*(*width), (jbyte*)*map);