Skip to content

Commit 9bff18c

Browse files
committed
version bump, changelog, remove an if()
1 parent fae3db0 commit 9bff18c

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
## master
22

3-
## 1.0.4, 9./10/23
3+
## 1.0.5, 9/10/23
4+
5+
* fix a strict aliasing issue [bgilbert]
6+
7+
## 1.0.4, 9/10/23
48

59
* change default buildtype to debugoptimized [jcupitt]
610
* fix readthedocs integration [jcupitt]

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ project(
1010
],
1111
license : 'MIT',
1212
meson_version : '>=0.50',
13-
version : '1.0.4'
13+
version : '1.0.5'
1414
)
1515
if not meson.is_subproject()
1616
meson.add_dist_script(

src/dicom-dict.c

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5160,10 +5160,7 @@ static const struct _DcmVRTable *vrtable_from_vr(const char *vr)
51605160

51615161
HASH_FIND_STR(vrtable_from_str_dict, vr, entry);
51625162

5163-
if (entry == NULL) {
5164-
return NULL;
5165-
}
5166-
return &entry->table;
5163+
return (const struct _DcmVRTable *) entry;
51675164
}
51685165

51695166

@@ -5256,10 +5253,7 @@ static const struct _DcmAttribute *attribute_from_tag(uint32_t tag)
52565253

52575254
HASH_FIND_INT(attribute_from_tag_dict, &tag, entry);
52585255

5259-
if (entry == NULL) {
5260-
return NULL;
5261-
}
5262-
return &entry->attr;
5256+
return (const struct _DcmAttribute *) entry;
52635257
}
52645258

52655259

@@ -5357,10 +5351,7 @@ static const struct _DcmAttribute *attribute_from_keyword(const char *keyword)
53575351

53585352
HASH_FIND_STR(attribute_from_keyword_dict, keyword, entry);
53595353

5360-
if (entry == NULL) {
5361-
return NULL;
5362-
}
5363-
return &entry->attr;
5354+
return (const struct _DcmAttribute *) entry;
53645355
}
53655356

53665357

0 commit comments

Comments
 (0)