- IfcJni: Fix access violation errors by creating a copy of the byte[]

- Add version identifier to bimserver_plugin and IfcJni
This commit is contained in:
Thomas Krijnen
2012-01-24 13:38:37 +00:00
parent 456adceef9
commit 644ff7c033
4 changed files with 80 additions and 60 deletions
+1
View File
@@ -64,6 +64,7 @@
#include <gp_Trsf.hxx> #include <gp_Trsf.hxx>
#include <gp_Trsf2d.hxx> #include <gp_Trsf2d.hxx>
#include "../ifcparse/IfcParse.h"
#include "../ifcgeom/IfcShapeList.h" #include "../ifcgeom/IfcShapeList.h"
namespace IfcGeomObjects { namespace IfcGeomObjects {
+11 -2
View File
@@ -66,11 +66,20 @@ JNIEXPORT jobject JNICALL Java_org_ifcopenshell_IfcOpenShellModel_getGeometry (J
} }
JNIEXPORT jboolean JNICALL Java_org_ifcopenshell_IfcOpenShellModel_setIfcData (JNIEnv * env, jobject, jbyteArray jdata) { JNIEXPORT jboolean JNICALL Java_org_ifcopenshell_IfcOpenShellModel_setIfcData (JNIEnv * env, jobject, jbyteArray jdata) {
void* data = env->GetByteArrayElements(jdata, NULL); if ( ! jdata ) return false;
const int length = env->GetArrayLength(jdata); const int length = env->GetArrayLength(jdata);
if ( ! data || ! length ) return false; jboolean is_copy = false;
jbyte* jbytes = env->GetByteArrayElements(jdata, &is_copy);
if ( ! jbytes || ! length ) return false;
void* data = new char[length];
memcpy(data,jbytes,length);
env->ReleaseByteArrayElements(jdata, jbytes, JNI_ABORT);
IfcGeomObjects::Settings(IfcGeomObjects::USE_WORLD_COORDS, true); IfcGeomObjects::Settings(IfcGeomObjects::USE_WORLD_COORDS, true);
IfcGeomObjects::Settings(IfcGeomObjects::WELD_VERTICES, false); IfcGeomObjects::Settings(IfcGeomObjects::WELD_VERTICES, false);
IfcGeomObjects::Settings(IfcGeomObjects::CONVERT_BACK_UNITS, true); IfcGeomObjects::Settings(IfcGeomObjects::CONVERT_BACK_UNITS, true);
return has_more = IfcGeomObjects::Init(data, length); return has_more = IfcGeomObjects::Init(data, length);
} }
JNIEXPORT jstring JNICALL Java_org_ifcopenshell_IfcOpenShellModel_getPluginVersion (JNIEnv * env, jobject) {
return env->NewStringUTF(IFCOPENSHELL_VERSION);
}
@@ -23,6 +23,14 @@ JNIEXPORT jobject JNICALL Java_org_ifcopenshell_IfcOpenShellModel_getGeometry
JNIEXPORT jboolean JNICALL Java_org_ifcopenshell_IfcOpenShellModel_setIfcData JNIEXPORT jboolean JNICALL Java_org_ifcopenshell_IfcOpenShellModel_setIfcData
(JNIEnv *, jobject, jbyteArray); (JNIEnv *, jobject, jbyteArray);
/*
* Class: org_ifcopenshell_IfcOpenShellModel
* Method: getPluginVersion
* Signature: ()Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL Java_org_ifcopenshell_IfcOpenShellModel_getPluginVersion
(JNIEnv *, jobject);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
+2
View File
@@ -27,6 +27,8 @@
#ifndef IFCPARSE_H #ifndef IFCPARSE_H
#define IFCPARSE_H #define IFCPARSE_H
#define IFCOPENSHELL_VERSION "0.3.0-rc2"
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>