Skip to content
Browse files

Update after package name change.

  • Loading branch information...
1 parent 9ea7df1 commit 20b98ac89ba4aa0eb07168c04f1f80e9be8f4f79 @ushadow committed
Showing with 26 additions and 26 deletions.
  1. +2 −2 src/makefile
  2. +7 −7 src/openni_wrapper_jni.cpp
  3. +17 −17 src/openni_wrapper_jni.h
View
4 src/makefile
@@ -2,8 +2,8 @@ OSTYPE := $(shell uname -s)
BIN_DIR = /usr/lib
-INC_DIRS = . /usr/include/ni /usr/lib/jvm/java-1.6.0-openjdk/include \
- /usr/lib/jvm/java-1.6.0-openjdk/include/linux
+INC_DIRS = . /usr/include/ni /usr/lib/jvm/java-6-sun/include \
+ /usr/lib/jvm/java-6-sun/include/linux
SRC_FILES = *.cpp
View
14 src/openni_wrapper_jni.cpp
@@ -7,7 +7,7 @@
#include "openni_wrapper_jni.h"
#include "openni_wrapper.h"
-JNIEXPORT jboolean JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_initFromXmlFile
+JNIEXPORT jboolean JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_initFromXmlFile
(JNIEnv *env, jobject obj, jobject ctrl_block, jstring config_file,
jobject widthBuf, jobject heightBuf) {
OpenNIWrapper::getenv();
@@ -25,28 +25,28 @@ JNIEXPORT jboolean JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_ini
return ret;
}
-JNIEXPORT jboolean JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_waitAnyUpdateAll
+JNIEXPORT jboolean JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_waitAnyUpdateAll
(JNIEnv *env, jobject obj, jobject ctrl_block) {
OpenNIWrapper* wrapper =
*((OpenNIWrapper**)env->GetDirectBufferAddress(ctrl_block));
return wrapper->waitAnyUpdateAll();
}
-JNIEXPORT jboolean JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_waitDepthUpdateAll
+JNIEXPORT jboolean JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_waitDepthUpdateAll
(JNIEnv *env, jobject obj, jobject ctrl_block) {
OpenNIWrapper* wrapper =
*((OpenNIWrapper**)env->GetDirectBufferAddress(ctrl_block));
return wrapper->waitDepthUpdateAll();
}
-JNIEXPORT jint JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_getDepthMap
+JNIEXPORT jint JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_getDepthMap
(JNIEnv *env, jobject obj, jobject ctrl_block, jobject depth_buf) {
OpenNIWrapper* wrapper =
*((OpenNIWrapper**)env->GetDirectBufferAddress(ctrl_block));
return wrapper->getDepthMap((int*)env->GetDirectBufferAddress(depth_buf));
}
-JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_release
+JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_release
(JNIEnv *env, jobject obj, jobject ctrl_block) {
OpenNIWrapper* wrapper =
*((OpenNIWrapper**)env->GetDirectBufferAddress(ctrl_block));
@@ -54,7 +54,7 @@ JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_release
delete wrapper;
}
-JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_convertDepthProjectiveToWorld
+JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_convertDepthProjectiveToWorld
(JNIEnv *env, jobject obj, jobject ctrl_block, jobject points) {
OpenNIWrapper* wrapper =
*((OpenNIWrapper**)env->GetDirectBufferAddress(ctrl_block));
@@ -62,7 +62,7 @@ JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_convert
(float*)env->GetDirectBufferAddress(points));
}
-JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_loadFile
+JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_loadFile
(JNIEnv *env, jclass c, jstring file_name, jobject buffer, jint size) {
char strbuf[128];
int len = env->GetStringLength(file_name);
View
34 src/openni_wrapper_jni.h
@@ -1,66 +1,66 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
-/* Header for class edu_mit_yingyin_tabletop_PartialOpenNIDevice */
+/* Header for class edu_mit_yingyin_tabletop_models_PartialOpenNIDevice */
-#ifndef _Included_edu_mit_yingyin_tabletop_PartialOpenNIDevice
-#define _Included_edu_mit_yingyin_tabletop_PartialOpenNIDevice
+#ifndef _Included_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice
+#define _Included_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice
#ifdef __cplusplus
extern "C" {
#endif
/*
- * Class: edu_mit_yingyin_tabletop_PartialOpenNIDevice
+ * Class: edu_mit_yingyin_tabletop_models_PartialOpenNIDevice
* Method: loadFile
* Signature: (Ljava/lang/String;Ljava/nio/IntBuffer;I)V
*/
-JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_loadFile
+JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_loadFile
(JNIEnv *, jclass, jstring, jobject, jint);
/*
- * Class: edu_mit_yingyin_tabletop_PartialOpenNIDevice
+ * Class: edu_mit_yingyin_tabletop_models_PartialOpenNIDevice
* Method: initFromXmlFile
* Signature: (Ljava/nio/IntBuffer;Ljava/lang/String;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;)Z
*/
-JNIEXPORT jboolean JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_initFromXmlFile
+JNIEXPORT jboolean JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_initFromXmlFile
(JNIEnv *, jobject, jobject, jstring, jobject, jobject);
/*
- * Class: edu_mit_yingyin_tabletop_PartialOpenNIDevice
+ * Class: edu_mit_yingyin_tabletop_models_PartialOpenNIDevice
* Method: waitAnyUpdateAll
* Signature: (Ljava/nio/IntBuffer;)Z
*/
-JNIEXPORT jboolean JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_waitAnyUpdateAll
+JNIEXPORT jboolean JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_waitAnyUpdateAll
(JNIEnv *, jobject, jobject);
/*
- * Class: edu_mit_yingyin_tabletop_PartialOpenNIDevice
+ * Class: edu_mit_yingyin_tabletop_models_PartialOpenNIDevice
* Method: waitDepthUpdateAll
* Signature: (Ljava/nio/IntBuffer;)Z
*/
-JNIEXPORT jboolean JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_waitDepthUpdateAll
+JNIEXPORT jboolean JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_waitDepthUpdateAll
(JNIEnv *, jobject, jobject);
/*
- * Class: edu_mit_yingyin_tabletop_PartialOpenNIDevice
+ * Class: edu_mit_yingyin_tabletop_models_PartialOpenNIDevice
* Method: getDepthMap
* Signature: (Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;)I
*/
-JNIEXPORT jint JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_getDepthMap
+JNIEXPORT jint JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_getDepthMap
(JNIEnv *, jobject, jobject, jobject);
/*
- * Class: edu_mit_yingyin_tabletop_PartialOpenNIDevice
+ * Class: edu_mit_yingyin_tabletop_models_PartialOpenNIDevice
* Method: release
* Signature: (Ljava/nio/IntBuffer;)V
*/
-JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_release
+JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_release
(JNIEnv *, jobject, jobject);
/*
- * Class: edu_mit_yingyin_tabletop_PartialOpenNIDevice
+ * Class: edu_mit_yingyin_tabletop_models_PartialOpenNIDevice
* Method: convertDepthProjectiveToWorld
* Signature: (Ljava/nio/IntBuffer;Ljava/nio/FloatBuffer;)V
*/
-JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_PartialOpenNIDevice_convertDepthProjectiveToWorld
+JNIEXPORT void JNICALL Java_edu_mit_yingyin_tabletop_models_PartialOpenNIDevice_convertDepthProjectiveToWorld
(JNIEnv *, jobject, jobject, jobject);
#ifdef __cplusplus

0 comments on commit 20b98ac

Please sign in to comment.
Something went wrong with that request. Please try again.