Changeset 714 for trunk/src/image.cppTweet

Timestamp:

Mar 1, 2011, 7:02:18 PM (11 years ago)

Author:

sam

Message:

android: move the PNG loading test into the Image class. It now works.

File:

• trunk/src/image.cpp (modified) (6 diffs)

trunk/src/image.cpp

@@ -19 +19 @@
 #   include <SDL.h>
 #   include <SDL_image.h>
+#elif defined ANDROID_NDK
+#   include <jni.h>
+#   include <android/log.h>
 #endif
 
@@ -26 +29 @@
 namespace lol
 {
+
+#if defined ANDROID_NDK
+extern JNIEnv *g_env;
+extern jobject g_ctx;
+#endif
 
 /*
@@ -41 +49 @@
 #if defined USE_SDL
     SDL_Surface *img;
+#elif defined ANDROID_NDK
+    jobject bmp;
+    jintArray array;
+    jint *pixels;
 #else
     uint8_t *dummy;
@@ -69 +81 @@
     data->size = vec2i(data->img->w, data->img->h);
     data->format = data->img->format->Amask ? FORMAT_RGBA : FORMAT_RGB;
+#elif defined ANDROID_NDK
+    jclass cls = g_env->GetObjectClass(g_ctx);
+    jmethodID mid;
+
+    mid = g_env->GetMethodID(cls, "openImage",
+                             "(Ljava/lang/String;)Landroid/graphics/Bitmap;");
+    jstring name = g_env->NewStringUTF(path);
+    data->bmp = g_env->CallObjectMethod(g_ctx, mid, name);
+    g_env->DeleteLocalRef(name);
+    g_env->NewGlobalRef(data->bmp);
+
+    /* Get image dimensions */
+    mid = g_env->GetMethodID(cls, "getWidth", "(Landroid/graphics/Bitmap;)I");
+    data->size.x = g_env->CallIntMethod(g_ctx, mid, data->bmp);
+    mid = g_env->GetMethodID(cls, "getHeight", "(Landroid/graphics/Bitmap;)I");
+    data->size.y = g_env->CallIntMethod(g_ctx, mid, data->bmp);
+
+    /* Get pixels */
+    data->array = g_env->NewIntArray(data->size.x * data->size.y);
+    g_env->NewGlobalRef(data->array);
+    mid = g_env->GetMethodID(cls, "getPixels", "(Landroid/graphics/Bitmap;[I)V");
+    g_env->CallVoidMethod(g_ctx, mid, data->bmp, data->array);
+
+    data->pixels = g_env->GetIntArrayElements(data->array, 0);
+    for (int n = 0; n < data->size.x * data->size.y; n++)
+    {
+        uint32_t u = data->pixels[n];
+        u = (u & 0xff00ff00) | ((u & 0xff0000) >> 16) | ((u & 0xff) << 16);
+        data->pixels[n] = u;
+    }
+    data->format = FORMAT_RGBA;
 #else
     data->size = 256;
@@ -99 +142 @@
 #if defined USE_SDL
     return data->img->pixels;
+#elif defined ANDROID_NDK
+    return data->pixels;
 #else
     return data->dummy;
@@ -108 +153 @@
 #if defined USE_SDL
     SDL_FreeSurface(data->img);
+#elif defined ANDROID_NDK
+    jclass cls = g_env->GetObjectClass(g_ctx);
+    jmethodID mid;
+
+    g_env->ReleaseIntArrayElements(data->array, data->pixels, 0);
+    g_env->DeleteGlobalRef(data->array);
+
+    /* Free image */
+    mid = g_env->GetMethodID(cls, "closeImage", "(Landroid/graphics/Bitmap;)V");
+    g_env->CallVoidMethod(g_ctx, mid, data->bmp);
+    g_env->DeleteGlobalRef(data->bmp);
 #else
     free(data->dummy);