philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into hdf5_1_10.sync

Browse Source
This commit is contained in:
M. Scot Breitenfeld
2018-06-04 14:41:12 -05:00
parent cc611c696f afc6beb776
commit f484649347
112 changed files with 2797 additions and 2238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
java/src/hdf/hdf5lib/H5.java
View File

@@ -4287,7 +4287,27 @@ public class H5 implements java.io.Serializable {
* @exception NullPointerException
* - name is null.
**/
public synchronized static native H5O_info_t H5Oget_info(long loc_id) throws HDF5LibraryException,
public static H5O_info_t H5Oget_info(long loc_id) throws HDF5LibraryException,
NullPointerException {
return H5Oget_info(loc_id, HDF5Constants.H5O_INFO_ALL);
}
/**
* H5Oget_info retrieves the metadata for an object specified by an identifier.
*
* @param loc_id
* IN: Identifier for target object
* @param fields
* IN: Object fields to select
*
* @return object information
*
* @exception HDF5LibraryException
* - Error from the HDF-5 Library.
* @exception NullPointerException
* - name is null.
**/
public synchronized static native H5O_info_t H5Oget_info(long loc_id, int fields) throws HDF5LibraryException,
NullPointerException;
/**
@@ -4314,8 +4334,39 @@ public class H5 implements java.io.Serializable {
* @exception NullPointerException
* - name is null.
**/
public static H5O_info_t H5Oget_info_by_idx(long loc_id, String group_name, int idx_type,
int order, long n, long lapl_id) throws HDF5LibraryException, NullPointerException {
return H5Oget_info_by_idx(loc_id, group_name, idx_type, order, n, HDF5Constants.H5O_INFO_ALL, lapl_id);
}
/**
* H5Oget_info_by_idx retrieves the metadata for an object, identifying the object by an index position.
*
* @param loc_id
* IN: File or group identifier
* @param group_name
* IN: Name of group, relative to loc_id, in which object is located
* @param idx_type
* IN: Type of index by which objects are ordered
* @param order
* IN: Order of iteration within index
* @param n
* IN: Object to open
* @param fields
* IN: Object fields to select
* @param lapl_id
* IN: Access property list identifier for the link pointing to the object (Not currently used; pass as
* H5P_DEFAULT.)
*
* @return object information
*
* @exception HDF5LibraryException
* - Error from the HDF-5 Library.
* @exception NullPointerException
* - name is null.
**/
public synchronized static native H5O_info_t H5Oget_info_by_idx(long loc_id, String group_name, int idx_type,
int order, long n, long lapl_id) throws HDF5LibraryException, NullPointerException;
int order, long n, int fields, long lapl_id) throws HDF5LibraryException, NullPointerException;
/**
* H5Oget_info_by_name retrieves the metadata for an object, identifying the object by location and relative name.
@@ -4335,7 +4386,32 @@ public class H5 implements java.io.Serializable {
* @exception NullPointerException
* - name is null.
**/
public synchronized static native H5O_info_t H5Oget_info_by_name(long loc_id, String name, long lapl_id)
public static H5O_info_t H5Oget_info_by_name(long loc_id, String name, long lapl_id)
throws HDF5LibraryException, NullPointerException {
return H5Oget_info_by_name(loc_id, name, HDF5Constants.H5O_INFO_ALL, lapl_id);
}
/**
* H5Oget_info_by_name retrieves the metadata for an object, identifying the object by location and relative name.
*
* @param loc_id
* IN: File or group identifier specifying location of group in which object is located
* @param name
* IN: Relative name of group
* @param fields
* IN: Object fields to select
* @param lapl_id
* IN: Access property list identifier for the link pointing to the object (Not currently used; pass as
* H5P_DEFAULT.)
*
* @return object information
*
* @exception HDF5LibraryException
* - Error from the HDF-5 Library.
* @exception NullPointerException
* - name is null.
**/
public synchronized static native H5O_info_t H5Oget_info_by_name(long loc_id, String name, int fields, long lapl_id)
throws HDF5LibraryException, NullPointerException;
/**
@@ -4412,8 +4488,37 @@ public class H5 implements java.io.Serializable {
* @exception NullPointerException
* - name is null.
**/
public static int H5Ovisit(long obj_id, int idx_type, int order, H5O_iterate_cb op, H5O_iterate_t op_data)
throws HDF5LibraryException, NullPointerException {
return H5Ovisit(obj_id, idx_type, order, op, op_data, HDF5Constants.H5O_INFO_ALL);
}
/**
* H5Ovisit recursively visits all objects accessible from a specified object.
*
* @param obj_id
* IN: Identifier of the object at which the recursive iteration begins.
* @param idx_type
* IN: Type of index
* @param order
* IN: Order of iteration within index
* @param op
* IN: Callback function passing data regarding the object to the calling application
* @param op_data
* IN: User-defined pointer to data required by the application for its processing of the object
* @param fields
* IN: Object fields to select
*
* @return returns the return value of the first operator that returns a positive value, or zero if all members were
* processed with no operator returning non-zero.
*
* @exception HDF5LibraryException
* - Error from the HDF-5 Library.
* @exception NullPointerException
* - name is null.
**/
public synchronized static native int H5Ovisit(long obj_id, int idx_type, int order, H5O_iterate_cb op,
H5O_iterate_t op_data) throws HDF5LibraryException, NullPointerException;
H5O_iterate_t op_data, int fields) throws HDF5LibraryException, NullPointerException;
/**
* H5Ovisit_by_name recursively visits all objects starting from a specified object.
@@ -4441,8 +4546,41 @@ public class H5 implements java.io.Serializable {
* @exception NullPointerException
* - name is null.
**/
public static int H5Ovisit_by_name(long loc_id, String obj_name, int idx_type, int order,
H5O_iterate_cb op, H5O_iterate_t op_data, long lapl_id) throws HDF5LibraryException, NullPointerException {
return H5Ovisit_by_name(loc_id, obj_name, idx_type, order, op, op_data, HDF5Constants.H5O_INFO_ALL, lapl_id);
}
/**
* H5Ovisit_by_name recursively visits all objects starting from a specified object.
*
* @param loc_id
* IN: File or group identifier
* @param obj_name
* IN: Relative path to the object
* @param idx_type
* IN: Type of index
* @param order
* IN: Order of iteration within index
* @param op
* IN: Callback function passing data regarding the object to the calling application
* @param op_data
* IN: User-defined pointer to data required by the application for its processing of the object
* @param fields
* IN: Object fields to select
* @param lapl_id
* IN: Link access property list identifier
*
* @return returns the return value of the first operator that returns a positive value, or zero if all members were
* processed with no operator returning non-zero.
*
* @exception HDF5LibraryException
* - Error from the HDF-5 Library.
* @exception NullPointerException
* - name is null.
**/
public synchronized static native int H5Ovisit_by_name(long loc_id, String obj_name, int idx_type, int order,
H5O_iterate_cb op, H5O_iterate_t op_data, long lapl_id) throws HDF5LibraryException, NullPointerException;
H5O_iterate_cb op, H5O_iterate_t op_data, int fields, long lapl_id) throws HDF5LibraryException, NullPointerException;
/**