From b0bb072ca06d8471e6b876e9e840212bf659ad74 Mon Sep 17 00:00:00 2001 From: Ann Priestman <apriestman@basistech.com> Date: Fri, 21 Oct 2016 08:00:21 -0400 Subject: [PATCH] Finished addition of TskIsImageSupported --- bindings/java/jni/dataModel_SleuthkitJNI.cpp | 6 ++---- bindings/java/jni/dataModel_SleuthkitJNI.h | 8 ++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.cpp b/bindings/java/jni/dataModel_SleuthkitJNI.cpp index d7b463009..11173d5ce 100644 --- a/bindings/java/jni/dataModel_SleuthkitJNI.cpp +++ b/bindings/java/jni/dataModel_SleuthkitJNI.cpp @@ -2016,14 +2016,12 @@ JNIEXPORT jlong JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_findDeviceSize */ JNIEXPORT jboolean JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_isImageSupportedNat (JNIEnv * env, jclass obj, jstring imagePathJ) { - + TskIsImageSupported tskIsImage; TSK_TCHAR imagePathT[1024]; toTCHAR(env, imagePathT, 1024, imagePathJ); - //const char* imagePaths[1]; TSK_TCHAR ** imagePaths = (TSK_TCHAR**)tsk_malloc((1) * sizeof(TSK_TCHAR*)); bool result; - //const char * imagePath = env->GetStringUTFChars(imagePathJ, 0); imagePaths[0] = imagePathT; if (tskIsImage.openImage(1, imagePaths, TSK_IMG_TYPE_DETECT, 0)) { @@ -2037,7 +2035,7 @@ JNIEXPORT jboolean JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_isImageSupp } else { result = false; - } + } } } diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.h b/bindings/java/jni/dataModel_SleuthkitJNI.h index 97e77e530..9993d4683 100644 --- a/bindings/java/jni/dataModel_SleuthkitJNI.h +++ b/bindings/java/jni/dataModel_SleuthkitJNI.h @@ -391,6 +391,14 @@ JNIEXPORT jlong JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_findDeviceSize JNIEXPORT jstring JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_getCurDirNat (JNIEnv *, jclass, jlong); +/* + * Class: org_sleuthkit_datamodel_SleuthkitJNI + * Method: isImageSupportedNat + * Signature: (Ljava/lang/String;)Z + */ +JNIEXPORT jboolean JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_isImageSupportedNat + (JNIEnv *, jclass, jstring); + #ifdef __cplusplus } #endif -- GitLab