1 10 Fix java data export functions (#450)

* HDFFV-10865 - merge from dev, HDFArray perf fix.

* Remove duplicate setting

* Whitespace changes after clang format

* Undo version 11 clang format changes

* Merge CMake changes from develop

* test testing script merge from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge small changes from develop

* Minor non-space formatting changes

* #386 copyright corrections for java folder

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Merge updates

#358 patches from vtk
#361 fix header guard spelling

* format fix

* Fix missing underscore and make H5public.h closer to dev

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
JNI cleanup

* format alignment

* Add missing test ref file

* Merge #380 from develop

* Finish java merges from develop

* Fix java issues with tests and javadoc

* Correct use of attribute access plist

* Remove debug code

* Remove unused variable

* Change file access to read only for java tests

* Split clang format operations.

* More javadoc comments

* Remove pre-split setting

* format source
This commit is contained in:
Allen Byrne
2021-03-10 07:41:14 -06:00
committed by GitHub
parent 2524ad19c0
commit dd5b8a8747
98 changed files with 1339 additions and 1041 deletions

View File

@@ -33,11 +33,11 @@ public class H5Ex_T_Array {
private static final int NDIMS = 2;
private static void CreateDataset() {
long file_id = -1;
long filetype_id = -1;
long memtype_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filetype_id = HDF5Constants.H5I_INVALID_HID;
long memtype_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
long[] adims = { ADIM0, ADIM1 };
int[][][] dset_data = new int[DIM0][ADIM0][ADIM1];
@@ -151,10 +151,10 @@ public class H5Ex_T_Array {
}
private static void ReadDataset() {
long file_id = -1;
long filetype_id = -1;
long memtype_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filetype_id = HDF5Constants.H5I_INVALID_HID;
long memtype_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
long[] adims = { ADIM0, ADIM1 };
int[][][] dset_data;

View File

@@ -34,12 +34,12 @@ public class H5Ex_T_ArrayAttribute {
private static final int NDIMS = 2;
private static void CreateDataset() {
long file_id = -1;
long filetype_id = -1;
long memtype_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filetype_id = HDF5Constants.H5I_INVALID_HID;
long memtype_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
long[] adims = { ADIM0, ADIM1 };
int[][][] dset_data = new int[DIM0][ADIM0][ADIM1];
@@ -83,7 +83,7 @@ public class H5Ex_T_ArrayAttribute {
dataset_id = H5.H5Dcreate(file_id, DATASETNAME, HDF5Constants.H5T_STD_I32LE, dataspace_id,
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
H5.H5Sclose(dataspace_id);
dataspace_id = -1;
dataspace_id = HDF5Constants.H5I_INVALID_HID;
}
}
catch (Exception e) {
@@ -174,11 +174,11 @@ public class H5Ex_T_ArrayAttribute {
}
private static void ReadDataset() {
long file_id = -1;
long filetype_id = -1;
long memtype_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filetype_id = HDF5Constants.H5I_INVALID_HID;
long memtype_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
long[] adims = { ADIM0, ADIM1 };
int[][][] dset_data;

View File

@@ -31,9 +31,9 @@ public class H5Ex_T_Bit {
private static final int RANK = 2;
private static void CreateDataset() {
long file_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0, DIM1 };
int[][] dset_data = new int[DIM0][DIM1];
@@ -115,9 +115,9 @@ public class H5Ex_T_Bit {
}
private static void ReadDataset() {
long file_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0, DIM1 };
int[][] dset_data;

View File

@@ -32,10 +32,10 @@ public class H5Ex_T_BitAttribute {
private static final int RANK = 2;
private static void CreateDataset() {
long file_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0, DIM1 };
int[][] dset_data = new int[DIM0][DIM1];
@@ -65,7 +65,7 @@ public class H5Ex_T_BitAttribute {
dataset_id = H5.H5Dcreate(file_id, DATASETNAME, HDF5Constants.H5T_STD_I32LE, dataspace_id,
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
H5.H5Sclose(dataspace_id);
dataspace_id = -1;
dataspace_id = HDF5Constants.H5I_INVALID_HID;
}
}
catch (Exception e) {
@@ -138,10 +138,10 @@ public class H5Ex_T_BitAttribute {
}
private static void ReadDataset() {
long file_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0, DIM1 };
int[][] dset_data;

View File

@@ -100,9 +100,9 @@ public class H5Ex_T_Commit {
}
private static void CreateDataType() {
long file_id = -1;
long strtype_id = -1;
long filetype_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long strtype_id = HDF5Constants.H5I_INVALID_HID;
long filetype_id = HDF5Constants.H5I_INVALID_HID;
Sensor_Datatype datatypes = new Sensor_Datatype();
// Create a new file using default properties.
try {
@@ -182,9 +182,9 @@ public class H5Ex_T_Commit {
}
private static void ReadDataType() {
long file_id = -1;
long typeclass_id = -1;
long filetype_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long typeclass_id = HDF5Constants.H5I_INVALID_HID;
long filetype_id = HDF5Constants.H5I_INVALID_HID;
// Open an existing file.
try {

View File

@@ -121,12 +121,12 @@ public class H5Ex_T_Compound {
}
private static void CreateDataset() {
long file_id = -1;
long strtype_id = -1;
long memtype_id = -1;
long filetype_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long strtype_id = HDF5Constants.H5I_INVALID_HID;
long memtype_id = HDF5Constants.H5I_INVALID_HID;
long filetype_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
Sensor[] object_data = new Sensor[DIM0];
byte[] dset_data = null;
@@ -285,11 +285,11 @@ public class H5Ex_T_Compound {
}
private static void ReadDataset() {
long file_id = -1;
long strtype_id = -1;
long memtype_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long strtype_id = HDF5Constants.H5I_INVALID_HID;
long memtype_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
Sensor[] object_data2;
byte[] dset_data;

View File

@@ -124,13 +124,13 @@ public class H5Ex_T_CompoundAttribute {
}
private static void CreateDataset() {
long file_id = -1;
long strtype_id = -1;
long memtype_id = -1;
long filetype_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long strtype_id = HDF5Constants.H5I_INVALID_HID;
long memtype_id = HDF5Constants.H5I_INVALID_HID;
long filetype_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
Sensor[] object_data = new Sensor[DIM0];
byte[] dset_data = null;
@@ -204,7 +204,7 @@ public class H5Ex_T_CompoundAttribute {
dataset_id = H5.H5Dcreate(file_id, DATASETNAME, HDF5Constants.H5T_STD_I32LE, dataspace_id,
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
H5.H5Sclose(dataspace_id);
dataspace_id = -1;
dataspace_id = HDF5Constants.H5I_INVALID_HID;
}
}
catch (Exception e) {
@@ -309,12 +309,12 @@ public class H5Ex_T_CompoundAttribute {
}
private static void ReadDataset() {
long file_id = -1;
long strtype_id = -1;
long memtype_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long strtype_id = HDF5Constants.H5I_INVALID_HID;
long memtype_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
Sensor[] object_data2;
byte[] dset_data;

View File

@@ -35,9 +35,9 @@ public class H5Ex_T_Float {
private static final int RANK = 2;
private static void CreateDataset() {
long file_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0, DIM1 };
double[][] dset_data = new double[DIM0][DIM1];
@@ -119,9 +119,9 @@ public class H5Ex_T_Float {
}
private static void ReadDataset() {
long file_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0, DIM1 };
double[][] dset_data;

View File

@@ -36,10 +36,10 @@ public class H5Ex_T_FloatAttribute {
private static final int RANK = 2;
private static void CreateDataset() {
long file_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0, DIM1 };
double[][] dset_data = new double[DIM0][DIM1];
@@ -65,7 +65,7 @@ public class H5Ex_T_FloatAttribute {
dataset_id = H5.H5Dcreate(file_id, DATASETNAME, HDF5Constants.H5T_STD_I32LE, dataspace_id,
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
H5.H5Sclose(dataspace_id);
dataspace_id = -1;
dataspace_id = HDF5Constants.H5I_INVALID_HID;
}
}
catch (Exception e) {
@@ -138,10 +138,10 @@ public class H5Ex_T_FloatAttribute {
}
private static void ReadDataset() {
long file_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0, DIM1 };
double[][] dset_data;

View File

@@ -33,9 +33,9 @@ public class H5Ex_T_Integer {
private static final int RANK = 2;
private static void CreateDataset() {
long file_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0, DIM1 };
int[][] dset_data = new int[DIM0][DIM1];
@@ -116,9 +116,9 @@ public class H5Ex_T_Integer {
}
private static void ReadDataset() {
long file_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0, DIM1 };
int[][] dset_data;

View File

@@ -34,10 +34,10 @@ public class H5Ex_T_IntegerAttribute {
private static final int RANK = 2;
private static void CreateDataset() {
long file_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0, DIM1 };
int[][] dset_data = new int[DIM0][DIM1];
@@ -63,7 +63,7 @@ public class H5Ex_T_IntegerAttribute {
dataset_id = H5.H5Dcreate(file_id, DATASETNAME, HDF5Constants.H5T_STD_I32LE, dataspace_id,
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
H5.H5Sclose(dataspace_id);
dataspace_id = -1;
dataspace_id = HDF5Constants.H5I_INVALID_HID;
}
}
catch (Exception e) {
@@ -136,10 +136,10 @@ public class H5Ex_T_IntegerAttribute {
}
private static void ReadDataset() {
long file_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0, DIM1 };
int[][] dset_data;

View File

@@ -64,11 +64,11 @@ public class H5Ex_T_ObjectReference {
}
private static void writeObjRef() {
long file_id = -1;
long dataspace_id = -1;
long filespace_id = -1;
long group_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long group_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
byte[][] dset_data = new byte[DIM0][8];
@@ -89,9 +89,9 @@ public class H5Ex_T_ObjectReference {
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
if (dataset_id >= 0)
H5.H5Dclose(dataset_id);
dataset_id = -1;
dataset_id = HDF5Constants.H5I_INVALID_HID;
H5.H5Sclose(dataspace_id);
dataspace_id = -1;
dataspace_id = HDF5Constants.H5I_INVALID_HID;
}
}
catch (Exception e) {
@@ -105,7 +105,7 @@ public class H5Ex_T_ObjectReference {
HDF5Constants.H5P_DEFAULT);
if (group_id >= 0)
H5.H5Gclose(group_id);
group_id = -1;
group_id = HDF5Constants.H5I_INVALID_HID;
}
catch (Exception e) {
e.printStackTrace();
@@ -186,11 +186,11 @@ public class H5Ex_T_ObjectReference {
}
private static void readObjRef() {
long file_id = -1;
long dataset_id = -1;
long dataspace_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
int object_type = -1;
long object_id = -1;
long object_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
byte[][] dset_data;

View File

@@ -66,11 +66,11 @@ public class H5Ex_T_ObjectReferenceAttribute {
}
private static void CreateDataset() {
long file_id = -1;
long dataspace_id = -1;
long group_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long group_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
byte[][] dset_data = new byte[DIM0][8];
@@ -91,9 +91,9 @@ public class H5Ex_T_ObjectReferenceAttribute {
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
if (dataset_id >= 0)
H5.H5Dclose(dataset_id);
dataset_id = -1;
dataset_id = HDF5Constants.H5I_INVALID_HID;
H5.H5Sclose(dataspace_id);
dataspace_id = -1;
dataspace_id = HDF5Constants.H5I_INVALID_HID;
}
}
catch (Exception e) {
@@ -107,7 +107,7 @@ public class H5Ex_T_ObjectReferenceAttribute {
HDF5Constants.H5P_DEFAULT);
if (group_id >= 0)
H5.H5Gclose(group_id);
group_id = -1;
group_id = HDF5Constants.H5I_INVALID_HID;
}
catch (Exception e) {
e.printStackTrace();
@@ -138,7 +138,7 @@ public class H5Ex_T_ObjectReferenceAttribute {
dataset_id = H5.H5Dcreate(file_id, DATASETNAME, HDF5Constants.H5T_STD_I32LE, dataspace_id,
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
H5.H5Sclose(dataspace_id);
dataspace_id = -1;
dataspace_id = HDF5Constants.H5I_INVALID_HID;
}
}
catch (Exception e) {
@@ -211,12 +211,12 @@ public class H5Ex_T_ObjectReferenceAttribute {
}
private static void ReadDataset() {
long file_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
int object_type = -1;
long object_id = -1;
long object_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
byte[][] dset_data;

View File

@@ -31,10 +31,10 @@ public class H5Ex_T_Opaque {
private static final int RANK = 1;
private static void CreateDataset() {
long file_id = -1;
long dataspace_id = -1;
long datatype_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long datatype_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
byte[] dset_data = new byte[DIM0 * LEN];
byte[] str_data = { 'O', 'P', 'A', 'Q', 'U', 'E' };
@@ -137,11 +137,11 @@ public class H5Ex_T_Opaque {
}
private static void ReadDataset() {
long file_id = -1;
long datatype_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long type_len = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long datatype_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long type_len = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
byte[] dset_data;
String tag_name = null;

View File

@@ -32,11 +32,11 @@ public class H5Ex_T_OpaqueAttribute {
private static final int RANK = 1;
private static void CreateDataset() {
long file_id = -1;
long dataspace_id = -1;
long datatype_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long datatype_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
byte[] dset_data = new byte[DIM0 * LEN];
byte[] str_data = { 'O', 'P', 'A', 'Q', 'U', 'E' };
@@ -64,7 +64,7 @@ public class H5Ex_T_OpaqueAttribute {
dataset_id = H5.H5Dcreate(file_id, DATASETNAME, HDF5Constants.H5T_STD_I32LE, dataspace_id,
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
H5.H5Sclose(dataspace_id);
dataspace_id = -1;
dataspace_id = HDF5Constants.H5I_INVALID_HID;
}
}
catch (Exception e) {
@@ -157,11 +157,11 @@ public class H5Ex_T_OpaqueAttribute {
}
private static void ReadDataset() {
long file_id = -1;
long datatype_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long datatype_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long type_len = -1;
long[] dims = { DIM0 };
byte[] dset_data;

View File

@@ -31,11 +31,11 @@ public class H5Ex_T_String {
private static final int RANK = 1;
private static void CreateDataset() {
long file_id = -1;
long memtype_id = -1;
long filetype_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long memtype_id = HDF5Constants.H5I_INVALID_HID;
long filetype_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
byte[][] dset_data = new byte[DIM0][SDIM];
StringBuffer[] str_data = { new StringBuffer("Parting"), new StringBuffer("is such"),
@@ -155,11 +155,11 @@ public class H5Ex_T_String {
}
private static void ReadDataset() {
long file_id = -1;
long filetype_id = -1;
long memtype_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filetype_id = HDF5Constants.H5I_INVALID_HID;
long memtype_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long sdim = 0;
long[] dims = { DIM0 };
byte[][] dset_data;

View File

@@ -32,12 +32,12 @@ public class H5Ex_T_StringAttribute {
private static final int RANK = 1;
private static void CreateDataset() {
long file_id = -1;
long memtype_id = -1;
long filetype_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long memtype_id = HDF5Constants.H5I_INVALID_HID;
long filetype_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM0 };
byte[][] dset_data = new byte[DIM0][SDIM];
StringBuffer[] str_data = { new StringBuffer("Parting"), new StringBuffer("is such"),
@@ -79,7 +79,7 @@ public class H5Ex_T_StringAttribute {
dataset_id = H5.H5Dcreate(file_id, DATASETNAME, HDF5Constants.H5T_STD_I32LE, dataspace_id,
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
H5.H5Sclose(dataspace_id);
dataspace_id = -1;
dataspace_id = HDF5Constants.H5I_INVALID_HID;
}
}
catch (Exception e) {
@@ -178,12 +178,12 @@ public class H5Ex_T_StringAttribute {
}
private static void ReadDataset() {
long file_id = -1;
long filetype_id = -1;
long memtype_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long attribute_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filetype_id = HDF5Constants.H5I_INVALID_HID;
long memtype_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
long sdim = 0;
long[] dims = { DIM0 };
byte[][] dset_data;

View File

@@ -25,10 +25,10 @@ public class H5Ex_T_VLString
private static String DATASETNAME = "DS1";
private static void createDataset() {
long file_id = -1;
long type_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long type_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
int rank = 1;
String[] str_data = { "Parting", "is such", "sweet", "sorrow." };
long[] dims = { str_data.length };
@@ -92,9 +92,9 @@ public class H5Ex_T_VLString
}
private static void readDataset() {
long file_id = -1;
long type_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long type_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
String[] str_data = { "", "", "", "" };
try {