java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/devil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2732/src/native/common/devil

Modified Files:
	org_lwjgl_devil_IL.c 
Log Message:
use safeGetBufferAddress when loading data
use correct size of image, instead of size of pointer (!)

Index: org_lwjgl_devil_IL.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_IL.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- org_lwjgl_devil_IL.c	14 Nov 2004 10:42:16 -0000	1.8
+++ org_lwjgl_devil_IL.c	21 Nov 2004 10:10:05 -0000	1.9
@@ -270,7 +270,7 @@
 JNIEXPORT jobject JNICALL Java_org_lwjgl_devil_IL_ilGetData(JNIEnv * env, jclass clazz) {
 	ILubyte *data = ilGetData();
 
-	int size = sizeof(data);
+	int size = ilGetInteger(IL_IMAGE_WIDTH) * ilGetInteger(IL_IMAGE_HEIGHT) * ilGetInteger(IL_IMAGE_BYTES_PER_PIXEL);
 	jobject result = safeNewBuffer(env, data, size);
 
 	return result;
@@ -438,9 +438,9 @@
  * Signature: (ILjava/nio/ByteBuffer;II)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_nilLoadL(JNIEnv *env, jclass clazz, jint type, jobject lump_buffer, jint lump_offset, jint size) {
-	ILbyte *lump = (ILbyte *)(*env)->GetDirectBufferAddress(env, lump_buffer);
+	ILbyte *lump = (ILbyte *)safeGetBufferAddress(env, lump_buffer, lump_offset);
 
-	return ilLoadL((ILenum)type, (ILvoid *)(lump + lump_offset), (ILuint)size);
+	return ilLoadL((ILenum)type, (ILvoid *)(lump), (ILuint)size);
 }
 
 /*

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2032/src/java/org/lwjgl/devil

Modified Files:
	IL.java 
Log Message:
call correct native method!

Index: IL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/IL.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- IL.java	12 Nov 2004 02:40:41 -0000	1.3
+++ IL.java	21 Nov 2004 10:06:52 -0000	1.4
@@ -376,7 +376,7 @@
     public static native boolean ilLoadImage(String fileName);
     public static boolean ilLoadL(int Type, ByteBuffer Lump, int Size) {
         BufferChecks.checkDirect(Lump);
-        return nilIsValidL(Type, Lump, Lump.position(), Size);
+        return nilLoadL(Type, Lump, Lump.position(), Size);
     }
     public static native boolean nilLoadL(int Type, ByteBuffer Lump, int lump_offset, int Size);
     public static native boolean ilLoadPal(String FileName);