version bump, changelog, remove an if()

ImagingDataCommons · Oct 9, 2023 · 9bff18c · 9bff18c
1 parent fae3db0
commit 9bff18c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 ## master
 
-## 1.0.4, 9./10/23
+## 1.0.5, 9/10/23
+
+* fix a strict aliasing issue [bgilbert]
+
+## 1.0.4, 9/10/23
 
 * change default buildtype to debugoptimized [jcupitt]
 * fix readthedocs integration [jcupitt]

diff --git a/meson.build b/meson.build
@@ -10,7 +10,7 @@ project(
   ],
   license : 'MIT',
   meson_version : '>=0.50',
-  version : '1.0.4'
+  version : '1.0.5'
 )
 if not meson.is_subproject()
   meson.add_dist_script(

diff --git a/src/dicom-dict.c b/src/dicom-dict.c
@@ -5160,10 +5160,7 @@ static const struct _DcmVRTable *vrtable_from_vr(const char *vr)
 
     HASH_FIND_STR(vrtable_from_str_dict, vr, entry);
 
-    if (entry == NULL) {
-        return NULL;
-    }
-    return &entry->table;
+    return (const struct _DcmVRTable *) entry;
 }
 
 
@@ -5256,10 +5253,7 @@ static const struct _DcmAttribute *attribute_from_tag(uint32_t tag)
 
     HASH_FIND_INT(attribute_from_tag_dict, &tag, entry);
 
-    if (entry == NULL) {
-        return NULL;
-    }
-    return &entry->attr;
+    return (const struct _DcmAttribute *) entry;
 }
 
 
@@ -5357,10 +5351,7 @@ static const struct _DcmAttribute *attribute_from_keyword(const char *keyword)
 
     HASH_FIND_STR(attribute_from_keyword_dict, keyword, entry);
 
-    if (entry == NULL) {
-        return NULL;
-    }
-    return &entry->attr;
+    return (const struct _DcmAttribute *) entry;
 }