diff --git a/src/api-impl-jni/android_graphics_Bitmap.c b/src/api-impl-jni/android_graphics_Bitmap.c index ad9aa009..2ec24f9e 100644 --- a/src/api-impl-jni/android_graphics_Bitmap.c +++ b/src/api-impl-jni/android_graphics_Bitmap.c @@ -159,6 +159,18 @@ JNIEXPORT void JNICALL Java_android_graphics_Bitmap_nativeCopyPixelsToBuffer(JNI release_nio_buffer(env, array_ref, array); } +JNIEXPORT void JNICALL Java_android_graphics_Bitmap_nativeCopyPixelsFromBuffer(JNIEnv *env, jclass this, jlong _pixbuf, jobject buffer) +{ + GdkPixbuf *pixbuf = _PTR(_pixbuf); + size_t pixbuf_size = gdk_pixbuf_get_rowstride(pixbuf) * (gdk_pixbuf_get_height(pixbuf) - 1) + + /* last row: */ gdk_pixbuf_get_width(pixbuf) * ((gdk_pixbuf_get_n_channels(pixbuf) * gdk_pixbuf_get_bits_per_sample(pixbuf) + 7) / 8); + jarray array_ref; + jbyte *array; + uint8_t *pixels = get_nio_buffer(env, buffer, &array_ref, &array); + memcpy(gdk_pixbuf_get_pixels(pixbuf), pixels, pixbuf_size); + release_nio_buffer(env, array_ref, array); +} + JNIEXPORT void JNICALL Java_android_graphics_Bitmap_native_1unref_1texture(JNIEnv *env, jclass class, jlong texture_ptr) { GdkTexture *texture = GDK_TEXTURE(_PTR(texture_ptr)); diff --git a/src/api-impl-jni/generated_headers/android_graphics_Bitmap.h b/src/api-impl-jni/generated_headers/android_graphics_Bitmap.h index c7f16fa7..5958ae4c 100644 --- a/src/api-impl-jni/generated_headers/android_graphics_Bitmap.h +++ b/src/api-impl-jni/generated_headers/android_graphics_Bitmap.h @@ -182,10 +182,10 @@ JNIEXPORT void JNICALL Java_android_graphics_Bitmap_nativeCopyPixelsToBuffer /* * Class: android_graphics_Bitmap * Method: nativeCopyPixelsFromBuffer - * Signature: (ILjava/nio/Buffer;)V + * Signature: (JLjava/nio/Buffer;)V */ JNIEXPORT void JNICALL Java_android_graphics_Bitmap_nativeCopyPixelsFromBuffer - (JNIEnv *, jclass, jint, jobject); + (JNIEnv *, jclass, jlong, jobject); /* * Class: android_graphics_Bitmap diff --git a/src/api-impl/android/graphics/Bitmap.java b/src/api-impl/android/graphics/Bitmap.java index 8452fdde..64f27581 100644 --- a/src/api-impl/android/graphics/Bitmap.java +++ b/src/api-impl/android/graphics/Bitmap.java @@ -580,7 +580,7 @@ public final class Bitmap { throw new RuntimeException("Buffer not large enough for pixels"); } - nativeCopyPixelsFromBuffer(mNativeBitmap, src); + nativeCopyPixelsFromBuffer(pixbuf, src); // now update the buffer's position int position = src.position(); @@ -1651,9 +1651,8 @@ public final class Bitmap { private static native void nativeSetPixels(int nativeBitmap, int[] colors, int offset, int stride, int x, int y, int width, int height, boolean isPremultiplied); - private static native void nativeCopyPixelsToBuffer(long pixbuf, - Buffer dst); - private static native void nativeCopyPixelsFromBuffer(int nb, Buffer src); + private static native void nativeCopyPixelsToBuffer(long pixbuf, Buffer dst); + private static native void nativeCopyPixelsFromBuffer(long pixbuf, Buffer src); private static native int nativeGenerationId(int nativeBitmap); // returns a new bitmap built from the native bitmap's alpha, and the paint