Skip to content

Commit 414dec5

Browse files
jcupittjcupitt
committed
rename DCM_CLASS_ as DCM_VR_CLASS_
1 parent b0a83a8 commit 414dec5

File tree

5 files changed

+89
-89
lines changed

5 files changed

+89
-89
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dcm-getframe -o tile.raw data/test_files/sm_image.dcm 12
3434

3535
There's a sample Python binding here:
3636

37-
https://github.com/ImagingDataCommons/pywsidicom
37+
https://github.com/ImagingDataCommons/pylibdicom
3838

3939
## Documentation
4040

‎include/dicom/dicom.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -446,31 +446,31 @@ typedef enum _DcmVR {
446446
/**
447447
* The general class of the value associated with a Value Representation.
448448
*
449-
* DCM_CLASS_STRING_MULTI -- one or more null-terminated strings, cannot
449+
* DCM_VR_CLASS_STRING_MULTI -- one or more null-terminated strings, cannot
450450
* contain backslash
451451
*
452-
* DCM_CLASS_STRING_SINGLE -- a single null-terminated string, backslash
452+
* DCM_VR_CLASS_STRING_SINGLE -- a single null-terminated string, backslash
453453
* allowed
454454
*
455-
* DCM_CLASS_NUMERIC_DECIMAL -- one or more binary floating point numeric
455+
* DCM_VR_CLASS_NUMERIC_DECIMAL -- one or more binary floating point numeric
456456
* values, other fields give sizeof(type)
457457
*
458-
* DCM_CLASS_NUMERIC_INTEGER -- one or more binary integer numeric
458+
* DCM_VR_CLASS_NUMERIC_INTEGER -- one or more binary integer numeric
459459
* values, other fields give sizeof(type)
460460
*
461-
* DCM_CLASS_BINARY -- an uninterpreted array of bytes, length in the
461+
* DCM_VR_CLASS_BINARY -- an uninterpreted array of bytes, length in the
462462
* element header
463463
*
464-
* DCM_CLASS_SEQUENCE -- Value Representation is a sequence
464+
* DCM_VR_CLASS_SEQUENCE -- Value Representation is a sequence
465465
*/
466466
typedef enum _DcmVRClass {
467-
DCM_CLASS_ERROR,
468-
DCM_CLASS_STRING_MULTI,
469-
DCM_CLASS_STRING_SINGLE,
470-
DCM_CLASS_NUMERIC_DECIMAL,
471-
DCM_CLASS_NUMERIC_INTEGER,
472-
DCM_CLASS_BINARY,
473-
DCM_CLASS_SEQUENCE
467+
DCM_VR_CLASS_ERROR,
468+
DCM_VR_CLASS_STRING_MULTI,
469+
DCM_VR_CLASS_STRING_SINGLE,
470+
DCM_VR_CLASS_NUMERIC_DECIMAL,
471+
DCM_VR_CLASS_NUMERIC_INTEGER,
472+
DCM_VR_CLASS_BINARY,
473+
DCM_VR_CLASS_SEQUENCE
474474
} DcmVRClass;
475475

476476
/**

‎src/dicom-data.c‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ static bool element_check_string(DcmError **error,
272272
const DcmElement *element)
273273
{
274274
DcmVRClass vr_class = dcm_dict_vr_class(element->vr);
275-
if (vr_class != DCM_CLASS_STRING_MULTI &&
276-
vr_class != DCM_CLASS_STRING_SINGLE) {
275+
if (vr_class != DCM_VR_CLASS_STRING_MULTI &&
276+
vr_class != DCM_VR_CLASS_STRING_SINGLE) {
277277
dcm_error_set(error, DCM_ERROR_CODE_INVALID,
278278
"Data Element is not string",
279279
"Element tag %08x has VR %s with no string value",
@@ -388,8 +388,8 @@ static bool dcm_element_validate(DcmError **error, DcmElement *element)
388388
return false;
389389
}
390390

391-
if (vr_class == DCM_CLASS_NUMERIC_DECIMAL ||
392-
vr_class == DCM_CLASS_NUMERIC_INTEGER) {
391+
if (vr_class == DCM_VR_CLASS_NUMERIC_DECIMAL ||
392+
vr_class == DCM_VR_CLASS_NUMERIC_INTEGER) {
393393
if (element->length != element->vm * dcm_dict_vr_size(element->vr)) {
394394
dcm_error_set(error, DCM_ERROR_CODE_INVALID,
395395
"Data Element validation failed",
@@ -399,8 +399,8 @@ static bool dcm_element_validate(DcmError **error, DcmElement *element)
399399
}
400400
}
401401

402-
if (vr_class == DCM_CLASS_STRING_MULTI ||
403-
vr_class == DCM_CLASS_STRING_SINGLE) {
402+
if (vr_class == DCM_VR_CLASS_STRING_MULTI ||
403+
vr_class == DCM_VR_CLASS_STRING_SINGLE) {
404404
uint32_t capacity = dcm_dict_vr_capacity(element->vr);
405405
if (!element_check_capacity(error, element, capacity)) {
406406
return false;
@@ -448,7 +448,7 @@ bool dcm_element_set_value_string_multi(DcmError **error,
448448
}
449449
} else {
450450
DcmVRClass vr_class = dcm_dict_vr_class(element->vr);
451-
if (vr_class != DCM_CLASS_STRING_MULTI) {
451+
if (vr_class != DCM_VR_CLASS_STRING_MULTI) {
452452
dcm_error_set(error, DCM_ERROR_CODE_INVALID,
453453
"Data Element is not multi-valued string",
454454
"Element tag %08x has VR %s with only a string value",
@@ -550,7 +550,7 @@ bool dcm_element_set_value_string(DcmError **error,
550550
}
551551

552552
DcmVRClass vr_class = dcm_dict_vr_class(element->vr);
553-
if (vr_class == DCM_CLASS_STRING_MULTI) {
553+
if (vr_class == DCM_VR_CLASS_STRING_MULTI) {
554554
uint32_t vm;
555555
char **values = dcm_parse_character_string(error, value, &vm);
556556
if (values == NULL) {
@@ -629,8 +629,8 @@ static bool element_check_numeric(DcmError **error,
629629
const DcmElement *element)
630630
{
631631
DcmVRClass vr_class = dcm_dict_vr_class(element->vr);
632-
if (vr_class != DCM_CLASS_NUMERIC_DECIMAL &&
633-
vr_class != DCM_CLASS_NUMERIC_INTEGER) {
632+
if (vr_class != DCM_VR_CLASS_NUMERIC_DECIMAL &&
633+
vr_class != DCM_VR_CLASS_NUMERIC_INTEGER) {
634634
dcm_error_set(error, DCM_ERROR_CODE_INVALID,
635635
"Data Element is not numeric",
636636
"Element tag %08x is not numeric",
@@ -850,7 +850,7 @@ static bool element_check_binary(DcmError **error,
850850
const DcmElement *element)
851851
{
852852
DcmVRClass vr_class = dcm_dict_vr_class(element->vr);
853-
if (vr_class != DCM_CLASS_BINARY) {
853+
if (vr_class != DCM_VR_CLASS_BINARY) {
854854
dcm_error_set(error, DCM_ERROR_CODE_INVALID,
855855
"Data Element is not binary",
856856
"Element tag %08x does not have a binary value",
@@ -929,15 +929,15 @@ bool dcm_element_set_value(DcmError **error,
929929
size_t size;
930930

931931
switch (dcm_dict_vr_class(element->vr)) {
932-
case DCM_CLASS_STRING_SINGLE:
933-
case DCM_CLASS_STRING_MULTI:
932+
case DCM_VR_CLASS_STRING_SINGLE:
933+
case DCM_VR_CLASS_STRING_MULTI:
934934
if (!dcm_element_set_value_string(error, element, value, steal)) {
935935
return false;
936936
}
937937
break;
938938

939-
case DCM_CLASS_NUMERIC_DECIMAL:
940-
case DCM_CLASS_NUMERIC_INTEGER:
939+
case DCM_VR_CLASS_NUMERIC_DECIMAL:
940+
case DCM_VR_CLASS_NUMERIC_INTEGER:
941941
size = dcm_dict_vr_size(element->vr);
942942
if (length % size != 0) {
943943
dcm_error_set(error, DCM_ERROR_CODE_PARSE,
@@ -954,7 +954,7 @@ bool dcm_element_set_value(DcmError **error,
954954
}
955955
break;
956956

957-
case DCM_CLASS_BINARY:
957+
case DCM_VR_CLASS_BINARY:
958958
if (!dcm_element_set_value_binary(error,
959959
element,
960960
value,
@@ -965,7 +965,7 @@ bool dcm_element_set_value(DcmError **error,
965965

966966
break;
967967

968-
case DCM_CLASS_SEQUENCE:
968+
case DCM_VR_CLASS_SEQUENCE:
969969
default:
970970
dcm_error_set(error, DCM_ERROR_CODE_PARSE,
971971
"Reading of Data Element failed",
@@ -983,7 +983,7 @@ static bool element_check_sequence(DcmError **error,
983983
const DcmElement *element)
984984
{
985985
DcmVRClass vr_class = dcm_dict_vr_class(element->vr);
986-
if (vr_class != DCM_CLASS_SEQUENCE) {
986+
if (vr_class != DCM_VR_CLASS_SEQUENCE) {
987987
dcm_error_set(error, DCM_ERROR_CODE_INVALID,
988988
"Data Element is not seeuence",
989989
"Element tag %08x does not have a seeuence value",
@@ -1063,7 +1063,7 @@ DcmElement *dcm_element_clone(DcmError **error, const DcmElement *element)
10631063

10641064
DcmVRClass vr_class = dcm_dict_vr_class(element->vr);
10651065
switch (vr_class) {
1066-
case DCM_CLASS_SEQUENCE:
1066+
case DCM_VR_CLASS_SEQUENCE:
10671067
if (!dcm_element_get_value_sequence(error, element, &from_seq)) {
10681068
dcm_element_destroy(clone);
10691069
return NULL;
@@ -1099,8 +1099,8 @@ DcmElement *dcm_element_clone(DcmError **error, const DcmElement *element)
10991099

11001100
break;
11011101

1102-
case DCM_CLASS_STRING_MULTI:
1103-
case DCM_CLASS_STRING_SINGLE:
1102+
case DCM_VR_CLASS_STRING_MULTI:
1103+
case DCM_VR_CLASS_STRING_SINGLE:
11041104
// all the string types
11051105
if (element->vm == 1 && element->value.single.str) {
11061106
clone->value.single.str = dcm_strdup(error,
@@ -1134,7 +1134,7 @@ DcmElement *dcm_element_clone(DcmError **error, const DcmElement *element)
11341134

11351135
break;
11361136

1137-
case DCM_CLASS_BINARY:
1137+
case DCM_VR_CLASS_BINARY:
11381138
if (element->value.single.bytes) {
11391139
clone->value.single.bytes = DCM_MALLOC(error, element->length);
11401140
if (clone->value.single.bytes == NULL) {
@@ -1149,8 +1149,8 @@ DcmElement *dcm_element_clone(DcmError **error, const DcmElement *element)
11491149
}
11501150
break;
11511151

1152-
case DCM_CLASS_NUMERIC_DECIMAL:
1153-
case DCM_CLASS_NUMERIC_INTEGER:
1152+
case DCM_VR_CLASS_NUMERIC_DECIMAL:
1153+
case DCM_VR_CLASS_NUMERIC_INTEGER:
11541154
if (element->vm == 1) {
11551155
clone->value = element->value;
11561156
clone->vm = 1;
@@ -1205,15 +1205,15 @@ char *dcm_element_value_to_string(const DcmElement *element)
12051205

12061206
for (uint32_t index = 0; index < element->vm; index++) {
12071207
switch (vr_class) {
1208-
case DCM_CLASS_NUMERIC_DECIMAL:
1208+
case DCM_VR_CLASS_NUMERIC_DECIMAL:
12091209
(void) dcm_element_get_value_decimal(NULL,
12101210
element,
12111211
index,
12121212
&d);
12131213
result = dcm_printf_append(result, "%g", d);
12141214
break;
12151215

1216-
case DCM_CLASS_NUMERIC_INTEGER:
1216+
case DCM_VR_CLASS_NUMERIC_INTEGER:
12171217
(void) dcm_element_get_value_integer(NULL,
12181218
element,
12191219
index,
@@ -1228,16 +1228,16 @@ char *dcm_element_value_to_string(const DcmElement *element)
12281228
}
12291229
break;
12301230

1231-
case DCM_CLASS_STRING_SINGLE:
1232-
case DCM_CLASS_STRING_MULTI:
1231+
case DCM_VR_CLASS_STRING_SINGLE:
1232+
case DCM_VR_CLASS_STRING_MULTI:
12331233
(void) dcm_element_get_value_string(NULL,
12341234
element,
12351235
index,
12361236
&str);
12371237
result = dcm_printf_append(result, "%s", str);
12381238
break;
12391239

1240-
case DCM_CLASS_BINARY:
1240+
case DCM_VR_CLASS_BINARY:
12411241
(void) dcm_element_get_value_binary(NULL, element, &val);
12421242
n = MIN(16, dcm_element_get_length(element));
12431243

@@ -1254,7 +1254,7 @@ char *dcm_element_value_to_string(const DcmElement *element)
12541254
}
12551255
break;
12561256

1257-
case DCM_CLASS_SEQUENCE:
1257+
case DCM_VR_CLASS_SEQUENCE:
12581258
result = dcm_printf_append(result, "<sequence>");
12591259
break;
12601260

‎src/dicom-dict.c‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -52,60 +52,60 @@ struct _DcmVRTable_hash_entry {
5252
* enum name class size capacity header_length
5353
*/
5454
static const struct _DcmVRTable vr_table[] = {
55-
{DCM_VR_AE, "AE", DCM_CLASS_STRING_MULTI, 0, DCM_CAPACITY_AE, 2},
56-
{DCM_VR_AS, "AS", DCM_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_AS, 2},
57-
{DCM_VR_AT, "AT", DCM_CLASS_STRING_MULTI, 0, DCM_CAPACITY_AT, 2},
58-
{DCM_VR_CS, "CS", DCM_CLASS_STRING_MULTI, 0, DCM_CAPACITY_CS, 2},
59-
{DCM_VR_DA, "DA", DCM_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_DA, 2},
60-
{DCM_VR_DS, "DS", DCM_CLASS_STRING_MULTI, 0, DCM_CAPACITY_DS, 2},
61-
{DCM_VR_DT, "DT", DCM_CLASS_STRING_MULTI, 0, DCM_CAPACITY_DT, 2},
55+
{DCM_VR_AE, "AE", DCM_VR_CLASS_STRING_MULTI, 0, DCM_CAPACITY_AE, 2},
56+
{DCM_VR_AS, "AS", DCM_VR_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_AS, 2},
57+
{DCM_VR_AT, "AT", DCM_VR_CLASS_STRING_MULTI, 0, DCM_CAPACITY_AT, 2},
58+
{DCM_VR_CS, "CS", DCM_VR_CLASS_STRING_MULTI, 0, DCM_CAPACITY_CS, 2},
59+
{DCM_VR_DA, "DA", DCM_VR_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_DA, 2},
60+
{DCM_VR_DS, "DS", DCM_VR_CLASS_STRING_MULTI, 0, DCM_CAPACITY_DS, 2},
61+
{DCM_VR_DT, "DT", DCM_VR_CLASS_STRING_MULTI, 0, DCM_CAPACITY_DT, 2},
6262

63-
{DCM_VR_FL, "FL", DCM_CLASS_NUMERIC_DECIMAL, 4, 0, 2},
64-
{DCM_VR_FD, "FD", DCM_CLASS_NUMERIC_DECIMAL, 8, 0, 2},
63+
{DCM_VR_FL, "FL", DCM_VR_CLASS_NUMERIC_DECIMAL, 4, 0, 2},
64+
{DCM_VR_FD, "FD", DCM_VR_CLASS_NUMERIC_DECIMAL, 8, 0, 2},
6565

66-
{DCM_VR_IS, "IS", DCM_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_IS, 2},
67-
{DCM_VR_LO, "LO", DCM_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_LO, 2},
66+
{DCM_VR_IS, "IS", DCM_VR_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_IS, 2},
67+
{DCM_VR_LO, "LO", DCM_VR_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_LO, 2},
6868

69-
{DCM_VR_LT, "LT", DCM_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_LT, 2},
69+
{DCM_VR_LT, "LT", DCM_VR_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_LT, 2},
7070

71-
{DCM_VR_OB, "OB", DCM_CLASS_BINARY, 1, 0, 4},
71+
{DCM_VR_OB, "OB", DCM_VR_CLASS_BINARY, 1, 0, 4},
7272

73-
{DCM_VR_OD, "OD", DCM_CLASS_BINARY, 8, 0, 4},
74-
{DCM_VR_OF, "OF", DCM_CLASS_BINARY, 4, 0, 4},
73+
{DCM_VR_OD, "OD", DCM_VR_CLASS_BINARY, 8, 0, 4},
74+
{DCM_VR_OF, "OF", DCM_VR_CLASS_BINARY, 4, 0, 4},
7575

76-
{DCM_VR_OW, "OW", DCM_CLASS_BINARY, 2, 0, 4},
76+
{DCM_VR_OW, "OW", DCM_VR_CLASS_BINARY, 2, 0, 4},
7777

78-
{DCM_VR_PN, "PN", DCM_CLASS_STRING_MULTI, 0, DCM_CAPACITY_PN, 2},
79-
{DCM_VR_SH, "SH", DCM_CLASS_STRING_MULTI, 0, DCM_CAPACITY_SH, 2},
78+
{DCM_VR_PN, "PN", DCM_VR_CLASS_STRING_MULTI, 0, DCM_CAPACITY_PN, 2},
79+
{DCM_VR_SH, "SH", DCM_VR_CLASS_STRING_MULTI, 0, DCM_CAPACITY_SH, 2},
8080

81-
{DCM_VR_SL, "SL", DCM_CLASS_NUMERIC_INTEGER, 4, 0, 2},
81+
{DCM_VR_SL, "SL", DCM_VR_CLASS_NUMERIC_INTEGER, 4, 0, 2},
8282

83-
{DCM_VR_SQ, "SQ", DCM_CLASS_SEQUENCE, 0, 0, 4},
83+
{DCM_VR_SQ, "SQ", DCM_VR_CLASS_SEQUENCE, 0, 0, 4},
8484

85-
{DCM_VR_SS, "SS", DCM_CLASS_NUMERIC_INTEGER, 2, 0, 2},
85+
{DCM_VR_SS, "SS", DCM_VR_CLASS_NUMERIC_INTEGER, 2, 0, 2},
8686

87-
{DCM_VR_ST, "ST", DCM_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_ST, 2},
87+
{DCM_VR_ST, "ST", DCM_VR_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_ST, 2},
8888

89-
{DCM_VR_TM, "TM", DCM_CLASS_STRING_MULTI, 0, DCM_CAPACITY_TM, 2},
89+
{DCM_VR_TM, "TM", DCM_VR_CLASS_STRING_MULTI, 0, DCM_CAPACITY_TM, 2},
9090

91-
{DCM_VR_UI, "UI", DCM_CLASS_STRING_MULTI, 0, DCM_CAPACITY_UI, 2},
91+
{DCM_VR_UI, "UI", DCM_VR_CLASS_STRING_MULTI, 0, DCM_CAPACITY_UI, 2},
9292

93-
{DCM_VR_UL, "UL", DCM_CLASS_NUMERIC_INTEGER, 4, 0, 2},
93+
{DCM_VR_UL, "UL", DCM_VR_CLASS_NUMERIC_INTEGER, 4, 0, 2},
9494

95-
{DCM_VR_UN, "UN", DCM_CLASS_BINARY, 0, 0, 4},
95+
{DCM_VR_UN, "UN", DCM_VR_CLASS_BINARY, 0, 0, 4},
9696

97-
{DCM_VR_US, "US", DCM_CLASS_NUMERIC_INTEGER, 2, 0, 2},
97+
{DCM_VR_US, "US", DCM_VR_CLASS_NUMERIC_INTEGER, 2, 0, 2},
9898

99-
{DCM_VR_UT, "UT", DCM_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_UT, 4},
100-
{DCM_VR_UR, "UR", DCM_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_UR, 4},
99+
{DCM_VR_UT, "UT", DCM_VR_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_UT, 4},
100+
{DCM_VR_UR, "UR", DCM_VR_CLASS_STRING_SINGLE, 0, DCM_CAPACITY_UR, 4},
101101

102-
{DCM_VR_UC, "UC", DCM_CLASS_STRING_MULTI, 0, DCM_CAPACITY_UC, 4},
102+
{DCM_VR_UC, "UC", DCM_VR_CLASS_STRING_MULTI, 0, DCM_CAPACITY_UC, 4},
103103

104-
{DCM_VR_OL, "OL", DCM_CLASS_BINARY, 0, 0, 4},
105-
{DCM_VR_OV, "OV", DCM_CLASS_BINARY, 0, 0, 4},
104+
{DCM_VR_OL, "OL", DCM_VR_CLASS_BINARY, 0, 0, 4},
105+
{DCM_VR_OV, "OV", DCM_VR_CLASS_BINARY, 0, 0, 4},
106106

107-
{DCM_VR_SV, "SV", DCM_CLASS_NUMERIC_INTEGER, 8, 0, 4},
108-
{DCM_VR_UV, "UV", DCM_CLASS_NUMERIC_INTEGER, 8, 0, 4},
107+
{DCM_VR_SV, "SV", DCM_VR_CLASS_NUMERIC_INTEGER, 8, 0, 4},
108+
{DCM_VR_UV, "UV", DCM_VR_CLASS_NUMERIC_INTEGER, 8, 0, 4},
109109
};
110110

111111
static const int n_vrs = sizeof(vr_table) / sizeof(struct _DcmVRTable);
@@ -5212,7 +5212,7 @@ DcmVRClass dcm_dict_vr_class(DcmVR vr)
52125212
return vr_table[(int)vr].vr_class;
52135213
}
52145214

5215-
return DCM_CLASS_ERROR;
5215+
return DCM_VR_CLASS_ERROR;
52165216
}
52175217

52185218

0 commit comments

Comments
 (0)