Merge pull request #90 from ImagingDataCommons/fix-trim

don't trim spaces from numeric fields
ImagingDataCommons · Sep 12, 2024 · 303fa85 · 303fa85
2 parents fc6b865 + eed6e48
commit 303fa85
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * fix build with uthash \< 2.3.0 [bgilbert]
 * explicitly fail if macOS universal build is attempted [bgilbert]
 * better handling of implicit mode in dcm-dump [jcupitt]
+* better handling of trailing spaces in string values [y-baba-isb]
 
 ## 1.1.0, 28/3/24
 

diff --git a/src/dicom-parse.c b/src/dicom-parse.c
@@ -616,12 +616,12 @@ static bool parse_element_body(DcmParseState *state,
             }
             value[length] = '\0';
 
-            if (length > 0) {
-                if (vr != DCM_VR_UI) {
-                    if (isspace(value[length - 1])) {
-                        value[length - 1] = '\0';
-                    }
-                }
+            if (length > 0 &&
+                (vr_class == DCM_VR_CLASS_STRING_SINGLE ||
+                 vr_class == DCM_VR_CLASS_STRING_MULTI) &&
+                vr != DCM_VR_UI &&
+                isspace(value[length - 1])) {
+                value[length - 1] = '\0';
             }
 
             if (size > 0 && state->big_endian) {