From 9f76fd335e3d5e0286f2b520fca16b74cfb3b119 Mon Sep 17 00:00:00 2001
From: Maxime Graulich <maxime.graulich@gmail.com>
Date: Fri, 6 Feb 2015 11:59:48 +0000
Subject: [PATCH] Android: fix for Android Lollipop
---
.../mobile/Android/src/org/geuz/onelab/StringTexture.java | 8 --------
contrib/mobile/androidGModel.cpp | 8 ++++----
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/StringTexture.java b/contrib/mobile/Android/src/org/geuz/onelab/StringTexture.java
index c53de72099..1206106643 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 c8de0ccc44..5b354dde24 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);
--
GitLab