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 1861, Sat Apr 21 15:30:26 2012 UTC revision 1862, Sun Apr 22 19:45:47 2012 UTC
# Line 292  Line 292 
292      char buf[1024];      char buf[1024];
293      va_list ap;      va_list ap;
294    
295    // NOTE: if there was a biffMsg function that worked with va_lists, then we
296    // could avoid the buffer
297      va_start (ap, fmt);      va_start (ap, fmt);
298      vsnprintf (buf, sizeof(buf), fmt, ap);      vsnprintf (buf, sizeof(buf), fmt, ap);
299      va_end (ap);      va_end (ap);
300    
301      wrld->err = NEWSTR(buf);      biffMsgAdd(wrld->errors, buf);
302  }  }
303    
304  static Nrrd *LoadNrrdFile (WorldPrefix_t *wrld, const char *filename)  static Nrrd *LoadNrrdFile (WorldPrefix_t *wrld, const char *filename)
# Line 306  Line 308 
308    
309    /* read in the nrrd from file */    /* read in the nrrd from file */
310      if (nrrdLoad(nin, filename, NULL) != 0) {      if (nrrdLoad(nin, filename, NULL) != 0) {
311          wrld->err = biffGetDone(NRRD);          char *msg = biffGetDone(NRRD);
312            biffMsgAdd(wrld->errors, msg);
313            FREE (msg);
314          return 0;          return 0;
315      }      }
316    

Legend:
Removed from v.1861  
changed lines
  Added in v.1862

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