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

SCM Repository

[diderot] Diff of /branches/vis15/src/lib/include/diderot/image-inst.hxx
ViewVC logotype

Diff of /branches/vis15/src/lib/include/diderot/image-inst.hxx

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

revision 4525, Tue Sep 6 21:15:11 2016 UTC revision 4526, Tue Sep 6 22:23:02 2016 UTC
# Line 44  Line 44 
44      template <typename REAL, typename TY>      template <typename REAL, typename TY>
45      bool image1d<REAL,TY>::load (struct world_base *wrld, std::string const &name)      bool image1d<REAL,TY>::load (struct world_base *wrld, std::string const &name)
46      {      {
47          Nrrd *nin = wrld->load_nrrd_file (name, true);          Nrrd *nin = wrld->load_nrrd_file (name);
48          if (nin == nullptr)          if (nin == nullptr)
49              return true;              return true;
50          else {          else {
51              // normalize the meta-data first
52                if (wrld->normalize_nrrd_meta_data (nin)) {
53                    return true;
54                }
55              bool sts = this->load (wrld, nin);              bool sts = this->load (wrld, nin);
56              nrrdNix (nin);              nrrdNix (nin);
57              return sts;              return sts;
# Line 125  Line 129 
129      template <typename REAL, typename TY>      template <typename REAL, typename TY>
130      bool image2d<REAL,TY>::load (struct world_base *wrld, std::string const &name)      bool image2d<REAL,TY>::load (struct world_base *wrld, std::string const &name)
131      {      {
132          Nrrd *nin = wrld->load_nrrd_file (name, true);          Nrrd *nin = wrld->load_nrrd_file (name);
133          if (nin == nullptr)          if (nin == nullptr)
134              return true;              return true;
135          else {          else {
136              // normalize the meta-data first
137                if (wrld->normalize_nrrd_meta_data (nin)) {
138                    return true;
139                }
140              bool sts = this->load (wrld, nin);              bool sts = this->load (wrld, nin);
141              nrrdNix (nin);              nrrdNix (nin);
142              return sts;              return sts;
# Line 227  Line 235 
235      template <typename REAL, typename TY>      template <typename REAL, typename TY>
236      bool image3d<REAL,TY>::load (struct world_base *wrld, std::string const &name)      bool image3d<REAL,TY>::load (struct world_base *wrld, std::string const &name)
237      {      {
238          Nrrd *nin = wrld->load_nrrd_file (name, true);          Nrrd *nin = wrld->load_nrrd_file (name);
239          if (nin == nullptr)          if (nin == nullptr)
240              return true;              return true;
241          else {          else {
242              // normalize the meta-data first
243                if (wrld->normalize_nrrd_meta_data (nin)) {
244                    return true;
245                }
246              bool sts = this->load (wrld, nin);              bool sts = this->load (wrld, nin);
247              nrrdNix (nin);              nrrdNix (nin);
248              return sts;              return sts;

Legend:
Removed from v.4525  
changed lines
  Added in v.4526

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