better OV/OL handling

- we had the size set incorrectly
- improved byteswap rules
- version bump
- better frame data print

Author: jcupitt

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## master
 
+## 1.0.3, 7/10/23
+
+- improve handling of OV and OL [jcupitt]
+- better frame data print [jcupitt]
+
 ## 1.0.2, 5/10/23
 
 - fix a crash and some error pileups [bgilbert]

meson.build

@@ -8,7 +8,7 @@ project(
   ],
   license : 'MIT',
   meson_version : '>=0.50',
-  version : '1.0.2'
+  version : '1.0.3'
 )
 if not meson.is_subproject()
   meson.add_dist_script(

src/dicom-dict.c

@@ -101,8 +101,8 @@ static const struct _DcmVRTable vr_table[] = {
 
     {DCM_VR_UC, "UC", DCM_VR_CLASS_STRING_MULTI,       0, DCM_CAPACITY_UC, 4},
 
-    {DCM_VR_OL, "OL", DCM_VR_CLASS_BINARY,             0, 0,               4},
-    {DCM_VR_OV, "OV", DCM_VR_CLASS_BINARY,             0, 0,               4},
+    {DCM_VR_OL, "OL", DCM_VR_CLASS_BINARY,             4, 0,               4},
+    {DCM_VR_OV, "OV", DCM_VR_CLASS_BINARY,             8, 0,               4},
 
     {DCM_VR_SV, "SV", DCM_VR_CLASS_NUMERIC_INTEGER,    8, 0,               4},
     {DCM_VR_UV, "UV", DCM_VR_CLASS_NUMERIC_INTEGER,    8, 0,               4},

src/dicom-file.c

@@ -1446,7 +1446,7 @@ static bool print_pixeldata_create(DcmError **error,
 
     uint32_t n = MIN(16, length);
     for (uint32_t i = 0; i < n; i++) {
-        printf("%02x", value[i]);
+        printf("%02x", value[i] & 0xff);
 
         if (i % size == size - 1) {
             printf(" ");

src/dicom-parse.c

@@ -155,7 +155,7 @@ static bool is_big_endian(void)
 static void byteswap(char *data, size_t length, size_t size)
 {
     // only swap if the data is "swappable"
-    if (length >= size && length % size == 0) {
+    if (size > 0 && length >= size && length % size == 0) {
         size_t n_elements = length / size;
 
         switch (size) {
@@ -600,15 +600,15 @@ static bool parse_element_body(DcmParseState *state,
 
             // read to a static char buffer, if possible
             if ((int64_t) length + 1 >= INPUT_BUFFER_SIZE) {
-                value = value_free = DCM_MALLOC(state->error, (size_t) length + 1);
+                value = value_free = DCM_MALLOC(state->error,
+                                                (size_t) length + 1);
                 if (value == NULL) {
                     return false;
                 }
             } else {
                 value = input_buffer;
             }
 
-
             if (!dcm_require(state, value, length, position)) {
                 if (value_free != NULL) {
                     free(value_free);
@@ -625,11 +625,8 @@ static bool parse_element_body(DcmParseState *state,
                 }
             }
 
-            if (vr_class == DCM_VR_CLASS_NUMERIC_DECIMAL ||
-                vr_class == DCM_VR_CLASS_NUMERIC_INTEGER) {
-                if (state->big_endian) {
-                    byteswap(value, length, size);
-                }
+            if (size > 0 && state->big_endian) {
+                byteswap(value, length, size);
             }
 
             if (state->parse->element_create &&