mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-30 15:32:37 +08:00
Merge pull request #1365 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit 'ef6c80bbdbe6ce1ee4665a352099976d0fddf255': HDFVIEW-4 note HDFVIEW-4 removed unused functions HDFVIEW-4 add datatype read to H5A like H5D
This commit is contained in:
Allen Byrne
commit
1be974ff96
@ -852,7 +852,8 @@ public class H5 implements java.io.Serializable {
|
||||
* @exception HDF5LibraryException
|
||||
* - Error from the HDF-5 Library.
|
||||
**/
|
||||
public static long H5Aget_space(long attr_id) throws HDF5LibraryException {
|
||||
public static long H5Aget_space(long attr_id) throws HDF5LibraryException
|
||||
{
|
||||
long id = _H5Aget_space(attr_id);
|
||||
if (id > 0) {
|
||||
log.trace("OPEN_IDS: H5Aget_space add {}", id);
|
||||
@ -888,7 +889,8 @@ public class H5 implements java.io.Serializable {
|
||||
* @exception HDF5LibraryException
|
||||
* - Error from the HDF-5 Library.
|
||||
**/
|
||||
public static long H5Aget_type(long attr_id) throws HDF5LibraryException {
|
||||
public static long H5Aget_type(long attr_id) throws HDF5LibraryException
|
||||
{
|
||||
long id = _H5Aget_type(attr_id);
|
||||
if (id > 0) {
|
||||
log.trace("OPEN_IDS: H5Aget_type add {}", id);
|
||||
@ -918,8 +920,9 @@ public class H5 implements java.io.Serializable {
|
||||
* @exception NullPointerException
|
||||
* - Name is null.
|
||||
**/
|
||||
public static long H5Aopen(long obj_id, String attr_name, long aapl_id) throws HDF5LibraryException,
|
||||
NullPointerException {
|
||||
public static long H5Aopen(long obj_id, String attr_name, long aapl_id)
|
||||
throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
long id = _H5Aopen(obj_id, attr_name, aapl_id);
|
||||
if (id > 0) {
|
||||
log.trace("OPEN_IDS: H5Aopen add {}", id);
|
||||
@ -959,7 +962,8 @@ public class H5 implements java.io.Serializable {
|
||||
* - Name is null.
|
||||
**/
|
||||
public static long H5Aopen_by_idx(long loc_id, String obj_name, int idx_type, int order, long n, long aapl_id,
|
||||
long lapl_id) throws HDF5LibraryException, NullPointerException {
|
||||
long lapl_id) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
long id = _H5Aopen_by_idx(loc_id, obj_name, idx_type, order, n, aapl_id, lapl_id);
|
||||
if (id > 0) {
|
||||
log.trace("OPEN_IDS: H5Aopen_by_idx add {}", id);
|
||||
@ -994,7 +998,8 @@ public class H5 implements java.io.Serializable {
|
||||
* - obj_name is null.
|
||||
**/
|
||||
public static long H5Aopen_by_name(long loc_id, String obj_name, String attr_name, long aapl_id, long lapl_id)
|
||||
throws HDF5LibraryException, NullPointerException {
|
||||
throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
long id = _H5Aopen_by_name(loc_id, obj_name, attr_name, aapl_id, lapl_id);
|
||||
if (id > 0) {
|
||||
log.trace("OPEN_IDS: H5Aopen_by_name add {}", id);
|
||||
@ -1015,8 +1020,10 @@ public class H5 implements java.io.Serializable {
|
||||
* IN: Identifier of an attribute to read.
|
||||
* @param mem_type_id
|
||||
* IN: Identifier of the attribute datatype (in memory).
|
||||
* @param buf
|
||||
* IN: Buffer for data to be read.
|
||||
* @param obj
|
||||
* Buffer to store data read from the file.
|
||||
* @param isCriticalPinning
|
||||
* request lock on data reference.
|
||||
*
|
||||
* @return a non-negative value if successful
|
||||
*
|
||||
@ -1025,9 +1032,19 @@ public class H5 implements java.io.Serializable {
|
||||
* @exception NullPointerException
|
||||
* - data buffer is null.
|
||||
**/
|
||||
public synchronized static native int H5Aread(long attr_id, long mem_type_id, byte[] buf)
|
||||
public synchronized static native int H5Aread(long attr_id, long mem_type_id, byte[] obj, boolean isCriticalPinning)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Aread(long attr_id, long mem_type_id, byte[] buf) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Aread(attr_id, mem_type_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static int H5Aread(long attr_id, long mem_type_id, Object obj) throws HDF5Exception, HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Aread(attr_id, mem_type_id, obj, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* H5Aread reads an attribute, specified with attr_id. The attribute's memory datatype is specified with
|
||||
* mem_type_id. The entire attribute is read into data object from the file.
|
||||
@ -1038,31 +1055,144 @@ public class H5 implements java.io.Serializable {
|
||||
* IN: Identifier of the attribute datatype (in memory).
|
||||
* @param obj
|
||||
* IN: Object for data to be read.
|
||||
* @param isCriticalPinning
|
||||
* request lock on data reference.
|
||||
*
|
||||
* @return a non-negative value if successful
|
||||
*
|
||||
* @exception HDF5Exception
|
||||
* - Failure in the data conversion.
|
||||
* @exception HDF5LibraryException
|
||||
* - Error from the HDF-5 Library.
|
||||
* @exception NullPointerException
|
||||
* - data buffer is null. See public synchronized static native int H5Aread( )
|
||||
**/
|
||||
public synchronized static int H5Aread(long attr_id, long mem_type_id, Object obj) throws HDF5Exception,
|
||||
NullPointerException {
|
||||
HDFArray theArray = new HDFArray(obj);
|
||||
byte[] buf = theArray.emptyBytes();
|
||||
public synchronized static int H5Aread(long attr_id, long mem_type_id, Object obj, boolean isCriticalPinning)
|
||||
throws HDF5Exception, HDF5LibraryException, NullPointerException
|
||||
{
|
||||
int status = -1;
|
||||
boolean is1D = false;
|
||||
|
||||
// This will raise an exception if there is an error
|
||||
int status = H5Aread(attr_id, mem_type_id, buf);
|
||||
Class dataClass = obj.getClass();
|
||||
if (!dataClass.isArray()) {
|
||||
throw (new HDF5JavaException("H5Aread: data is not an array"));
|
||||
}
|
||||
|
||||
// No exception: status really ought to be OK
|
||||
if (status >= 0) {
|
||||
obj = theArray.arrayify(buf);
|
||||
String cname = dataClass.getName();
|
||||
is1D = (cname.lastIndexOf('[') == cname.indexOf('['));
|
||||
char dname = cname.charAt(cname.lastIndexOf("[") + 1);
|
||||
log.trace("H5Aread: cname={} is1D={} dname={}", cname, is1D, dname);
|
||||
|
||||
if (is1D && (dname == 'B')) {
|
||||
log.trace("H5Aread_dname_B");
|
||||
status = H5Aread(attr_id, mem_type_id, (byte[]) obj, isCriticalPinning);
|
||||
}
|
||||
else if (is1D && (dname == 'S')) {
|
||||
log.trace("H5Aread_dname_S");
|
||||
status = H5Aread_short(attr_id, mem_type_id, (short[]) obj, isCriticalPinning);
|
||||
}
|
||||
else if (is1D && (dname == 'I')) {
|
||||
log.trace("H5Aread_dname_I");
|
||||
status = H5Aread_int(attr_id, mem_type_id, (int[]) obj, isCriticalPinning);
|
||||
}
|
||||
else if (is1D && (dname == 'J')) {
|
||||
log.trace("H5Aread_dname_J");
|
||||
status = H5Aread_long(attr_id, mem_type_id, (long[]) obj, isCriticalPinning);
|
||||
}
|
||||
else if (is1D && (dname == 'F')) {
|
||||
log.trace("H5Aread_dname_F");
|
||||
status = H5Aread_float(attr_id, mem_type_id, (float[]) obj, isCriticalPinning);
|
||||
}
|
||||
else if (is1D && (dname == 'D')) {
|
||||
log.trace("H5Aread_dname_D");
|
||||
status = H5Aread_double(attr_id, mem_type_id, (double[]) obj, isCriticalPinning);
|
||||
}
|
||||
else if ((H5.H5Tdetect_class(mem_type_id, HDF5Constants.H5T_REFERENCE) && (is1D && (dataClass.getComponentType() == String.class))) || H5.H5Tequal(mem_type_id, HDF5Constants.H5T_STD_REF_DSETREG)) {
|
||||
log.trace("H5Aread_reg_ref");
|
||||
status = H5Aread_reg_ref(attr_id, mem_type_id, (String[]) obj);
|
||||
}
|
||||
else if (is1D && (dataClass.getComponentType() == String.class)) {
|
||||
log.trace("H5Aread_string type");
|
||||
status = H5Aread_string(attr_id, mem_type_id, (String[]) obj);
|
||||
}
|
||||
else {
|
||||
// Create a data buffer to hold the data into a Java Array
|
||||
HDFArray theArray = new HDFArray(obj);
|
||||
byte[] buf = theArray.emptyBytes();
|
||||
log.trace("H5Aread_else");
|
||||
|
||||
// This will raise an exception if there is an error
|
||||
status = H5Aread(attr_id, mem_type_id, buf, isCriticalPinning);
|
||||
|
||||
// No exception: status really ought to be OK
|
||||
if (status >= 0) {
|
||||
obj = theArray.arrayify(buf);
|
||||
}
|
||||
|
||||
// clean up these: assign 'null' as hint to gc()
|
||||
buf = null;
|
||||
theArray = null;
|
||||
}
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
public synchronized static native int H5AreadVL(long attr_id, long mem_type_id, String[] buf)
|
||||
public synchronized static native int H5Aread_double(long attr_id, long mem_type_id, double[] buf, boolean isCriticalPinning)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Aread_double(long attr_id, long mem_type_id, double[] buf)
|
||||
throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Aread_double(attr_id, mem_type_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static native int H5Aread_float(long attr_id, long mem_type_id, float[] buf, boolean isCriticalPinning)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Aread_float(long attr_id, long mem_type_id, float[] buf)
|
||||
throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Aread_float(attr_id, mem_type_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static native int H5Aread_int(long attr_id, long mem_type_id, int[] buf, boolean isCriticalPinning)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Aread_int(long attr_id, long mem_type_id, int[] buf)
|
||||
throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Aread_int(attr_id, mem_type_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static native int H5Aread_long(long attr_id, long mem_type_id, long[] buf, boolean isCriticalPinning)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Aread_long(long attr_id, long mem_type_id, long[] buf)
|
||||
throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Aread_long(attr_id, mem_type_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static native int H5Aread_reg_ref(long attr_id, long mem_type_id, String[] buf)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static native int H5Aread_short(long attr_id, long mem_type_id, short[] buf, boolean isCriticalPinning)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Aread_short(long attr_id, long mem_type_id, short[] buf)
|
||||
throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Aread_short(attr_id, mem_type_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static native int H5AreadVL(long attr_id, long mem_type_id, Object[] buf)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static native int H5Aread_string(long attr_id, long mem_type_id, String[] buf)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static native int H5Aread_VLStrings(long attr_id, long mem_type_id, Object[] buf)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static native int H5AreadComplex(long attr_id, long mem_type_id, String[] buf)
|
||||
@ -1123,7 +1253,9 @@ public class H5 implements java.io.Serializable {
|
||||
* @param mem_type_id
|
||||
* IN: Identifier of the attribute datatype (in memory).
|
||||
* @param buf
|
||||
* IN: Data to be written.
|
||||
* IN: Buffer with data to be written to the file.
|
||||
* @param isCriticalPinning
|
||||
* IN: request lock on data reference.
|
||||
*
|
||||
* @return a non-negative value if successful
|
||||
*
|
||||
@ -1132,9 +1264,21 @@ public class H5 implements java.io.Serializable {
|
||||
* @exception NullPointerException
|
||||
* - data is null.
|
||||
**/
|
||||
public synchronized static native int H5Awrite(long attr_id, long mem_type_id, byte[] buf)
|
||||
public synchronized static native int H5Awrite(long attr_id, long mem_type_id, byte[] buf, boolean isCriticalPinning)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Awrite(long attr_id, long mem_type_id, byte[] buf)
|
||||
throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Awrite(attr_id, mem_type_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static int H5Awrite(long attr_id, long mem_type_id, Object obj)
|
||||
throws HDF5Exception, HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Awrite(attr_id, mem_type_id, obj, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* H5Awrite writes an attribute, specified with attr_id. The attribute's memory datatype is specified with
|
||||
* mem_type_id. The entire attribute is written from data object to the file.
|
||||
@ -1145,28 +1289,140 @@ public class H5 implements java.io.Serializable {
|
||||
* IN: Identifier of the attribute datatype (in memory).
|
||||
* @param obj
|
||||
* IN: Data object to be written.
|
||||
* @param isCriticalPinning
|
||||
* request lock on data reference.
|
||||
*
|
||||
* @return a non-negative value if successful
|
||||
*
|
||||
* @exception HDF5Exception
|
||||
* - Failure in the data conversion.
|
||||
* @exception HDF5LibraryException
|
||||
* - Error from the HDF-5 Library.
|
||||
* @exception NullPointerException
|
||||
* - data object is null
|
||||
**/
|
||||
public synchronized static int H5Awrite(long attr_id, long mem_type_id, Object obj, boolean isCriticalPinning)
|
||||
throws HDF5Exception, HDF5LibraryException, NullPointerException
|
||||
{
|
||||
int status = -1;
|
||||
boolean is1D = false;
|
||||
|
||||
Class dataClass = obj.getClass();
|
||||
if (!dataClass.isArray()) {
|
||||
throw (new HDF5JavaException("H5Dwrite: data is not an array"));
|
||||
}
|
||||
|
||||
String cname = dataClass.getName();
|
||||
is1D = (cname.lastIndexOf('[') == cname.indexOf('['));
|
||||
char dname = cname.charAt(cname.lastIndexOf("[") + 1);
|
||||
|
||||
if (is1D && (dname == 'B')) {
|
||||
status = H5Awrite(attr_id, mem_type_id, (byte[]) obj, isCriticalPinning);
|
||||
}
|
||||
else if (is1D && (dname == 'S')) {
|
||||
status = H5Awrite_short(attr_id, mem_type_id, (short[]) obj, isCriticalPinning);
|
||||
}
|
||||
else if (is1D && (dname == 'I')) {
|
||||
status = H5Awrite_int(attr_id, mem_type_id, (int[]) obj, isCriticalPinning);
|
||||
}
|
||||
else if (is1D && (dname == 'J')) {
|
||||
status = H5Awrite_long(attr_id, mem_type_id, (long[]) obj, isCriticalPinning);
|
||||
}
|
||||
else if (is1D && (dname == 'F')) {
|
||||
status = H5Awrite_float(attr_id, mem_type_id, (float[]) obj, isCriticalPinning);
|
||||
}
|
||||
else if (is1D && (dname == 'D')) {
|
||||
status = H5Awrite_double(attr_id, mem_type_id, (double[]) obj, isCriticalPinning);
|
||||
}
|
||||
else if (is1D && (dataClass.getComponentType() == String.class)) {
|
||||
log.trace("H5Dwrite_string type");
|
||||
status = H5Awrite_string(attr_id, mem_type_id, (String[]) obj);
|
||||
}
|
||||
else {
|
||||
HDFArray theArray = new HDFArray(obj);
|
||||
byte[] buf = theArray.byteify();
|
||||
|
||||
status = H5Awrite(attr_id, mem_type_id, buf);
|
||||
buf = null;
|
||||
theArray = null;
|
||||
}
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
public synchronized static native int H5Awrite_double(long attr_id, long mem_type_id, double[] buf, boolean isCriticalPinning)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Awrite_double(long attr_id, long mem_type_id, double[] buf)
|
||||
throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Awrite_double(attr_id, mem_type_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static native int H5Awrite_float(long attr_id, long mem_type_id, float[] buf, boolean isCriticalPinning)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Awrite_float(long attr_id, long mem_type_id, float[] buf)
|
||||
throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Awrite_float(attr_id, mem_type_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static native int H5Awrite_int(long attr_id, long mem_type_id, int[] buf, boolean isCriticalPinning)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Awrite_int(long attr_id, long mem_type_id, int[] buf)
|
||||
throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Awrite_int(attr_id, mem_type_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static native int H5Awrite_long(long attr_id, long mem_type_id, long[] buf, boolean isCriticalPinning)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Awrite_long(long attr_id, long mem_type_id, long[] buf)
|
||||
throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Awrite_long(attr_id, mem_type_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static native int H5Awrite_short(long attr_id, long mem_type_id, short[] buf, boolean isCriticalPinning)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Awrite_short(long attr_id, long mem_type_id, short[] buf)
|
||||
throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Awrite_short(attr_id, mem_type_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static native int H5Awrite_string(long attr_id, long mem_type_id, String[] buf)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static native int H5AwriteVL(long attr_id, long mem_type_id, Object[] buf)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
/**
|
||||
* H5Awrite_VLStrings writes a variable length String dataset, specified by its identifier attr_id, from
|
||||
* the application memory buffer buf into the file.
|
||||
*
|
||||
* ---- contributed by Rosetta Biosoftware
|
||||
*
|
||||
* @param attr_id
|
||||
* Identifier of the attribute read from.
|
||||
* @param mem_type_id
|
||||
* Identifier of the memory datatype.
|
||||
* @param buf
|
||||
* Buffer with data to be written to the file.
|
||||
*
|
||||
* @return a non-negative value if successful
|
||||
*
|
||||
* @exception HDF5LibraryException
|
||||
* - Error from the HDF-5 Library.
|
||||
* @exception NullPointerException
|
||||
* - data object is null. See public synchronized static native int H5Awrite(int attr_id, int
|
||||
* mem_type_id, byte[] buf);
|
||||
* - name is null.
|
||||
**/
|
||||
public synchronized static int H5Awrite(long attr_id, long mem_type_id, Object obj)
|
||||
throws HDF5Exception, NullPointerException
|
||||
{
|
||||
HDFArray theArray = new HDFArray(obj);
|
||||
byte[] buf = theArray.byteify();
|
||||
|
||||
int retVal = H5Awrite(attr_id, mem_type_id, buf);
|
||||
buf = null;
|
||||
theArray = null;
|
||||
return retVal;
|
||||
}
|
||||
|
||||
public synchronized static native int H5AwriteVL(long attr_id, long mem_type_id, String[] buf)
|
||||
public synchronized static native int H5Awrite_VLStrings(long attr_id, long mem_type_id, Object[] buf)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
/**
|
||||
@ -1614,8 +1870,8 @@ public class H5 implements java.io.Serializable {
|
||||
* @exception NullPointerException
|
||||
* - name is null.
|
||||
**/
|
||||
public static long H5Dopen(long loc_id, String name, long dapl_id) throws HDF5LibraryException,
|
||||
NullPointerException {
|
||||
public static long H5Dopen(long loc_id, String name, long dapl_id) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
long id = _H5Dopen2(loc_id, name, dapl_id);
|
||||
if (id > 0) {
|
||||
log.trace("OPEN_IDS: H5Dopen add {}", id);
|
||||
@ -1664,12 +1920,14 @@ public class H5 implements java.io.Serializable {
|
||||
NullPointerException;
|
||||
|
||||
public synchronized static int H5Dread(long dataset_id, long mem_type_id, long mem_space_id, long file_space_id,
|
||||
long xfer_plist_id, byte[] buf) throws HDF5LibraryException, NullPointerException {
|
||||
long xfer_plist_id, byte[] buf) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dread(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static int H5Dread(long dataset_id, long mem_type_id, long mem_space_id, long file_space_id,
|
||||
long xfer_plist_id, Object obj) throws HDF5Exception, HDF5LibraryException, NullPointerException {
|
||||
long xfer_plist_id, Object obj) throws HDF5Exception, HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dread(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, obj, true);
|
||||
}
|
||||
|
||||
@ -1703,7 +1961,8 @@ public class H5 implements java.io.Serializable {
|
||||
**/
|
||||
public synchronized static int H5Dread(long dataset_id, long mem_type_id, long mem_space_id, long file_space_id,
|
||||
long xfer_plist_id, Object obj, boolean isCriticalPinning) throws HDF5Exception, HDF5LibraryException,
|
||||
NullPointerException {
|
||||
NullPointerException
|
||||
{
|
||||
int status = -1;
|
||||
boolean is1D = false;
|
||||
|
||||
@ -1734,7 +1993,8 @@ public class H5 implements java.io.Serializable {
|
||||
}
|
||||
else if (is1D && (dname == 'J')) {
|
||||
log.trace("H5Dread_dname_J");
|
||||
status = H5Dread_long(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, (long[]) obj);
|
||||
status = H5Dread_long(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, (long[]) obj,
|
||||
isCriticalPinning);
|
||||
}
|
||||
else if (is1D && (dname == 'F')) {
|
||||
log.trace("H5Dread_dname_F");
|
||||
@ -1783,7 +2043,8 @@ public class H5 implements java.io.Serializable {
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Dread_double(long dataset_id, long mem_type_id, long mem_space_id,
|
||||
long file_space_id, long xfer_plist_id, double[] buf) throws HDF5LibraryException, NullPointerException {
|
||||
long file_space_id, long xfer_plist_id, double[] buf) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dread_double(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf, true);
|
||||
}
|
||||
|
||||
@ -1792,7 +2053,8 @@ public class H5 implements java.io.Serializable {
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Dread_float(long dataset_id, long mem_type_id, long mem_space_id,
|
||||
long file_space_id, long xfer_plist_id, float[] buf) throws HDF5LibraryException, NullPointerException {
|
||||
long file_space_id, long xfer_plist_id, float[] buf) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dread_float(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf, true);
|
||||
}
|
||||
|
||||
@ -1801,7 +2063,8 @@ public class H5 implements java.io.Serializable {
|
||||
NullPointerException;
|
||||
|
||||
public synchronized static int H5Dread_int(long dataset_id, long mem_type_id, long mem_space_id,
|
||||
long file_space_id, long xfer_plist_id, int[] buf) throws HDF5LibraryException, NullPointerException {
|
||||
long file_space_id, long xfer_plist_id, int[] buf) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dread_int(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf, true);
|
||||
}
|
||||
|
||||
@ -1810,22 +2073,21 @@ public class H5 implements java.io.Serializable {
|
||||
NullPointerException;
|
||||
|
||||
public synchronized static int H5Dread_long(long dataset_id, long mem_type_id, long mem_space_id,
|
||||
long file_space_id, long xfer_plist_id, long[] buf) throws HDF5LibraryException, NullPointerException {
|
||||
long file_space_id, long xfer_plist_id, long[] buf) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dread_long(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static native int H5Dread_reg_ref(long dataset_id, long mem_type_id, long mem_space_id,
|
||||
long file_space_id, long xfer_plist_id, String[] buf) throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static native int H5Dread_reg_ref_data(long dataset_id, long mem_type_id, long mem_space_id,
|
||||
long file_space_id, long xfer_plist_id, String[] buf) throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static native int H5Dread_short(long dataset_id, long mem_type_id, long mem_space_id,
|
||||
long file_space_id, long xfer_plist_id, short[] buf, boolean isCriticalPinning)
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Dread_short(long dataset_id, long mem_type_id, long mem_space_id,
|
||||
long file_space_id, long xfer_plist_id, short[] buf) throws HDF5LibraryException, NullPointerException {
|
||||
long file_space_id, long xfer_plist_id, short[] buf) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dread_short(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf, true);
|
||||
}
|
||||
|
||||
@ -1929,12 +2191,14 @@ public class H5 implements java.io.Serializable {
|
||||
NullPointerException;
|
||||
|
||||
public synchronized static int H5Dwrite(long dataset_id, long mem_type_id, long mem_space_id, long file_space_id,
|
||||
long xfer_plist_id, byte[] buf) throws HDF5LibraryException, NullPointerException {
|
||||
long xfer_plist_id, byte[] buf) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dwrite(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf, true);
|
||||
}
|
||||
|
||||
public synchronized static int H5Dwrite(long dataset_id, long mem_type_id, long mem_space_id, long file_space_id,
|
||||
long xfer_plist_id, Object obj) throws HDF5Exception, HDF5LibraryException, NullPointerException {
|
||||
long xfer_plist_id, Object obj) throws HDF5Exception, HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dwrite(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, obj, true);
|
||||
}
|
||||
|
||||
@ -1968,7 +2232,8 @@ public class H5 implements java.io.Serializable {
|
||||
**/
|
||||
public synchronized static int H5Dwrite(long dataset_id, long mem_type_id, long mem_space_id, long file_space_id,
|
||||
long xfer_plist_id, Object obj, boolean isCriticalPinning) throws HDF5Exception, HDF5LibraryException,
|
||||
NullPointerException {
|
||||
NullPointerException
|
||||
{
|
||||
int status = -1;
|
||||
boolean is1D = false;
|
||||
|
||||
@ -2031,7 +2296,8 @@ public class H5 implements java.io.Serializable {
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Dwrite_double(long dataset_id, long mem_type_id, long mem_space_id,
|
||||
long file_space_id, long xfer_plist_id, double[] buf) throws HDF5LibraryException, NullPointerException {
|
||||
long file_space_id, long xfer_plist_id, double[] buf) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dwrite_double(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf, true);
|
||||
}
|
||||
|
||||
@ -2040,7 +2306,8 @@ public class H5 implements java.io.Serializable {
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Dwrite_float(long dataset_id, long mem_type_id, long mem_space_id,
|
||||
long file_space_id, long xfer_plist_id, float[] buf) throws HDF5LibraryException, NullPointerException {
|
||||
long file_space_id, long xfer_plist_id, float[] buf) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dwrite_float(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf, true);
|
||||
}
|
||||
|
||||
@ -2049,7 +2316,8 @@ public class H5 implements java.io.Serializable {
|
||||
NullPointerException;
|
||||
|
||||
public synchronized static int H5Dwrite_int(long dataset_id, long mem_type_id, long mem_space_id,
|
||||
long file_space_id, long xfer_plist_id, int[] buf) throws HDF5LibraryException, NullPointerException {
|
||||
long file_space_id, long xfer_plist_id, int[] buf) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dwrite_int(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf, true);
|
||||
}
|
||||
|
||||
@ -2058,7 +2326,8 @@ public class H5 implements java.io.Serializable {
|
||||
NullPointerException;
|
||||
|
||||
public synchronized static int H5Dwrite_long(long dataset_id, long mem_type_id, long mem_space_id,
|
||||
long file_space_id, long xfer_plist_id, long[] buf) throws HDF5LibraryException, NullPointerException {
|
||||
long file_space_id, long xfer_plist_id, long[] buf) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dwrite_long(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf, true);
|
||||
}
|
||||
|
||||
@ -2067,7 +2336,8 @@ public class H5 implements java.io.Serializable {
|
||||
throws HDF5LibraryException, NullPointerException;
|
||||
|
||||
public synchronized static int H5Dwrite_short(long dataset_id, long mem_type_id, long mem_space_id,
|
||||
long file_space_id, long xfer_plist_id, short[] buf) throws HDF5LibraryException, NullPointerException {
|
||||
long file_space_id, long xfer_plist_id, short[] buf) throws HDF5LibraryException, NullPointerException
|
||||
{
|
||||
return H5Dwrite_short(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, buf, true);
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -49,15 +49,6 @@ JNIEXPORT jlong JNICALL
|
||||
Java_hdf_hdf5lib_H5__1H5Aopen_1idx
|
||||
(JNIEnv *, jclass, jlong, jint);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Awrite
|
||||
* Signature: (JJ[B)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Awrite
|
||||
(JNIEnv *, jclass, jlong, jlong, jbyteArray);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Aread
|
||||
@ -65,7 +56,115 @@ Java_hdf_hdf5lib_H5_H5Awrite
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Aread
|
||||
(JNIEnv *, jclass, jlong, jlong, jbyteArray);
|
||||
(JNIEnv *, jclass, jlong, jlong, jbyteArray, jboolean);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Awrite
|
||||
* Signature: (JJ[B)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Awrite
|
||||
(JNIEnv *, jclass, jlong, jlong, jbyteArray, jboolean);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Aread_short
|
||||
* Signature: (JJ[SZ)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Aread_1short
|
||||
(JNIEnv*, jclass, jlong, jlong, jshortArray, jboolean);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Awrite_short
|
||||
* Signature: (JJ[SZ)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Awrite_1short
|
||||
(JNIEnv*, jclass, jlong, jlong, jshortArray, jboolean);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Aread_int
|
||||
* Signature: (JJ[IZ)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Aread_1int
|
||||
(JNIEnv*, jclass, jlong, jlong, jintArray, jboolean);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Awrite_int
|
||||
* Signature: (JJ[IZ)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Awrite_1int
|
||||
(JNIEnv*, jclass, jlong, jlong, jintArray, jboolean);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Aread_long
|
||||
* Signature: (JJ[JZ)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Aread_1long
|
||||
(JNIEnv*, jclass, jlong, jlong, jlongArray, jboolean);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Awrite_long
|
||||
* Signature: (JJ[JZ)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Awrite_1long
|
||||
(JNIEnv*, jclass, jlong, jlong, jlongArray, jboolean);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Aread_float
|
||||
* Signature: (JJ[FZ)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Aread_1float
|
||||
(JNIEnv*, jclass, jlong, jlong, jfloatArray, jboolean);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Awrite_float
|
||||
* Signature: (JJ[FZ)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Awrite_1float
|
||||
(JNIEnv*, jclass, jlong, jlong, jfloatArray, jboolean);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Aread_double
|
||||
* Signature: (JJ[DZ)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Aread_1double
|
||||
(JNIEnv*, jclass, jlong, jlong, jdoubleArray, jboolean);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Awrite_double
|
||||
* Signature: (JJ[DZ)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Awrite_1double
|
||||
(JNIEnv*, jclass, jlong, jlong, jdoubleArray, jboolean);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5AreadVL
|
||||
* Signature: (JJ[Ljava/lang/String;)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5AreadVL
|
||||
(JNIEnv *, jclass, jlong, jlong, jobjectArray);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
@ -78,12 +177,48 @@ Java_hdf_hdf5lib_H5_H5AwriteVL
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5AreadVL
|
||||
* Method: H5Aread_string
|
||||
* Signature: (JJ[Ljava/lang/String;)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5AreadVL
|
||||
(JNIEnv *, jclass, jlong, jlong, jobjectArray);
|
||||
Java_hdf_hdf5lib_H5_H5Aread_1string
|
||||
(JNIEnv*, jclass, jlong, jlong, jobjectArray);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Awrite_string
|
||||
* Signature: (JJ[Ljava/lang/String;)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Awrite_1string
|
||||
(JNIEnv*, jclass, jlong, jlong, jobjectArray);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Aread_VLStrings
|
||||
* Signature: (JJ[Ljava/lang/String;)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Aread_1VLStrings
|
||||
(JNIEnv*, jclass, jlong, jlong, jobjectArray);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Awrite_VLStrings
|
||||
* Signature: (JJ[B)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Awrite_1VLStrings
|
||||
(JNIEnv*, jclass, jlong, jlong, jobjectArray);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Aread_reg_ref
|
||||
* Signature: (JJ[Ljava/lang/String;)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Aread_1reg_1ref
|
||||
(JNIEnv*, jclass, jlong, jlong, jobjectArray);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
|
||||
@ -1572,84 +1572,6 @@ Java_hdf_hdf5lib_H5_H5Dread_1reg_1ref
|
||||
return (jint)status;
|
||||
} /* end Java_hdf_hdf5lib_H5_H5Dread_1reg_1ref */
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Dread_reg_ref_data
|
||||
* Signature: (JJJJJ[Ljava/lang/String;)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Dread_1reg_1ref_1data
|
||||
(JNIEnv *env, jclass clss,
|
||||
jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
|
||||
jlong file_space_id, jlong xfer_plist_id, jobjectArray buf)
|
||||
{
|
||||
herr_t status = -1;
|
||||
h5str_t h5str;
|
||||
size_t size;
|
||||
hdset_reg_ref_t *ref_data;
|
||||
jint i;
|
||||
jint n;
|
||||
jstring jstr;
|
||||
|
||||
hid_t region_obj;
|
||||
H5S_sel_type region_type;
|
||||
|
||||
hid_t region = -1;
|
||||
hid_t did = (hid_t) dataset_id;
|
||||
hid_t tid = (hid_t) mem_type_id;
|
||||
hid_t mem_sid = (hid_t) mem_space_id;
|
||||
hid_t file_sid = (hid_t) file_space_id;
|
||||
|
||||
n = ENVPTR->GetArrayLength(ENVPAR buf);
|
||||
size = sizeof(hdset_reg_ref_t); /*H5Tget_size(tid);*/
|
||||
ref_data = (hdset_reg_ref_t*)HDmalloc(size * (size_t)n);
|
||||
|
||||
if (ref_data == NULL) {
|
||||
h5JNIFatalError(env, "H5Dread_reg_ref_data: failed to allocate buff for read");
|
||||
return -1;
|
||||
} /* end if */
|
||||
|
||||
status = H5Dread(did, tid, mem_sid, file_sid, xfer_plist_id, ref_data);
|
||||
|
||||
if (status < 0) {
|
||||
HDfree(ref_data);
|
||||
h5JNIFatalError(env, "H5Dread_reg_ref_data: failed to read data");
|
||||
return -1;
|
||||
} /* end if */
|
||||
|
||||
HDmemset(&h5str, 0, sizeof(h5str_t));
|
||||
h5str_new(&h5str, 1024);
|
||||
for (i=0; i<n; i++) {
|
||||
h5str.s[0] = '\0';
|
||||
|
||||
/* get name of the dataset the region reference points to using H5Rget_name */
|
||||
region_obj = H5Rdereference2(did, H5P_DEFAULT, H5R_DATASET_REGION, ref_data[i]);
|
||||
if (region_obj >= 0) {
|
||||
region = H5Rget_region(did, H5R_DATASET_REGION, ref_data[i]);
|
||||
if (region >= 0) {
|
||||
region_type = H5Sget_select_type(region);
|
||||
if(region_type==H5S_SEL_POINTS) {
|
||||
h5str_dump_region_points_data(&h5str, region, region_obj);
|
||||
} /* end if */
|
||||
else {
|
||||
h5str_dump_region_blocks_data(&h5str, region, region_obj);
|
||||
} /* end else */
|
||||
|
||||
H5Sclose(region);
|
||||
} /* end if */
|
||||
H5Dclose(region_obj);
|
||||
} /* end if */
|
||||
jstr = ENVPTR->NewStringUTF(ENVPAR h5str.s);
|
||||
|
||||
ENVPTR->SetObjectArrayElement(ENVPAR buf, i, jstr);
|
||||
} /* end for */
|
||||
|
||||
h5str_free(&h5str);
|
||||
HDfree(ref_data);
|
||||
|
||||
return (jint)status;
|
||||
} /* end Java_hdf_hdf5lib_H5_H5Dread_1reg_1ref_1data */
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: _H5Dcreate2
|
||||
|
||||
@ -250,7 +250,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1VLStrings
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Dwrite_VLStrings
|
||||
* Signature: (JJJJJ[BZ)I
|
||||
* Signature: (JJJJJ[B)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Dwrite_1VLStrings
|
||||
@ -265,15 +265,6 @@ JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Dread_1reg_1ref
|
||||
(JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jobjectArray);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: H5Dread_reg_ref_data
|
||||
* Signature: (JJJJJ[Ljava/lang/String;)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_hdf_hdf5lib_H5_H5Dread_1reg_1ref_1data
|
||||
(JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jobjectArray);
|
||||
|
||||
/*
|
||||
* Class: hdf_hdf5lib_H5
|
||||
* Method: _H5Dcreate2
|
||||
|
||||
@ -38,17 +38,20 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
|
||||
minor: Unable to open file
|
||||
#001: (file name) line (number) in H5VL_file_open(): open failed
|
||||
major: Virtual Object Layer
|
||||
minor: Unable to initialize object
|
||||
#002: (file name) line (number) in H5VL_native_file_open(): unable to open file
|
||||
minor: Can't open object
|
||||
#002: (file name) line (number) in H5VL__file_open(): open failed
|
||||
major: Virtual Object Layer
|
||||
minor: Can't open object
|
||||
#003: (file name) line (number) in H5VL__native_file_open(): unable to open file
|
||||
major: File accessibility
|
||||
minor: Unable to open file
|
||||
#003: (file name) line (number) in H5F_open(): unable to open file: name = 'test', tent_flags = 1
|
||||
#004: (file name) line (number) in H5F_open(): unable to open file: name = 'test', tent_flags = 1
|
||||
major: File accessibility
|
||||
minor: Unable to open file
|
||||
#004: (file name) line (number) in H5FD_open(): open failed
|
||||
#005: (file name) line (number) in H5FD_open(): open failed
|
||||
major: Virtual File Layer
|
||||
minor: Unable to initialize object
|
||||
#005: (file name) line (number) in H5FD_sec2_open(): unable to open file: name = 'test', errno = 2, error message = 'No such file or directory', flags = 1, o_flags = 2
|
||||
#006: (file name) line (number) in H5FD_sec2_open(): unable to open file: name = 'test', errno = 2, error message = 'No such file or directory', flags = 1, o_flags = 2
|
||||
major: File accessibility
|
||||
minor: Unable to open file
|
||||
HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
|
||||
@ -57,16 +60,19 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
|
||||
minor: Unable to open file
|
||||
#001: (file name) line (number) in H5VL_file_open(): open failed
|
||||
major: Virtual Object Layer
|
||||
minor: Unable to initialize object
|
||||
#002: (file name) line (number) in H5VL_native_file_open(): unable to open file
|
||||
minor: Can't open object
|
||||
#002: (file name) line (number) in H5VL__file_open(): open failed
|
||||
major: Virtual Object Layer
|
||||
minor: Can't open object
|
||||
#003: (file name) line (number) in H5VL__native_file_open(): unable to open file
|
||||
major: File accessibility
|
||||
minor: Unable to open file
|
||||
#003: (file name) line (number) in H5F_open(): unable to open file: name = 'test', tent_flags = 1
|
||||
#004: (file name) line (number) in H5F_open(): unable to open file: name = 'test', tent_flags = 1
|
||||
major: File accessibility
|
||||
minor: Unable to open file
|
||||
#004: (file name) line (number) in H5FD_open(): open failed
|
||||
#005: (file name) line (number) in H5FD_open(): open failed
|
||||
major: Virtual File Layer
|
||||
minor: Unable to initialize object
|
||||
#005: (file name) line (number) in H5FD_sec2_open(): unable to open file: name = 'test', errno = 2, error message = 'No such file or directory', flags = 1, o_flags = 2
|
||||
#006: (file name) line (number) in H5FD_sec2_open(): unable to open file: name = 'test', errno = 2, error message = 'No such file or directory', flags = 1, o_flags = 2
|
||||
major: File accessibility
|
||||
minor: Unable to open file
|
||||
|
||||
@ -110,7 +110,7 @@ New Features
|
||||
|
||||
(ADB - 2018/07/16)
|
||||
|
||||
|
||||
|
||||
Library:
|
||||
--------
|
||||
- Allow pre-generated H5Tinit.c and H5make_libsettings.c to be used.
|
||||
@ -181,6 +181,15 @@ New Features
|
||||
|
||||
Java Library:
|
||||
----------------
|
||||
- Duplicate the data read/write functions of Datasets for Attributes.
|
||||
|
||||
Region references could not be displayed for attributes as they could
|
||||
for datasets. Datasets had overloaded read and write functions for different
|
||||
datatypes that were not available for attributes. After adding similar
|
||||
functions, attribute region references work normally.
|
||||
|
||||
(ADB - 2018/12/12, HDFVIEW-4)
|
||||
|
||||
|
||||
Tools:
|
||||
------
|
||||
@ -285,9 +294,9 @@ Bug Fixes since HDF5-1.10.3 release
|
||||
- Made Fortran specific subroutines PRIVATE in generic procedures.
|
||||
|
||||
Effected generic procedures were functions in H5A, H5D, H5P, H5R and H5T.
|
||||
|
||||
|
||||
(MSB, 2018/12/04, HDFFV-10511)
|
||||
|
||||
|
||||
Tools
|
||||
-----
|
||||
-
|
||||
|
||||
Loading…
Reference in New Issue
Block a user