Mercurial > hg > minc-tools
changeset 1993:300fd0f951cb
Cleanup headers, mostly by getting rid of the infernal 'public' and using extern instead
| author | bert <bert> |
|---|---|
| date | Fri, 04 Mar 2005 00:08:08 +0000 |
| parents | 47b0da03c5ba |
| children | 3806135d219b |
| files | conversion/Acr_nema/acr_nema/acr_io.h conversion/Acr_nema/acr_nema/element.h conversion/Acr_nema/acr_nema/file_io.h conversion/Acr_nema/acr_nema/group.h conversion/Acr_nema/acr_nema/value_repr.h |
| diffstat | 5 files changed, 164 insertions(+), 145 deletions(-) [+] |
line wrap: on
line diff
--- a/conversion/Acr_nema/acr_nema/acr_io.h +++ b/conversion/Acr_nema/acr_nema/acr_io.h @@ -6,7 +6,10 @@ @CREATED : November 10, 1993 (Peter Neelin) @MODIFIED : * $Log: acr_io.h,v $ - * Revision 6.2 2000-04-28 15:03:11 neelin + * Revision 6.3 2005-03-04 00:08:08 bert + * Cleanup headers, mostly by getting rid of the infernal 'public' and using extern instead + * + * Revision 6.2 2000/04/28 15:03:11 neelin * Added support for ignoring non-fatal protocol errors (cases where redundant * information is inconsistent). In particular, it is possible to ignore * differences between the group length element and the true group length. @@ -125,56 +128,56 @@ } Acr_Status; /* Functions */ -public void acr_set_byte_order(Acr_File *afp, +extern void acr_set_byte_order(Acr_File *afp, Acr_byte_order byte_order); -public Acr_byte_order acr_get_byte_order(Acr_File *afp); -public int acr_get_machine_byte_order(void); -public int acr_need_invert(Acr_byte_order byte_order); -public void acr_set_vr_encoding(Acr_File *afp, +extern Acr_byte_order acr_get_byte_order(Acr_File *afp); +extern int acr_get_machine_byte_order(void); +extern int acr_need_invert(Acr_byte_order byte_order); +extern void acr_set_vr_encoding(Acr_File *afp, Acr_VR_encoding_type vr_encoding); -public Acr_VR_encoding_type acr_get_vr_encoding(Acr_File *afp); -public void acr_set_ignore_errors(Acr_File *afp, +extern Acr_VR_encoding_type acr_get_vr_encoding(Acr_File *afp); +extern void acr_set_ignore_errors(Acr_File *afp, int ignore_nonfatal_protocol_errors); -public int acr_ignore_protocol_errors(Acr_File *afp); -public void acr_reverse_byte_order(long nvals, size_t value_size, +extern int acr_ignore_protocol_errors(Acr_File *afp); +extern void acr_reverse_byte_order(long nvals, size_t value_size, void *input_values, void *output_values); -public void acr_get_short(Acr_byte_order byte_order, +extern void acr_get_short(Acr_byte_order byte_order, long nvals, void *input_value, unsigned short *mach_value); -public void acr_get_long(Acr_byte_order byte_order, +extern void acr_get_long(Acr_byte_order byte_order, long nvals, void *input_value, long *mach_value); -public void acr_get_float(Acr_byte_order byte_order, +extern void acr_get_float(Acr_byte_order byte_order, long nvals, void *input_value, float *mach_value); -public void acr_get_double(Acr_byte_order byte_order, +extern void acr_get_double(Acr_byte_order byte_order, long nvals, void *input_value, double *mach_value); -public void acr_put_short(Acr_byte_order byte_order, +extern void acr_put_short(Acr_byte_order byte_order, long nvals, unsigned short *mach_value, void *output_value); -public void acr_put_long(Acr_byte_order byte_order, +extern void acr_put_long(Acr_byte_order byte_order, long nvals, long *mach_value, void *output_value); -public void acr_put_float(Acr_byte_order byte_order, +extern void acr_put_float(Acr_byte_order byte_order, long nvals, float *mach_value, void *output_value); -public void acr_put_double(Acr_byte_order byte_order, +extern void acr_put_double(Acr_byte_order byte_order, long nvals, double *mach_value, void *output_value); -public Acr_Status acr_skip_input_data(Acr_File *afp, long nbytes_to_skip); -public Acr_Status acr_read_buffer(Acr_File *afp, unsigned char buffer[], +extern Acr_Status acr_skip_input_data(Acr_File *afp, long nbytes_to_skip); +extern Acr_Status acr_read_buffer(Acr_File *afp, unsigned char buffer[], long nbytes_to_read, long *nbytes_read); -public Acr_Status acr_unget_buffer(Acr_File *afp, unsigned char buffer[], +extern Acr_Status acr_unget_buffer(Acr_File *afp, unsigned char buffer[], long nbytes_to_unget); -public Acr_Status acr_write_buffer(Acr_File *afp, unsigned char buffer[], +extern Acr_Status acr_write_buffer(Acr_File *afp, unsigned char buffer[], long nbytes_to_write, long *nbytes_written); -public Acr_Status acr_test_byte_order(Acr_File *afp); -public void acr_copy_file_encoding(Acr_File *afp1, Acr_File *afp2); -public int acr_get_element_header_size(char vr_name[2], +extern Acr_Status acr_test_byte_order(Acr_File *afp); +extern void acr_copy_file_encoding(Acr_File *afp1, Acr_File *afp2); +extern int acr_get_element_header_size(char vr_name[2], Acr_VR_encoding_type vr_encoding); -public Acr_Status acr_peek_at_next_element_id(Acr_File *afp, +extern Acr_Status acr_peek_at_next_element_id(Acr_File *afp, int *group_id, int *element_id); -public Acr_Status acr_read_one_element(Acr_File *afp, +extern Acr_Status acr_read_one_element(Acr_File *afp, int *group_id, int *element_id, char vr_name[], long *data_length, char **data_pointer); -public Acr_Status acr_write_one_element(Acr_File *afp, +extern Acr_Status acr_write_one_element(Acr_File *afp, int group_id, int element_id, char vr_name[], long data_length, char *data_pointer); -public char *acr_status_string(Acr_Status status); +extern char *acr_status_string(Acr_Status status);
--- a/conversion/Acr_nema/acr_nema/element.h +++ b/conversion/Acr_nema/acr_nema/element.h @@ -6,7 +6,10 @@ @CREATED : November 10, 1993 (Peter Neelin) @MODIFIED : * $Log: element.h,v $ - * Revision 6.2 2004-10-29 13:08:41 rotor + * Revision 6.3 2005-03-04 00:08:08 bert + * Cleanup headers, mostly by getting rid of the infernal 'public' and using extern instead + * + * Revision 6.2 2004/10/29 13:08:41 rotor * * rewrote Makefile with no dependency on a minc distribution * * removed all references to the abominable minc_def.h * * I should autoconf this really, but this is old code that @@ -77,8 +80,8 @@ express or implied warranty. ---------------------------------------------------------------------------- */ -#ifndef ELEMENT_H -#define ELEMENT_H +#ifndef _ACR_ELEMENT_H_ +#define _ACR_ELEMENT_H_ /* Element type */ typedef struct Acr_Element { @@ -138,68 +141,68 @@ ACR_ITEM_TAG, UNKNOWN); /* Functions */ -public Acr_Element acr_create_element(int group_id, int element_id, +extern Acr_Element acr_create_element(int group_id, int element_id, Acr_VR_Type vr_code, long data_length, char *data_pointer); -public void acr_delete_element(Acr_Element element); -public void acr_delete_element_list(Acr_Element element_list); -public Acr_Element acr_element_list_add(Acr_Element element_list, +extern void acr_delete_element(Acr_Element element); +extern void acr_delete_element_list(Acr_Element element_list); +extern Acr_Element acr_element_list_add(Acr_Element element_list, Acr_Element element); -public void acr_set_element_id(Acr_Element element, +extern void acr_set_element_id(Acr_Element element, int group_id, int element_id); -public void acr_set_element_vr(Acr_Element element, +extern void acr_set_element_vr(Acr_Element element, Acr_VR_Type vr_code); -public void acr_set_element_vr_encoding(Acr_Element element, +extern void acr_set_element_vr_encoding(Acr_Element element, Acr_VR_encoding_type vr_encoding); -public void acr_set_element_byte_order(Acr_Element element, +extern void acr_set_element_byte_order(Acr_Element element, Acr_byte_order byte_order); -public void acr_set_element_variable_length(Acr_Element element, +extern void acr_set_element_variable_length(Acr_Element element, int has_variable_length); -public void acr_set_element_data(Acr_Element element, +extern void acr_set_element_data(Acr_Element element, long data_length, char *data_pointer); -public void acr_set_element_next(Acr_Element element, Acr_Element next); -public int acr_get_element_group(Acr_Element element); -public int acr_get_element_element(Acr_Element element); -public Acr_VR_Type acr_get_element_vr(Acr_Element element); -public Acr_VR_encoding_type acr_get_element_vr_encoding(Acr_Element element); -public int acr_element_is_sequence(Acr_Element element); -public Acr_byte_order acr_get_element_byte_order(Acr_Element element); -public int acr_element_has_variable_length(Acr_Element element); -public long acr_get_element_length(Acr_Element element); -public char *acr_get_element_data(Acr_Element element); -public long acr_get_element_total_length(Acr_Element element, +extern void acr_set_element_next(Acr_Element element, Acr_Element next); +extern int acr_get_element_group(Acr_Element element); +extern int acr_get_element_element(Acr_Element element); +extern Acr_VR_Type acr_get_element_vr(Acr_Element element); +extern Acr_VR_encoding_type acr_get_element_vr_encoding(Acr_Element element); +extern int acr_element_is_sequence(Acr_Element element); +extern Acr_byte_order acr_get_element_byte_order(Acr_Element element); +extern int acr_element_has_variable_length(Acr_Element element); +extern long acr_get_element_length(Acr_Element element); +extern char *acr_get_element_data(Acr_Element element); +extern long acr_get_element_total_length(Acr_Element element, Acr_VR_encoding_type vr_encoding); -public Acr_Element acr_get_element_next(Acr_Element element); -public Acr_Element acr_copy_element(Acr_Element element); -public Acr_Status acr_input_element(Acr_File *afp, Acr_Element *element); -public Acr_Status acr_output_element(Acr_File *afp, Acr_Element element); -public void acr_convert_element_byte_order(Acr_Element element, +extern Acr_Element acr_get_element_next(Acr_Element element); +extern Acr_Element acr_copy_element(Acr_Element element); +extern Acr_Status acr_input_element(Acr_File *afp, Acr_Element *element); +extern Acr_Status acr_output_element(Acr_File *afp, Acr_Element element); +extern void acr_convert_element_byte_order(Acr_Element element, Acr_byte_order byte_order); -public int acr_match_element_id(Acr_Element_Id elid, +extern int acr_match_element_id(Acr_Element_Id elid, Acr_Element element); -public Acr_Element acr_find_element_id(Acr_Element element_list, +extern Acr_Element acr_find_element_id(Acr_Element element_list, Acr_Element_Id elid); -public void *acr_memdup(size_t value_size, void *value); -public Acr_Element acr_create_element_short(Acr_Element_Id elid, +extern void *acr_memdup(size_t value_size, void *value); +extern Acr_Element acr_create_element_short(Acr_Element_Id elid, unsigned short value); -public Acr_Element acr_create_element_long(Acr_Element_Id elid, +extern Acr_Element acr_create_element_long(Acr_Element_Id elid, long value); -public Acr_Element acr_create_element_numeric(Acr_Element_Id elid, +extern Acr_Element acr_create_element_numeric(Acr_Element_Id elid, double value); -public Acr_Element acr_create_element_string(Acr_Element_Id elid, +extern Acr_Element acr_create_element_string(Acr_Element_Id elid, char *value); -public Acr_Element acr_create_element_sequence(Acr_Element_Id elid, +extern Acr_Element acr_create_element_sequence(Acr_Element_Id elid, Acr_Element itemlist); -public unsigned short acr_get_element_short(Acr_Element element); -public long acr_get_element_long(Acr_Element element); -public double acr_get_element_numeric(Acr_Element element); -public char *acr_get_element_string(Acr_Element element); -public long acr_get_element_short_array(Acr_Element element, long max_values, +extern unsigned short acr_get_element_short(Acr_Element element); +extern long acr_get_element_long(Acr_Element element); +extern double acr_get_element_numeric(Acr_Element element); +extern char *acr_get_element_string(Acr_Element element); +extern long acr_get_element_short_array(Acr_Element element, long max_values, unsigned short values[]); -public int *acr_element_numeric_array_separator(int character); -public int acr_get_element_numeric_array(Acr_Element element, +extern int *acr_element_numeric_array_separator(int character); +extern int acr_get_element_numeric_array(Acr_Element element, int max_values, double values[]); -public void acr_dump_element_list(FILE *file_pointer, +extern void acr_dump_element_list(FILE *file_pointer, Acr_Element element_list); -#endif +#endif /* _ACR_ELEMENT_H_ */
--- a/conversion/Acr_nema/acr_nema/file_io.h +++ b/conversion/Acr_nema/acr_nema/file_io.h @@ -6,7 +6,10 @@ @CREATED : November 9, 1993 (Peter Neelin) @MODIFIED : * $Log: file_io.h,v $ - * Revision 6.2 2000-05-17 20:17:48 neelin + * Revision 6.3 2005-03-04 00:08:08 bert + * Cleanup headers, mostly by getting rid of the infernal 'public' and using extern instead + * + * Revision 6.2 2000/05/17 20:17:48 neelin * Added mechanism to allow testing of input streams for more data through * function acr_file_ismore. * This is used in dicom_client_routines to allow asynchronous transfer @@ -62,10 +65,6 @@ /* Define constants */ -#ifndef public -# define public -#endif - #define ACR_NO_WATCHPOINT LONG_MAX /* Define io routine prototype */ @@ -111,26 +110,26 @@ acr_file_write_more(afp, c) ) /* Function definitions */ -public void acr_file_enable_trace(Acr_File *afp); -public void acr_file_disable_trace(Acr_File *afp); -public Acr_File *acr_file_initialize(void *io_data, +extern void acr_file_enable_trace(Acr_File *afp); +extern void acr_file_disable_trace(Acr_File *afp); +extern Acr_File *acr_file_initialize(void *io_data, int maxlength, Acr_Io_Routine io_routine); -public void acr_file_free(Acr_File *afp); -public void acr_file_reset(Acr_File *afp); -public void acr_file_set_ismore_function(Acr_File *afp, +extern void acr_file_free(Acr_File *afp); +extern void acr_file_reset(Acr_File *afp); +extern void acr_file_set_ismore_function(Acr_File *afp, Acr_Ismore_Function ismore_function); -public void acr_file_set_eof(Acr_File *afp); -public void acr_file_set_client_data(Acr_File *afp, void *client_data); -public void *acr_file_get_client_data(Acr_File *afp); -public int acr_file_read_more(Acr_File *afp); -public int acr_file_write_more(Acr_File *afp, int character); -public int acr_file_flush(Acr_File *afp); -public int acr_ungetc(int c, Acr_File *afp); -public void *acr_file_get_io_data(Acr_File *afp); -public void acr_set_io_watchpoint(Acr_File *afp, long bytes_to_watchpoint); -public long acr_get_io_watchpoint(Acr_File *afp); -public int acr_file_ismore(Acr_File *afp); -public int acr_stdio_read(void *io_data, void *buffer, int nbytes); -public int acr_stdio_write(void *io_data, void *buffer, int nbytes); -public int acr_stdio_ismore(void *io_data); +extern void acr_file_set_eof(Acr_File *afp); +extern void acr_file_set_client_data(Acr_File *afp, void *client_data); +extern void *acr_file_get_client_data(Acr_File *afp); +extern int acr_file_read_more(Acr_File *afp); +extern int acr_file_write_more(Acr_File *afp, int character); +extern int acr_file_flush(Acr_File *afp); +extern int acr_ungetc(int c, Acr_File *afp); +extern void *acr_file_get_io_data(Acr_File *afp); +extern void acr_set_io_watchpoint(Acr_File *afp, long bytes_to_watchpoint); +extern long acr_get_io_watchpoint(Acr_File *afp); +extern int acr_file_ismore(Acr_File *afp); +extern int acr_stdio_read(void *io_data, void *buffer, int nbytes); +extern int acr_stdio_write(void *io_data, void *buffer, int nbytes); +extern int acr_stdio_ismore(void *io_data);
--- a/conversion/Acr_nema/acr_nema/group.h +++ b/conversion/Acr_nema/acr_nema/group.h @@ -6,7 +6,10 @@ @CREATED : November 10, 1993 (Peter Neelin) @MODIFIED : * $Log: group.h,v $ - * Revision 6.3 2001-11-08 14:17:06 neelin + * Revision 6.4 2005-03-04 00:08:08 bert + * Cleanup headers, mostly by getting rid of the infernal 'public' and using extern instead + * + * Revision 6.3 2001/11/08 14:17:06 neelin * Added acr_test_dicom_file to allow reading of DICOM part 10 format * files. This function also calls acr_test_byte_order to set up the stream * properly and can be used as a direct replacement for that function. @@ -72,6 +75,9 @@ express or implied warranty. ---------------------------------------------------------------------------- */ +#ifndef _ACR_GROUP_H_ +#define _ACR_GROUP_H_ 1 + /* Group type */ typedef struct Acr_Group { int group_id; @@ -87,51 +93,56 @@ #define ACR_EID_GRPLEN 0 /* Functions */ -public Acr_Group acr_create_group(int group_id); -public void acr_delete_group(Acr_Group group); -public void acr_delete_group_list(Acr_Group group_list); -public Acr_Group acr_copy_group(Acr_Group group); -public Acr_Group acr_copy_group_list(Acr_Group group_list); -public void acr_group_insert_element(Acr_Group group, - Acr_Element element); -public void acr_group_add_element(Acr_Group group, Acr_Element element); -public void acr_group_remove_element(Acr_Group group, int element_id); -public void acr_group_steal_element(Acr_Group group, Acr_Element element); -public void acr_set_group_next(Acr_Group group, Acr_Group next); -public int acr_get_group_group(Acr_Group group); -public Acr_Element acr_get_group_element_list(Acr_Group group); -public long acr_get_group_total_length(Acr_Group group, +extern Acr_Group acr_create_group(int group_id); +extern void acr_delete_group(Acr_Group group); +extern void acr_delete_group_list(Acr_Group group_list); +extern Acr_Group acr_copy_group(Acr_Group group); +extern Acr_Group acr_copy_group_list(Acr_Group group_list); +extern Acr_Status acr_group_insert_element(Acr_Group group, + Acr_Element element); +extern Acr_Status acr_group_add_element(Acr_Group group, Acr_Element element); +extern void acr_group_remove_element(Acr_Group group, int element_id); +extern void acr_group_steal_element(Acr_Group group, Acr_Element element); +extern void acr_set_group_next(Acr_Group group, Acr_Group next); +extern int acr_get_group_group(Acr_Group group); +extern Acr_Element acr_get_group_element_list(Acr_Group group); +extern long acr_get_group_total_length(Acr_Group group, Acr_VR_encoding_type vr_encoding); -public int acr_get_group_nelements(Acr_Group group); -public Acr_Group acr_get_group_next(Acr_Group group); -public Acr_Status acr_input_group(Acr_File *afp, Acr_Group *group); -public Acr_Status acr_output_group(Acr_File *afp, Acr_Group group); -public Acr_Status acr_input_group_list(Acr_File *afp, Acr_Group *group_list, +extern int acr_get_group_nelements(Acr_Group group); +extern Acr_Group acr_get_group_next(Acr_Group group); +extern Acr_Status acr_input_group(Acr_File *afp, Acr_Group *group); +extern Acr_Status acr_output_group(Acr_File *afp, Acr_Group group); +extern Acr_Status acr_input_group_list(Acr_File *afp, Acr_Group *group_list, int max_group_id); -public Acr_Group acr_find_group(Acr_Group group_list, int group_id); -public Acr_Element acr_find_group_element(Acr_Group group_list, +extern Acr_Group acr_find_group(Acr_Group group_list, int group_id); +extern Acr_Element acr_find_group_element(Acr_Group group_list, Acr_Element_Id elid); -public void acr_dump_group_list(FILE *file_pointer, Acr_Group group_list); -public int acr_find_short(Acr_Group group_list, Acr_Element_Id elid, +extern void acr_dump_group_list(FILE *file_pointer, Acr_Group group_list); +extern int acr_find_short(Acr_Group group_list, Acr_Element_Id elid, int default_value); -public long acr_find_long(Acr_Group group_list, Acr_Element_Id elid, +extern long acr_find_long(Acr_Group group_list, Acr_Element_Id elid, long default_value); -public int acr_find_int(Acr_Group group_list, Acr_Element_Id elid, +extern int acr_find_int(Acr_Group group_list, Acr_Element_Id elid, int default_value); -public double acr_find_double(Acr_Group group_list, Acr_Element_Id elid, +extern double acr_find_double(Acr_Group group_list, Acr_Element_Id elid, double default_value); -public char *acr_find_string(Acr_Group group_list, Acr_Element_Id elid, +extern char *acr_find_string(Acr_Group group_list, Acr_Element_Id elid, char *default_value); -public void acr_insert_element_into_group_list(Acr_Group *group_list, - Acr_Element element); -public void acr_insert_short(Acr_Group *group_list, Acr_Element_Id elid, +extern Acr_Status acr_insert_element_into_group_list(Acr_Group *group_list, + Acr_Element element); +extern Acr_Status acr_insert_short(Acr_Group *group_list, Acr_Element_Id elid, int value); -public void acr_insert_long(Acr_Group *group_list, Acr_Element_Id elid, +extern Acr_Status acr_insert_long(Acr_Group *group_list, Acr_Element_Id elid, long value); -public void acr_insert_numeric(Acr_Group *group_list, Acr_Element_Id elid, - double value); -public void acr_insert_string(Acr_Group *group_list, Acr_Element_Id elid, - char *value); -public void acr_insert_sequence(Acr_Group *group_list, Acr_Element_Id elid, - Acr_Element itemlist); -public Acr_Status acr_test_dicom_file(Acr_File *afp); +extern Acr_Status acr_insert_numeric(Acr_Group *group_list, + Acr_Element_Id elid, + double value); +extern Acr_Status acr_insert_string(Acr_Group *group_list, + Acr_Element_Id elid, + char *value); +extern Acr_Status acr_insert_sequence(Acr_Group *group_list, + Acr_Element_Id elid, + Acr_Element itemlist); +extern Acr_Status acr_test_dicom_file(Acr_File *afp); + +#endif /* _ACR_GROUP_H_ */
--- a/conversion/Acr_nema/acr_nema/value_repr.h +++ b/conversion/Acr_nema/acr_nema/value_repr.h @@ -6,7 +6,10 @@ @CREATED : January 31, 1997 (Peter Neelin) @MODIFIED : * $Log: value_repr.h,v $ - * Revision 6.2 2000-08-16 15:53:46 neelin + * Revision 6.3 2005-03-04 00:08:08 bert + * Cleanup headers, mostly by getting rid of the infernal 'public' and using extern instead + * + * Revision 6.2 2000/08/16 15:53:46 neelin * Added VR type UN (unknown) which has a length field similar to OB. * * Revision 6.1 1999/10/29 17:51:55 neelin @@ -70,12 +73,12 @@ } Acr_VR_Type; /* Function prototypes */ -public char *acr_get_vr_name(Acr_VR_Type vr_code); -public int acr_test_vr_name(char *vr_name); -public Acr_VR_Type acr_lookup_vr_name(char *vr_name); -public double acr_get_numeric_vr(Acr_VR_Type vr_code, +extern char *acr_get_vr_name(Acr_VR_Type vr_code); +extern int acr_test_vr_name(char *vr_name); +extern Acr_VR_Type acr_lookup_vr_name(char *vr_name); +extern double acr_get_numeric_vr(Acr_VR_Type vr_code, Acr_byte_order byte_order, char *data, long data_length); -public char *acr_get_string_vr(Acr_VR_Type vr_code, +extern char *acr_get_string_vr(Acr_VR_Type vr_code, Acr_byte_order byte_order, char *data, long data_length);