[ismrmrd] 141/177: Made c bits c89 compatible for windows visual studio compatibility.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Jan 14 20:02:12 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 6e5a91b6a0f0b1033fc2f5555e58abe9f7292356
Author: Souheil Inati <souheil.inati at nih.gov>
Date: Tue Oct 14 15:50:41 2014 -0400
Made c bits c89 compatible for windows visual studio compatibility.
---
CMakeLists.txt | 4 ++--
examples/c/main.c | 51 ++++++++++++++++++++++++-----------------------
include/ismrmrd/ismrmrd.h | 2 +-
include/version.in | 2 +-
libsrc/dataset.c | 2 +-
5 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86d1653..3ca9026 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ if (WIN32)
set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
add_definitions(-D__func__=__FUNCTION__)
else (WIN32)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -pedantic -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
endif (WIN32)
@@ -196,7 +196,7 @@ enable_testing()
# process subdirectories
add_subdirectory(doc)
-#add_subdirectory(examples/c)
+add_subdirectory(examples/c)
add_subdirectory(utilities)
#add_subdirectory(matlab)
#add_subdirectory(bindings)
diff --git a/examples/c/main.c b/examples/c/main.c
index 524f436..91cc68e 100644
--- a/examples/c/main.c
+++ b/examples/c/main.c
@@ -13,6 +13,22 @@ void myerror(const char *file, int line, const char *func, int code, const char
int main(void)
{
+
+ /* Declarations */
+ int nacq_write, n, k, c;
+ ISMRMRD_Dataset dataset1;
+ ISMRMRD_Acquisition acq, acq2, acq3;
+ ISMRMRD_Dataset dataset2;
+ char *xmlstring;
+ ISMRMRD_Image im;
+ uint32_t index;
+ uint64_t loc;
+ uint64_t nacq_read;
+ const char *filename = "myfile.h5";
+ const char *groupname = "/dataset";
+ const char *xmlhdr = "Yo! This is some text for the header.";
+ const char *attr_string = "Yo! This is some text for the attribute string.";
+
/* Set the error handler */
ismrmrd_set_error_handler(myerror);
@@ -20,30 +36,25 @@ int main(void)
/* New File */
/************/
/* Create a data set */
- ISMRMRD_Dataset dataset1;
- const char *filename = "myfile.h5";
- const char *groupname = "/dataset";
ismrmrd_init_dataset(&dataset1, filename, groupname);
ismrmrd_open_dataset(&dataset1, true);
/* Write an XML header */
- const char *xmlhdr = "Yo! This is some text for the header.";
ismrmrd_write_header(&dataset1, xmlhdr);
/* Append some acquisitions */
- ISMRMRD_Acquisition acq;
- // must initialize an acquisition before you can use it
+ /* must initialize an acquisition before you can use it */
ismrmrd_init_acquisition(&acq);
- int nacq_write = 5;
- for (int n=0; n < nacq_write; n++) {
- // must free an acquisition before you can reinitialize it
+ nacq_write = 5;
+ for (n=0; n < nacq_write; n++) {
+ /* must free an acquisition before you can reinitialize it */
ismrmrd_init_acquisition(&acq);
ismrmrd_init_acquisition(&acq);
acq.head.number_of_samples = 128;
acq.head.active_channels = 4;
ismrmrd_make_consistent_acquisition(&acq);
- for (int k=0; k<acq.head.number_of_samples; k++) {
- for (int c=0; c<acq.head.active_channels; c++) {
+ for (k=0; k<acq.head.number_of_samples; k++) {
+ for (c=0; c<acq.head.active_channels; c++) {
acq.data[k*acq.head.active_channels + c] = n + I*n;
}
}
@@ -63,22 +74,20 @@ int main(void)
/* Old File */
/************/
/* Reopen the file as a different dataset */
- ISMRMRD_Dataset dataset2;
ismrmrd_init_dataset(&dataset2, filename, groupname);
ismrmrd_open_dataset(&dataset2, false);
/* Read the header */
- char *xmlstring = ismrmrd_read_header(&dataset2);
+ xmlstring = ismrmrd_read_header(&dataset2);
printf("Header: %s\n", xmlstring);
/* Get the number of acquisitions */
- unsigned long nacq_read = ismrmrd_get_number_of_acquisitions(&dataset2);
+ nacq_read = ismrmrd_get_number_of_acquisitions(&dataset2);
printf("Number of Acquisitions: %lu\n", nacq_read);
/* read the next to last one */
- ISMRMRD_Acquisition acq2;
ismrmrd_init_acquisition(&acq2);
- uint32_t index = 0;
+ index = 0;
if (nacq_read>1) {
index = nacq_read - 1;
}
@@ -91,7 +100,6 @@ int main(void)
printf("Flags: %lu\n", acq2.head.flags);
printf("Data[4]: %f, %f\n", creal(acq2.data[4]), cimag(acq2.data[4]));
- ISMRMRD_Acquisition acq3;
ismrmrd_init_acquisition(&acq3);
ismrmrd_copy_acquisition(&acq3, &acq2);
@@ -99,7 +107,6 @@ int main(void)
printf("Data 3: %f\t 2: %f\n", creal(acq3.data[4]), creal(acq2.data[4]));
/* Create and store an image */
- ISMRMRD_Image im;
ismrmrd_init_image(&im);
im.head.data_type = ISMRMRD_FLOAT;
im.head.matrix_size[0] = 256;
@@ -107,7 +114,6 @@ int main(void)
im.head.matrix_size[2] = 4;
im.head.channels = 8;
/* Add an attribute string */
- const char *attr_string = "Yo! This is some text for the attribute string.";
im.head.attribute_string_len = strlen(attr_string);
ismrmrd_make_consistent_image(&im);
memcpy(im.attribute_string, attr_string, im.head.attribute_string_len);
@@ -116,7 +122,7 @@ int main(void)
printf("Image Version: %d\n", im.head.version);
printf("Image String: %s\n", im.attribute_string);
ismrmrd_append_image(&dataset2, "testimages", 1, &im);
- for (uint32_t loc=0; loc < 256*256*4*8; loc++) {
+ for (loc=0; loc < 256*256*4*8; loc++) {
((float*)im.data)[loc] = 2.0;
}
ismrmrd_append_image(&dataset2, "testimages", 1, &im);
@@ -131,10 +137,5 @@ int main(void)
/* Close the dataset */
ismrmrd_close_dataset(&dataset2);
- //NDArray arr;
- //initNDArray(&arr);
- //printf("Array ndim: %d\n", arr.ndim);
- //printf("Array dim[0]: %d\n", arr.dims[0]);
-
return 0;
}
diff --git a/include/ismrmrd/ismrmrd.h b/include/ismrmrd/ismrmrd.h
index 2bb5d09..12e4d63 100644
--- a/include/ismrmrd/ismrmrd.h
+++ b/include/ismrmrd/ismrmrd.h
@@ -120,7 +120,7 @@ enum ISMRMRD_DataTypes {
ISMRMRD_FLOAT = 5, /**< corresponds to float */
ISMRMRD_DOUBLE = 6, /**< corresponds to double */
ISMRMRD_CXFLOAT = 7, /**< corresponds to complex float */
- ISMRMRD_CXDOUBLE = 8, /**< corresponds to complex double */
+ ISMRMRD_CXDOUBLE = 8 /**< corresponds to complex double */
};
/**
diff --git a/include/version.in b/include/version.in
index 9cffb10..5239d4f 100644
--- a/include/version.in
+++ b/include/version.in
@@ -7,4 +7,4 @@
#define ISMRMRD_XMLHDR_VERSION @ISMRMRD_VERSION_MINOR@
#define ISMRMRD_GIT_SHA1_HASH "@ISMRMRD_GIT_SHA1@"
-#endif //ISMRMRD_VERSION_H
+#endif /* ISMRMRD_VERSION_H */
diff --git a/libsrc/dataset.c b/libsrc/dataset.c
index f04453e..b9b087e 100644
--- a/libsrc/dataset.c
+++ b/libsrc/dataset.c
@@ -1086,7 +1086,7 @@ int ismrmrd_append_image(const ISMRMRD_Dataset *dset, const char *varname,
free(path);
return ISMRMRD_NOERROR;
-};
+}
uint32_t ismrmrd_get_number_of_images(const ISMRMRD_Dataset *dset, const char *varname)
{
--
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