Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/pure-cfg/src/lib/common/image.c
ViewVC logotype

Diff of /branches/pure-cfg/src/lib/common/image.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1363, Wed Jun 22 17:03:17 2011 UTC revision 1364, Wed Jun 22 17:08:47 2011 UTC
# Line 349  Line 349 
349      img->dim = 1;      img->dim = 1;
350      img->size[0] = nin->axis[base+0].size;      img->size[0] = nin->axis[base+0].size;
351      img->data = nin->data;      img->data = nin->data;
352  // FIXME: this code probably only works for scalar images      img->dataSzb =  nrrdElementSize(nin) * nrrdElementNumber(nin);
     img->dataSzb =  nrrdElementSize(nin) * nrrdElementNumber(nin) * img->size[0];  
353    
354  //printf("LoadImage \"%s\": space dim = 1, axes = <%d>\n",  //printf("LoadImage \"%s\": space dim = 1, axes = <%d>\n",
355  //name, img->size[base+0]);  //name, img->size[base+0]);
# Line 393  Line 392 
392      img->size[0] = nin->axis[base+0].size;      img->size[0] = nin->axis[base+0].size;
393      img->size[1] = nin->axis[base+1].size;      img->size[1] = nin->axis[base+1].size;
394      img->data = nin->data;      img->data = nin->data;
395  // FIXME: this code probably only works for scalar images      img->dataSzb =  nrrdElementSize(nin) * nrrdElementNumber(nin);
     img->dataSzb = nrrdElementSize(nin) * nrrdElementNumber(nin) * img->size[0] * img->size[1];  
396    
397  //printf("LoadImage \"%s\": space dim = 2, axes = <%d, %d>\n",  //printf("LoadImage \"%s\": space dim = 2, axes = <%d, %d>\n",
398  //name, img->size[0], img->size[1]);  //name, img->size[0], img->size[1]);
# Line 457  Line 455 
455      img->size[1] = nin->axis[base+1].size;      img->size[1] = nin->axis[base+1].size;
456      img->size[2] = nin->axis[base+2].size;      img->size[2] = nin->axis[base+2].size;
457      img->data = nin->data;      img->data = nin->data;
458  // FIXME: this code probably only works for scalar images      img->dataSzb =  nrrdElementSize(nin) * nrrdElementNumber(nin);
     img->dataSzb = nrrdElementSize(nin) * nrrdElementNumber(nin) * img->size[0] * img->size[1] * img->size[2];  
459    
460  //printf("LoadImage \"%s\": space dim = 3, axes = <%d, %d, %d>\n",  //printf("LoadImage \"%s\": space dim = 3, axes = <%d, %d, %d>\n",
461  //name, img->size[0], img->size[1], img->size[2]);  //name, img->size[0], img->size[1], img->size[2]);

Legend:
Removed from v.1363  
changed lines
  Added in v.1364

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0