diff --git a/jme3-android-native/src/native/jme_stbi/com_jme3_texture_plugins_AndroidNativeImageLoader.c b/jme3-android-native/src/native/jme_stbi/com_jme3_texture_plugins_AndroidNativeImageLoader.c index 7255066c0..6c7697880 100644 --- a/jme3-android-native/src/native/jme_stbi/com_jme3_texture_plugins_AndroidNativeImageLoader.c +++ b/jme3-android-native/src/native/jme_stbi/com_jme3_texture_plugins_AndroidNativeImageLoader.c @@ -301,134 +301,3 @@ problems: return NULL; } - -JNIEXPORT jobject JNICALL Java_com_jme3_texture_plugins_AndroidNativeImageLoader_getFailureReason - (JNIEnv * env, jclass clazz) -{ - return NULL; -} - -JNIEXPORT jint JNICALL Java_com_jme3_texture_plugins_AndroidNativeImageLoader_getImageInfo - (JNIEnv * env, jclass clazz, jobject inBuffer, jint bufSize, jobject outBuffer, jint outSize) -{ - return 0; -} - -JNIEXPORT jint JNICALL Java_com_jme3_texture_plugins_AndroidNativeImageLoader_decodeBuffer - (JNIEnv * env, jclass clazz, jobject inBuffer, jint inSize, jboolean flipY, jobject outBuffer, jint outSize) -{ - return 0; -} - -/* -JNIEXPORT jobject JNICALL Java_com_jme3_texture_plugins_AndroidNativeImageLoader_getFailureReason - (JNIEnv * env, jclass clazz) -{ - return stbi_failure_reason(); -} - -JNIEXPORT jint JNICALL Java_com_jme3_texture_plugins_AndroidNativeImageLoader_getImageInfo - (JNIEnv * env, jclass clazz, jobject inBuffer, jint bufSize, jobject outBuffer, jint outSize) -{ - stbi_uc* pInBuffer = (stbi_uc*) (*env)->GetDirectBufferAddress(env, inBuffer); - stbi_uc* pOutBuffer = (stbi_uc*) (*env)->GetDirectBufferAddress(env, outBuffer); - uint32 width, height, comp; - - uint32 result = stbi_info_from_memory(pInBuffer, bufSize, &width, &height, &comp); - if (result == 1) { - uint32 numBytes = (width) * (height) * (comp); - - __android_log_print(ANDROID_LOG_INFO, "NativeImageLoader", "getImageInfo width: %d", width); - __android_log_print(ANDROID_LOG_INFO, "NativeImageLoader", "getImageInfo height: %d", height); - __android_log_print(ANDROID_LOG_INFO, "NativeImageLoader", "getImageInfo comp: %d", comp); - __android_log_print(ANDROID_LOG_INFO, "NativeImageLoader", "getImageInfo data size: %d", numBytes); - - // each element is a 4 byte int - if (outSize != 12) { - return 2; - } - memcpy(pOutBuffer+0, &width, 4); - memcpy(pOutBuffer+4, &height, 4); - memcpy(pOutBuffer+8, &comp, 4); - - return (jint) 0; - } - - return 1; -} - -JNIEXPORT jint JNICALL Java_com_jme3_texture_plugins_AndroidNativeImageLoader_decodeBuffer - (JNIEnv * env, jclass clazz, jobject inBuffer, jint inSize, jboolean flipY, jobject outBuffer, jint outSize) -{ - stbi_uc* pInBuffer = (stbi_uc*) (*env)->GetDirectBufferAddress(env, inBuffer); - stbi_uc* pOutBuffer = (stbi_uc*) (*env)->GetDirectBufferAddress(env, outBuffer); - uint32 width, height, comp; - uint32 req_comp = 0; - - stbi_uc* pData = stbi_load_from_memory(pInBuffer, inSize, &width, &height, &comp, req_comp); - if(pData == NULL) { - return 1; - } - uint32 numBytes = width * height * comp; - - __android_log_print(ANDROID_LOG_INFO, "NativeImageLoader", "decodeBuffer width: %d", width); - __android_log_print(ANDROID_LOG_INFO, "NativeImageLoader", "decodeBuffer height: %d", height); - __android_log_print(ANDROID_LOG_INFO, "NativeImageLoader", "decodeBuffer comp: %d", comp); - __android_log_print(ANDROID_LOG_INFO, "NativeImageLoader", "decodeBuffer data size: %d", numBytes); - - if (numBytes != outSize) { - return 2; - } - - int i; -// for (i=0; i