Restructure Java classes into their own package

git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@358 3789f03b-4d11-0410-bbf8-ca57d06f2519

1 files changed, 13 insertions, 13 deletions

diff --git a/trunk/turbojpeg-jni.c b/trunk/turbojpeg-jni.c
index c0992a4..892e51b 100644
--- a/trunk/turbojpeg-jni.c
+++ b/trunk/turbojpeg-jni.c
@@ -28,9 +28,9 @@
 
 #include "turbojpeg.h"
 #include <jni.h>
-#include "java/TJCompressor.h"
-#include "java/TJDecompressor.h"
-#include "java/TJ.h"
+#include "java/org_libjpegturbo_turbojpeg_TJCompressor.h"
+#include "java/org_libjpegturbo_turbojpeg_TJDecompressor.h"
+#include "java/org_libjpegturbo_turbojpeg_TJ.h"
 
 #define _throw(msg) {  \
 	jclass _exccls=(*env)->FindClass(env, "java/lang/Exception");  \
@@ -49,13 +49,13 @@
 	handle=(tjhandle)(long)(*env)->GetLongField(env, obj, _fid);  \
 }
 
-JNIEXPORT jlong JNICALL Java_TJ_bufSize
+JNIEXPORT jlong JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSize
 	(JNIEnv *env, jclass cls, jint width, jint height)
 {
 	return TJBUFSIZE(width, height);
 }
 
-JNIEXPORT void JNICALL Java_TJCompressor_init
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_init
 	(JNIEnv *env, jobject obj)
 {
 	jclass cls;
@@ -73,7 +73,7 @@ JNIEXPORT void JNICALL Java_TJCompressor_init
 	return;
 }
 
-JNIEXPORT jlong JNICALL Java_TJCompressor_compress
+JNIEXPORT jlong JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress
 	(JNIEnv *env, jobject obj, jbyteArray src, jint width, jint pitch,
 		jint height, jint pixelsize, jbyteArray dst, jint jpegsubsamp,
 		jint jpegqual, jint flags)
@@ -101,7 +101,7 @@ JNIEXPORT jlong JNICALL Java_TJCompressor_compress
 	return size;
 }
 
-JNIEXPORT void JNICALL Java_TJCompressor_destroy
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_destroy
 	(JNIEnv *env, jobject obj)
 {
 	tjhandle handle=0;
@@ -114,7 +114,7 @@ JNIEXPORT void JNICALL Java_TJCompressor_destroy
 	return;
 }
 
-JNIEXPORT void JNICALL Java_TJDecompressor_init
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_init
 	(JNIEnv *env, jobject obj)
 {
 	jclass cls;
@@ -131,7 +131,7 @@ JNIEXPORT void JNICALL Java_TJDecompressor_init
 	return;
 }
 
-JNIEXPORT jobject JNICALL Java_TJDecompressor_decompressHeader
+JNIEXPORT jobject JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompressHeader
 	(JNIEnv *env, jobject obj, jbyteArray src, jlong size)
 {
 	jclass jhicls=NULL;
@@ -153,7 +153,7 @@ JNIEXPORT jobject JNICALL Java_TJDecompressor_decompressHeader
 	}
 	(*env)->ReleasePrimitiveArrayCritical(env, src, srcbuf, 0);  srcbuf=NULL;
 
-	bailif0(jhicls=(*env)->FindClass(env, "TJHeaderInfo"));
+	bailif0(jhicls=(*env)->FindClass(env, "org/libjpegturbo/turbojpeg/TJHeaderInfo"));
 	bailif0(jhiobj=(*env)->AllocObject(env, jhicls));
 
 	bailif0(fid=(*env)->GetFieldID(env, jhicls, "subsamp", "I"));
@@ -167,7 +167,7 @@ JNIEXPORT jobject JNICALL Java_TJDecompressor_decompressHeader
 	return jhiobj;
 }
 
-JNIEXPORT void JNICALL Java_TJDecompressor_decompress
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress
 	(JNIEnv *env, jobject obj, jbyteArray src, jlong size, jbyteArray dst,
 		jint width, jint pitch, jint height, jint pixelsize, jint flags)
 {
@@ -193,8 +193,8 @@ JNIEXPORT void JNICALL Java_TJDecompressor_decompress
 	return;
 }
 
-JNIEXPORT void JNICALL Java_TJDecompressor_destroy
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_destroy
 	(JNIEnv *env, jobject obj)
 {
-	Java_TJCompressor_destroy(env, obj);
+	Java_org_libjpegturbo_turbojpeg_TJCompressor_destroy(env, obj);
 }