mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-31 17:10:47 +08:00
[svn-r9883] Purpose:
added a first batch of dimension scales fix some small bubgs in lite (a close function was not being called ) Description: this batch contains the basic API functions described in the RFC and a minimal test file Solution: Platforms tested: linux solaris 64 AIX windows Misc. update:
This commit is contained in:
Pedro Vicente Nunes
parent
82e29e9369
commit
f9ad232b42
2
MANIFEST
2
MANIFEST
@ -1553,6 +1553,8 @@
|
||||
./hl/src/H5LT.h
|
||||
./hl/src/H5TB.c
|
||||
./hl/src/H5TB.h
|
||||
./hl/src/H5DS.c
|
||||
./hl/src/H5DS.h
|
||||
./hl/test/Dependencies
|
||||
./hl/test/Makefile.in
|
||||
./hl/test/test_image.c
|
||||
|
||||
@ -4,9 +4,9 @@
|
||||
H5LT.lo: \
|
||||
$(top_srcdir)/hl/src/H5LT.c \
|
||||
$(top_srcdir)/hl/src/H5LT.h
|
||||
H5TA.lo: \
|
||||
$(top_srcdir)/hl/src/H5TA.c \
|
||||
$(top_srcdir)/hl/src/H5TA.h \
|
||||
H5TB.lo: \
|
||||
$(top_srcdir)/hl/src/H5TB.c \
|
||||
$(top_srcdir)/hl/src/H5TB.h \
|
||||
$(top_srcdir)/hl/src/H5LT.h
|
||||
H5IM.lo: \
|
||||
$(top_srcdir)/hl/src/H5IM.c \
|
||||
|
||||
1267
hl/src/H5DS.c
Normal file
1267
hl/src/H5DS.c
Normal file
File diff suppressed because it is too large
Load Diff
73
hl/src/H5DS.h
Normal file
73
hl/src/H5DS.h
Normal file
@ -0,0 +1,73 @@
|
||||
|
||||
/****************************************************************************
|
||||
* NCSA HDF *
|
||||
* Scientific Data Technologies *
|
||||
* National Center for Supercomputing Applications *
|
||||
* University of Illinois at Urbana-Champaign *
|
||||
* 605 E. Springfield, Champaign IL 61820 *
|
||||
* *
|
||||
* For conditions of distribution and use, see the accompanying *
|
||||
* hdf/COPYING file. *
|
||||
* *
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
#ifndef _H5DS_H
|
||||
#define _H5DS_H
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
#endif
|
||||
|
||||
#define DIMENSION_SCALE_CLASS "DIMENSION_SCALE"
|
||||
#define DIMENSION_LIST "DIMENSION_LIST"
|
||||
#define REFERENCE_LIST "REFERENCE_LIST"
|
||||
#define DIMENSION_LABELS "DIMENSION_LABELS"
|
||||
|
||||
|
||||
/* attribute type of a DS dataset */
|
||||
typedef struct ds_list_t {
|
||||
hobj_ref_t ref; /* object reference */
|
||||
int dim_idx; /* dimension index of the dataset */
|
||||
} ds_list_t;
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
herr_t H5DSset_scale(hid_t did,
|
||||
char *dimname);
|
||||
|
||||
herr_t H5DSattach_scale(hid_t did,
|
||||
hid_t dsid,
|
||||
unsigned int idx);
|
||||
|
||||
herr_t H5DSdetach_scale(hid_t did,
|
||||
hid_t dsid,
|
||||
unsigned int idx);
|
||||
|
||||
herr_t H5DSset_label(hid_t did,
|
||||
char *label,
|
||||
unsigned int idx);
|
||||
|
||||
herr_t H5DSget_label(hid_t did,
|
||||
char *label,
|
||||
unsigned int idx);
|
||||
|
||||
herr_t H5DSget_scale_name(hid_t did,
|
||||
char *buf);
|
||||
|
||||
|
||||
herr_t H5DSis_scale(hid_t did);
|
||||
|
||||
herr_t H5DShas_scale(hid_t did);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@ -537,7 +537,7 @@ herr_t H5IMlink_palette( hid_t loc_id,
|
||||
hsize_t dim_ref;
|
||||
int ok_pal;
|
||||
|
||||
/* The image dataset may or not have the attribute "PALETTE"
|
||||
/* The image dataset may or may not have the attribute "PALETTE"
|
||||
* First we try to open to see if it is already there; if not, it is created.
|
||||
* If it exists, the array of references is extended to hold the reference
|
||||
* to the new palette
|
||||
@ -946,6 +946,10 @@ herr_t H5IMget_palette_info( hid_t loc_id,
|
||||
if ( H5Sclose( attr_space_id ) < 0 )
|
||||
goto out;
|
||||
|
||||
/* close the dereferenced dataset */
|
||||
if (H5Dclose(pal_id)<0)
|
||||
goto out;
|
||||
|
||||
free( refbuf );
|
||||
|
||||
} /* H5T_REFERENCE */
|
||||
@ -1057,6 +1061,10 @@ herr_t H5IMget_palette( hid_t loc_id,
|
||||
if ( H5Sclose( attr_space_id ) < 0 )
|
||||
goto out;
|
||||
|
||||
/* close the dereferenced dataset */
|
||||
if (H5Dclose(pal_id)<0)
|
||||
goto out;
|
||||
|
||||
free( refbuf );
|
||||
|
||||
} /* H5T_REFERENCE */
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
*
|
||||
* Private functions
|
||||
* internal functions
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -2617,6 +2617,12 @@ herr_t H5LTget_attribute( hid_t loc_id,
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
* private functions
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
* Function: H5LT_get_attribute_mem
|
||||
@ -2714,3 +2720,94 @@ out:
|
||||
|
||||
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
* Function: H5LT_set_attribute_string
|
||||
*
|
||||
* Purpose: creates and writes an attribute named NAME to the dataset DSET_ID
|
||||
*
|
||||
* Return: FAIL on error, SUCCESS on success
|
||||
*
|
||||
* Programmer: pvn@ncsa.uiuc.edu
|
||||
*
|
||||
* Date: January 04, 2005
|
||||
*
|
||||
* Comments:
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
||||
herr_t H5LT_set_attribute_string(hid_t dset_id,
|
||||
char *name,
|
||||
char *buf )
|
||||
{
|
||||
hid_t tid;
|
||||
hid_t sid;
|
||||
hid_t aid;
|
||||
int has_attr;
|
||||
size_t size;
|
||||
|
||||
/* verify if the attribute already exists */
|
||||
has_attr = H5LT_find_attribute(dset_id,name);
|
||||
|
||||
/* the attribute already exists, delete it */
|
||||
if ( has_attr == 1 )
|
||||
{
|
||||
if ( H5Adelete(dset_id,name)<0)
|
||||
return FAIL;
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
* create the attribute type
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
if ((tid = H5Tcopy(H5T_C_S1))<0)
|
||||
return FAIL;
|
||||
|
||||
size = strlen(buf) + 1; /* extra null term */
|
||||
|
||||
if (H5Tset_size(tid,(size_t)size)<0)
|
||||
goto out;
|
||||
|
||||
if (H5Tset_strpad(tid,H5T_STR_NULLTERM)<0)
|
||||
goto out;
|
||||
|
||||
if ((sid = H5Screate(H5S_SCALAR))<0)
|
||||
goto out;
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
* create and write the attribute
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
if ((aid = H5Acreate(dset_id,name,tid,sid,H5P_DEFAULT))<0)
|
||||
goto out;
|
||||
|
||||
if (H5Awrite(aid,tid,buf)<0)
|
||||
goto out;
|
||||
|
||||
if (H5Aclose(aid)<0)
|
||||
goto out;
|
||||
|
||||
if (H5Sclose(sid)<0)
|
||||
goto out;
|
||||
|
||||
if (H5Tclose(tid)<0)
|
||||
goto out;
|
||||
|
||||
return SUCCESS;
|
||||
|
||||
/* error zone, gracefully close */
|
||||
out:
|
||||
H5E_BEGIN_TRY {
|
||||
H5Aclose(aid);
|
||||
H5Tclose(tid);
|
||||
H5Sclose(sid);
|
||||
} H5E_END_TRY;
|
||||
return FAIL;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -17,6 +17,15 @@
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
|
||||
#ifndef FAIL
|
||||
#define FAIL -1
|
||||
#endif
|
||||
|
||||
#ifndef SUCCESS
|
||||
#define SUCCESS 0
|
||||
#endif
|
||||
|
||||
#define TESTING(WHAT) {printf("%-70s", "Testing " WHAT); fflush(stdout);}
|
||||
#define PASSED() {puts(" PASSED");fflush(stdout);}
|
||||
#define H5_FAILED() {puts("*FAILED*");fflush(stdout);}
|
||||
@ -364,6 +373,10 @@ herr_t H5LT_set_attribute_numerical( hid_t loc_id,
|
||||
hid_t type_id,
|
||||
const void *data );
|
||||
|
||||
herr_t H5LT_set_attribute_string(hid_t dset_id,
|
||||
char *name,
|
||||
char *buf );
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ LIBHDF5=$(top_builddir)/src/libhdf5.la
|
||||
CLEAN=
|
||||
|
||||
## Source and object files for the library (lexicographically)...
|
||||
LIB_SRC=H5LT.c H5TB.c H5IM.c
|
||||
LIB_SRC=H5LT.c H5TB.c H5IM.c H5DS.c
|
||||
|
||||
LIB_OBJ=$(LIB_SRC:.c=.lo)
|
||||
|
||||
@ -26,7 +26,7 @@ LIB_OBJ=$(LIB_SRC:.c=.lo)
|
||||
MOSTLYCLEAN=
|
||||
|
||||
## Public header files (to be installed)...
|
||||
PUB_HDR=H5IM.h H5LT.h H5TB.h
|
||||
PUB_HDR=H5IM.h H5LT.h H5TB.h H5DS.h
|
||||
|
||||
## Other header files (not to be installed)...
|
||||
PRIVATE_HDR=
|
||||
|
||||
@ -10,5 +10,5 @@ test_image.lo: \
|
||||
$(top_srcdir)/hl/src/H5LT.h
|
||||
test_table.lo: \
|
||||
$(top_srcdir)/hl/test/test_table.c \
|
||||
$(top_srcdir)/hl/src/H5TA.h \
|
||||
$(top_srcdir)/hl/src/H5TB.h \
|
||||
$(top_srcdir)/hl/src/H5LT.h
|
||||
|
||||
@ -16,7 +16,7 @@ CPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdi
|
||||
## executed, generally most specific tests to least specific tests.
|
||||
RUNTEST=$(LT_RUN)
|
||||
|
||||
TEST_PROGS=test_lite test_image test_table
|
||||
TEST_PROGS=test_lite test_image test_table test_ds
|
||||
|
||||
## The libh5test.a library provides common support code for the tests. We link
|
||||
## this library statically because some systems can only link executables to
|
||||
@ -40,7 +40,7 @@ CLEAN=*.h5
|
||||
## other source lists are for the individual tests, the files of which may
|
||||
## overlap with other tests.
|
||||
|
||||
TEST_SRC=test_lite.c test_image.c test_table.c
|
||||
TEST_SRC=test_lite.c test_image.c test_table.c test_ds.c
|
||||
|
||||
TEST_OBJ=$(TEST_SRC:.c=.lo)
|
||||
|
||||
@ -60,5 +60,8 @@ test_image: test_image.lo
|
||||
test_table: test_table.lo
|
||||
@$(LT_LINK_EXE) $(CFLAGS) -o $@ test_table.lo $(LIBHDF5_HL) $(LIBHDF5) $(LDFLAGS) $(LIBS)
|
||||
|
||||
|
||||
test_ds: test_ds.lo
|
||||
@$(LT_LINK_EXE) $(CFLAGS) -o $@ test_ds.lo $(LIBHDF5_HL) $(LIBHDF5) $(LDFLAGS) $(LIBS)
|
||||
|
||||
|
||||
@CONCLUDE@
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user