Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/metaImage.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ MetaImage::InitializeEssential(int _nDims,
m_ElementDirection[i*m_NDims+j] = 1;
}
}
}
}
}

if (_elementData != nullptr)
Expand Down Expand Up @@ -2475,7 +2475,7 @@ MetaImage::M_Read()
m_Offset[i] = mF->value[i];
}
}

mF = MET_GetFieldRecord("ElementDirection", &m_Fields);
if (mF && mF->defined)
{
Expand All @@ -2496,7 +2496,7 @@ MetaImage::M_Read()
m_ElementOrigin[i] = mF->value[i];
}
}

mF = MET_GetFieldRecord("ElementDirection", &m_Fields);
if (mF && mF->defined)
{
Expand Down
4 changes: 2 additions & 2 deletions src/metaImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ class METAIO_EXPORT MetaImage : public MetaObject
// direction that the fastest moving index in the image traverses in
// physical space while the last column defines the direction that the
// slowest moving index in the image traverses in physical space.
//
//
// Set the direction cosines of the image. The direction cosines
// are vectors that point from one pixel to the next.
//
Expand Down Expand Up @@ -438,7 +438,7 @@ class METAIO_EXPORT MetaImage : public MetaObject

double m_ElementOrigin[10]{}; // "ElementOrigin = " 0,0,0
double m_ElementDirection[100]{}; // "ElementDirection = " 1,0,0,0,1,0,0,0,1

bool m_AutoFreeElementData{};

void * m_ElementData{};
Expand Down
2 changes: 1 addition & 1 deletion src/metaObject.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1750,7 +1750,7 @@ MetaObject::M_Read()
++it;
continue;
}

// Don't add a read field to the write fields if it is already in the write fields
bool found = false;
FieldsContainerType::iterator dup;
Expand Down