WIP fix(image-sets-normalization): fallback to tag hex key if private…

… or empty
InsightSoftwareConsortium · Apr 4, 2024 · 35db8a3 · 35db8a3
1 parent 3d112e7
commit 35db8a3
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/packages/dicom/gdcm/image-sets-normalization.cxx b/packages/dicom/gdcm/image-sets-normalization.cxx
@@ -51,6 +51,9 @@
 
 std::string getLabelFromTag(const gdcm::Tag &tag, const gdcm::DataSet &dataSet)
 {
+  if (tag.IsPrivateCreator()) {
+    return tag.PrintAsContinuousUpperCaseString();
+  }
   std::string strowner;
   const char *owner = 0;
   if (tag.IsPrivate() && !tag.IsPrivateCreator())
@@ -61,7 +64,13 @@ std::string getLabelFromTag(const gdcm::Tag &tag, const gdcm::DataSet &dataSet)
   const gdcm::Global &g = gdcm::Global::GetInstance();
   const gdcm::Dicts &dicts = g.GetDicts();
   const gdcm::DictEntry &entry = dicts.GetDictEntry(tag, owner);
-  return entry.GetKeyword();
+  const std::string keyword = entry.GetKeyword();
+  if (keyword.empty())
+  {
+    // There are empty keywords in test/data/input/dicom-images/MR files
+    return tag.PrintAsContinuousUpperCaseString();
+  }
+  return keyword;
 }
 
 namespace gdcm