commit c2f099ccbd2a657bfd0791bcf8eb4986245bdb70
author Jean-Baptiste Queru <jbq@google.com> Wed Mar 18 16:57:37 2009 -0700
committer Jean-Baptiste Queru <jbq@google.com> Wed Mar 18 16:57:37 2009 -0700
tree 7d5d25424400407ce99fbb7b2f74e4afa28cec0b
parent 9705c3e3c1b19598026449c303d54cdc485f35a9
parent e9eb3b06de1158d0207a4ef3288ccf4ac483d5e4

Merge commit 'remotes/korg/cupcake' into cupcake_to_master

Android.mk

diff --git a/Android.mk b/Android.mk
index 1b749a4..4754738 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,7 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := user development
+LOCAL_MODULE_TAGS := user
 
 LOCAL_SRC_FILES:= \
 	main.c \

main.c

diff --git a/main.c b/main.c
index 12ee58e..df08f49 100644
--- a/main.c
+++ b/main.c
@@ -454,15 +454,10 @@
 #endif
             goto noThumbnail;
         }
-        jboolean isCopy;
-        jbyte* thumbnailDataPtr = (*env)->GetByteArrayElements(env, byteArray, &isCopy);
-        memcpy(thumbnailDataPtr, thumbnailPointer, ImageInfo.ThumbnailSize);
+        (*env)->SetByteArrayRegion(env, byteArray, 0, ImageInfo.ThumbnailSize, thumbnailPointer);
 #ifdef SUPERDEBUG
     LOGE("thumbnail size %d\n", ImageInfo.ThumbnailSize);
 #endif
-        if (isCopy == JNI_TRUE) {
-            (*env)->ReleaseByteArrayElements(env, byteArray, thumbnailDataPtr, 0);
-        }
         (*env)->ReleaseStringUTFChars(env, jfilename, filename);
         return byteArray;
     }