Mercurial > hg > minc-tools

changeset 1638:ba30a5f7ff1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove MI_TYPE_CHAR, verify that chunk size doesn't exceeed dimension length
author bert <bert>
date Mon, 02 Feb 2004 01:31:25 +0000
parents b133acd05574
children 07ef123aef96
files libsrc2/volume.c
diffstat 1 files changed, 6 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/libsrc2/volume.c
+++ b/libsrc2/volume.c
@@ -20,8 +20,6 @@
 static void miread_valid_range(mihandle_t volume, double *valid_max, 
                                double *valid_min);
 
-void misave_valid_range(mihandle_t volume);
-
 /**
  */
 int
@@ -59,12 +57,8 @@
     
     dset_id = H5Dcreate(volume->hdf_id, "/minc-2.0/image/0/image", 
                         volume->type_id, 
-                        dataspace_id, H5P_DEFAULT); 
-			//volume->plist_id);
-    // Leila, changed the above to H5P_DEFAULT as volume 
-    // property list is seperately created and added to the volume
-    // IN FUNCTION micreate_volume : 
-    // hdf_plist = H5Pcreate(H5P_DATASET_CREATE);
+                        dataspace_id, 
+			volume->plist_id);
     if (dset_id < 0) {  
         return (MI_ERROR);
     }
@@ -255,8 +249,11 @@
           return (MI_ERROR);
       }
       
-      for (i=0; i < create_props->edge_count; i++) {
+      for (i=0; i < number_of_dimensions; i++) {
           hdf_size[i] = create_props->edge_lengths[i];
+          if (hdf_size[i] > dimensions[i]->length) {
+              hdf_size[i] = dimensions[i]->length;
+          }
       }
     
       /* Sets the size of the chunks used to store a chunked layout dataset */
@@ -420,9 +417,6 @@
   case MI_TYPE_BYTE:
     handle->volume_type = MI_TYPE_BYTE;
     break;
-  case MI_TYPE_CHAR:
-    handle->volume_type = MI_TYPE_CHAR;
-    break;
   case MI_TYPE_SHORT:
     handle->volume_type = MI_TYPE_SHORT;
     break;