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

SCM Repository

[diderot] Diff of /branches/vis12/src/lib/common/image.c
ViewVC logotype

Diff of /branches/vis12/src/lib/common/image.c

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

revision 2032, Fri Oct 12 01:55:56 2012 UTC revision 2033, Fri Oct 12 03:05:33 2012 UTC
# Line 287  Line 287 
287  #undef I  #undef I
288  }  }
289    
290  static Nrrd *LoadNrrdFile (WorldPrefix_t *wrld, const char *filename)  static Nrrd *Diderot_LoadNrrdFile (WorldPrefix_t *wrld, const char *filename)
291  {  {
292    /* create a nrrd; at this point this is just an empty container */    /* create a nrrd; at this point this is just an empty container */
293      Nrrd *nin = nrrdNew();      Nrrd *nin = nrrdNew();
# Line 351  Line 351 
351  /* load image data from Nrrd files */  /* load image data from Nrrd files */
352  Status_t Diderot_LoadImage1D (WorldPrefix_t *wrld, Diderot_string_t name, Diderot_image1D_t **imgOut)  Status_t Diderot_LoadImage1D (WorldPrefix_t *wrld, Diderot_string_t name, Diderot_image1D_t **imgOut)
353  {  {
354      Nrrd *nin = LoadNrrdFile (wrld, name);      Nrrd *nin = Diderot_LoadNrrdFile (wrld, name);
355      if (nin == 0)      if (nin == 0)
356          return DIDEROT_FAIL;          return DIDEROT_FAIL;
357      else      else
# Line 426  Line 426 
426  /* load image data from Nrrd files */  /* load image data from Nrrd files */
427  Status_t Diderot_LoadImage2D (WorldPrefix_t *wrld, Diderot_string_t name, Diderot_image2D_t **imgOut)  Status_t Diderot_LoadImage2D (WorldPrefix_t *wrld, Diderot_string_t name, Diderot_image2D_t **imgOut)
428  {  {
429      Nrrd *nin = LoadNrrdFile (wrld, name);      Nrrd *nin = Diderot_LoadNrrdFile (wrld, name);
430      if (nin == 0)      if (nin == 0)
431          return DIDEROT_FAIL;          return DIDEROT_FAIL;
432      else      else
# Line 503  Line 503 
503  /* load image data from Nrrd files */  /* load image data from Nrrd files */
504  Status_t Diderot_LoadImage3D (WorldPrefix_t *wrld, Diderot_string_t name, Diderot_image3D_t **imgOut)  Status_t Diderot_LoadImage3D (WorldPrefix_t *wrld, Diderot_string_t name, Diderot_image3D_t **imgOut)
505  {  {
506      Nrrd *nin = LoadNrrdFile (wrld, name);      Nrrd *nin = Diderot_LoadNrrdFile (wrld, name);
507      if (nin == 0)      if (nin == 0)
508          return DIDEROT_FAIL;          return DIDEROT_FAIL;
509      else      else

Legend:
Removed from v.2032  
changed lines
  Added in v.2033

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