[ismrmrd] 80/177: Added export statements to the C-API.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Jan 14 20:02:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to annotated tag v1.1.0.beta.1
in repository ismrmrd.
commit 6d2cf287845a2a2ebc977177af432acd44ab9a29
Author: Souheil Inati <souheil.inati at nih.gov>
Date: Mon Sep 22 13:06:03 2014 -0400
Added export statements to the C-API.
---
include/ismrmrd/dataset.h | 38 ++++++++++++++---------------
include/ismrmrd/ismrmrd.h | 62 +++++++++++++++++++++++------------------------
2 files changed, 49 insertions(+), 51 deletions(-)
diff --git a/include/ismrmrd/dataset.h b/include/ismrmrd/dataset.h
index 8e394a9..6b6de0a 100644
--- a/include/ismrmrd/dataset.h
+++ b/include/ismrmrd/dataset.h
@@ -39,19 +39,19 @@ typedef struct ISMRMRD_Dataset {
* Initializes an ISMRMRD dataset structure
*
*/
-int ismrmrd_init_dataset(ISMRMRD_Dataset *dset, const char *filename, const char *groupname);
+EXPORTISMRMRD int ismrmrd_init_dataset(ISMRMRD_Dataset *dset, const char *filename, const char *groupname);
/**
* Opens an ISMRMRD dataset.
*
*/
-int ismrmrd_open_dataset(ISMRMRD_Dataset *dset, const bool create_if_neded);
+EXPORTISMRMRD int ismrmrd_open_dataset(ISMRMRD_Dataset *dset, const bool create_if_neded);
/**
* Closes all references to the underlying HDF5 file.
*
*/
-int ismrmrd_close_dataset(ISMRMRD_Dataset *dset);
+EXPORTISMRMRD int ismrmrd_close_dataset(ISMRMRD_Dataset *dset);
/**
* Writes the XML header string to the dataset.
@@ -59,7 +59,7 @@ int ismrmrd_close_dataset(ISMRMRD_Dataset *dset);
* @warning There is no check of whether the string is a valid XML document at this point.
*
*/
-int ismrmrd_write_header(const ISMRMRD_Dataset *dset, const char *xmlstring);
+EXPORTISMRMRD int ismrmrd_write_header(const ISMRMRD_Dataset *dset, const char *xmlstring);
/**
* Reads the XML configuration header from the dataset.
@@ -67,24 +67,24 @@ int ismrmrd_write_header(const ISMRMRD_Dataset *dset, const char *xmlstring);
* @warning There is no check of whether the string is a valid XML document at this point.
*
*/
-char * ismrmrd_read_header(const ISMRMRD_Dataset *dset);
+EXPORTISMRMRD char * ismrmrd_read_header(const ISMRMRD_Dataset *dset);
/**
* Appends and NMR/MRI acquisition to the dataset.
*
* Please consult @See ISMRMRD_Acquisition struct for details.
*/
-int ismrmrd_append_acquisition(const ISMRMRD_Dataset *dset, const ISMRMRD_Acquisition *acq);
+EXPORTISMRMRD int ismrmrd_append_acquisition(const ISMRMRD_Dataset *dset, const ISMRMRD_Acquisition *acq);
/**
* Reads the acquisition with the specified index from the dataset.
*/
-int ismrmrd_read_acquisition(const ISMRMRD_Dataset *dset, uint32_t index, ISMRMRD_Acquisition *acq);
+EXPORTISMRMRD int ismrmrd_read_acquisition(const ISMRMRD_Dataset *dset, uint32_t index, ISMRMRD_Acquisition *acq);
/**
* Return the number of acquisitions in the dataset.
*/
-uint32_t ismrmrd_get_number_of_acquisitions(const ISMRMRD_Dataset *dset);
+EXPORTISMRMRD uint32_t ismrmrd_get_number_of_acquisitions(const ISMRMRD_Dataset *dset);
/**
* Appends an Image to the variable named varname in the dataset.
@@ -101,20 +101,20 @@ uint32_t ismrmrd_get_number_of_acquisitions(const ISMRMRD_Dataset *dset);
* Method 2: Images of different sizes can be appended individually.
*
*/
-int ismrmrd_append_image(const ISMRMRD_Dataset *dset, const char *varname,
- const int block_mode, const ISMRMRD_Image *im);
+EXPORTISMRMRD int ismrmrd_append_image(const ISMRMRD_Dataset *dset, const char *varname,
+ const int block_mode, const ISMRMRD_Image *im);
/**
* Reads an image stored with appendImage.
* The index indicates which image to read from the variable named varname.
*/
-int ismrmrd_read_image(const ISMRMRD_Dataset *dset, const char *varname,
- const uint32_t index, ISMRMRD_Image *im);
+EXPORTISMRMRD int ismrmrd_read_image(const ISMRMRD_Dataset *dset, const char *varname,
+ const uint32_t index, ISMRMRD_Image *im);
/**
* Return the number of images in the variable varname in the dataset.
*/
-uint32_t ismrmrd_get_number_of_images(const ISMRMRD_Dataset *dset, const char *varname);
+EXPORTISMRMRD uint32_t ismrmrd_get_number_of_images(const ISMRMRD_Dataset *dset, const char *varname);
/**
* Appends an NDArray to the variable named varname in the dataset.
@@ -130,19 +130,19 @@ uint32_t ismrmrd_get_number_of_images(const ISMRMRD_Dataset *dset, const char *v
* Method 2:Arrays of varying dimensionality and size can be appended as blobs of data.
*
*/
-int ismrmrd_append_array(const ISMRMRD_Dataset *dset, const char *varname,
- const int block_mode, const ISMRMRD_NDArray *arr);
+EXPORTISMRMRD int ismrmrd_append_array(const ISMRMRD_Dataset *dset, const char *varname,
+ const int block_mode, const ISMRMRD_NDArray *arr);
/**
* Reads an array from the data file.
*/
-int ismrmrd_read_array(const ISMRMRD_Dataset *dataset, const char *varname,
- const uint32_t index, ISMRMRD_NDArray *arr);
+EXPORTISMRMRD int ismrmrd_read_array(const ISMRMRD_Dataset *dataset, const char *varname,
+ const uint32_t index, ISMRMRD_NDArray *arr);
/**
* Return the number of arrays in the variable varname in the dataset.
*/
-uint32_t ismrmrd_get_number_of_arrays(const ISMRMRD_Dataset *dset, const char *varname);
+EXPORTISMRMRD uint32_t ismrmrd_get_number_of_arrays(const ISMRMRD_Dataset *dset, const char *varname);
#ifdef __cplusplus
@@ -152,8 +152,6 @@ uint32_t ismrmrd_get_number_of_arrays(const ISMRMRD_Dataset *dset, const char *v
// ISMRMRD Datset C++ Interface
//
-// TODO:
-// - exports as needed
class EXPORTISMRMRD Dataset {
public:
// Constructor and destructor
diff --git a/include/ismrmrd/ismrmrd.h b/include/ismrmrd/ismrmrd.h
index 45641c2..23bf656 100644
--- a/include/ismrmrd/ismrmrd.h
+++ b/include/ismrmrd/ismrmrd.h
@@ -233,7 +233,7 @@ typedef struct ISMRMRD_AcquisitionHeader {
} ISMRMRD_AcquisitionHeader;
/* Initialize an Acquisition Header */
-void ismrmrd_init_acquisition_header(ISMRMRD_AcquisitionHeader *hdr);
+EXPORTISMRMRD void ismrmrd_init_acquisition_header(ISMRMRD_AcquisitionHeader *hdr);
/**
Individual MR acquisition.
@@ -244,14 +244,14 @@ typedef struct ISMRMRD_Acquisition {
complex_float_t *data;
} ISMRMRD_Acquisition;
-ISMRMRD_Acquisition * ismrmrd_create_acquisition();
-void ismrmrd_free_acquisition(ISMRMRD_Acquisition *acq);
-void ismrmrd_init_acquisition(ISMRMRD_Acquisition *acq);
-void ismrmrd_cleanup_acquisition(ISMRMRD_Acquisition *acq);
-void ismrmrd_copy_acquisition(ISMRMRD_Acquisition *acqdest, const ISMRMRD_Acquisition *acqsource);
-int ismrmrd_make_consistent_acquisition(ISMRMRD_Acquisition *acq);
-size_t ismrmrd_size_of_acquisition_traj(const ISMRMRD_Acquisition *acq);
-size_t ismrmrd_size_of_acquisition_data(const ISMRMRD_Acquisition *acq);
+EXPORTISMRMRD ISMRMRD_Acquisition * ismrmrd_create_acquisition();
+EXPORTISMRMRD void ismrmrd_free_acquisition(ISMRMRD_Acquisition *acq);
+EXPORTISMRMRD void ismrmrd_init_acquisition(ISMRMRD_Acquisition *acq);
+EXPORTISMRMRD void ismrmrd_cleanup_acquisition(ISMRMRD_Acquisition *acq);
+EXPORTISMRMRD void ismrmrd_copy_acquisition(ISMRMRD_Acquisition *acqdest, const ISMRMRD_Acquisition *acqsource);
+EXPORTISMRMRD int ismrmrd_make_consistent_acquisition(ISMRMRD_Acquisition *acq);
+EXPORTISMRMRD size_t ismrmrd_size_of_acquisition_traj(const ISMRMRD_Acquisition *acq);
+EXPORTISMRMRD size_t ismrmrd_size_of_acquisition_data(const ISMRMRD_Acquisition *acq);
/**********/
/* Images */
@@ -289,7 +289,7 @@ typedef struct ISMRMRD_ImageHeader {
uint32_t attribute_string_len; /**< Length of attributes string */
} ISMRMRD_ImageHeader;
-void ismrmrd_init_image_header(ISMRMRD_ImageHeader *hdr);
+EXPORTISMRMRD void ismrmrd_init_image_header(ISMRMRD_ImageHeader *hdr);
/**
* An individual Image
@@ -301,14 +301,14 @@ typedef struct ISMRMRD_Image {
} ISMRMRD_Image;
-ISMRMRD_Image * ismrmrd_create_image();
-void ismrmrd_free_image(ISMRMRD_Image *im);
-void ismrmrd_init_image(ISMRMRD_Image *im);
-void ismrmrd_cleanup_image(ISMRMRD_Image *im);
-void ismrmrd_copy_image(ISMRMRD_Image *imdest, const ISMRMRD_Image *imsource);
-int ismrmrd_make_consistent_image(ISMRMRD_Image *im);
-size_t ismrmrd_size_of_image_attribute_string(const ISMRMRD_Image *im);
-size_t ismrmrd_size_of_image_data(const ISMRMRD_Image *im);
+EXPORTISMRMRD ISMRMRD_Image * ismrmrd_create_image();
+EXPORTISMRMRD void ismrmrd_free_image(ISMRMRD_Image *im);
+EXPORTISMRMRD void ismrmrd_init_image(ISMRMRD_Image *im);
+EXPORTISMRMRD void ismrmrd_cleanup_image(ISMRMRD_Image *im);
+EXPORTISMRMRD void ismrmrd_copy_image(ISMRMRD_Image *imdest, const ISMRMRD_Image *imsource);
+EXPORTISMRMRD int ismrmrd_make_consistent_image(ISMRMRD_Image *im);
+EXPORTISMRMRD size_t ismrmrd_size_of_image_attribute_string(const ISMRMRD_Image *im);
+EXPORTISMRMRD size_t ismrmrd_size_of_image_data(const ISMRMRD_Image *im);
/************/
/* NDArrays */
@@ -325,21 +325,21 @@ typedef struct ISMRMRD_NDArray {
void *data; /**< Pointer to data */
} ISMRMRD_NDArray;
-ISMRMRD_NDArray * ismrmrd_create_ndarray();
-void ismrmrd_free_ndarray(ISMRMRD_NDArray *arr);
-void ismrmrd_init_ndarray(ISMRMRD_NDArray *arr);
-void ismrmrd_cleanup_ndarray(ISMRMRD_NDArray *arr);
-void ismrmrd_copy_ndarray(ISMRMRD_NDArray *arrdest, const ISMRMRD_NDArray *arrsource);
-int ismrmrd_make_consistent_ndarray(ISMRMRD_NDArray *arr);
-size_t ismrmrd_size_of_ndarray_data(const ISMRMRD_NDArray *arr);
+EXPORTISMRMRD ISMRMRD_NDArray * ismrmrd_create_ndarray();
+EXPORTISMRMRD void ismrmrd_free_ndarray(ISMRMRD_NDArray *arr);
+EXPORTISMRMRD void ismrmrd_init_ndarray(ISMRMRD_NDArray *arr);
+EXPORTISMRMRD void ismrmrd_cleanup_ndarray(ISMRMRD_NDArray *arr);
+EXPORTISMRMRD void ismrmrd_copy_ndarray(ISMRMRD_NDArray *arrdest, const ISMRMRD_NDArray *arrsource);
+EXPORTISMRMRD int ismrmrd_make_consistent_ndarray(ISMRMRD_NDArray *arr);
+EXPORTISMRMRD size_t ismrmrd_size_of_ndarray_data(const ISMRMRD_NDArray *arr);
/*********/
/* Flags */
/*********/
-bool ismrmrd_is_flag_set(const uint64_t flags, const uint64_t val);
-void ismrmrd_set_flag(uint64_t *flags, const uint64_t val);
-void ismrmrd_clear_flag(uint64_t *flags, const uint64_t val);
-void ismrmrd_clear_all_flags(uint64_t *flags);
+EXPORTISMRMRD bool ismrmrd_is_flag_set(const uint64_t flags, const uint64_t val);
+EXPORTISMRMRD void ismrmrd_set_flag(uint64_t *flags, const uint64_t val);
+EXPORTISMRMRD void ismrmrd_clear_flag(uint64_t *flags, const uint64_t val);
+EXPORTISMRMRD void ismrmrd_clear_all_flags(uint64_t *flags);
/* TODO add helper functions for channel mask */
@@ -350,8 +350,8 @@ typedef void (*ismrmrd_error_handler_t)(const char *file, int line, const char *
extern ismrmrd_error_handler_t ismrmrd_error_handler;
#define ISMRMRD_THROW(err, msg) ismrmrd_error_handler(__FILE__, __LINE__, __func__, (err), (msg))
-void ismrmrd_set_error_handler(ismrmrd_error_handler_t);
-char *ismrmrd_strerror(int err);
+EXPORTISMRMRD void ismrmrd_set_error_handler(ismrmrd_error_handler_t);
+EXPORTISMRMRD char *ismrmrd_strerror(int err);
/*****************************/
/* Rotations and Quaternions */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git
More information about the debian-science-commits
mailing list