Mercurial > hg > orthanc

comparison UnitTestsSources/FromDcmtkTests.cpp @ 3349:ef18ea68a362

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <alain@mazy.be>
date Thu, 18 Apr 2019 15:52:56 +0200
parents 63f59ad9381a
children 0a0e7eca95ae
comparison
equal deleted inserted replaced
3348:a1cd981a0f9a 3349:ef18ea68a362
1117 SetDefaultDicomEncoding(Encoding_Ascii); 1117 SetDefaultDicomEncoding(Encoding_Ascii);
1118 ASSERT_EQ(Encoding_Ascii, GetDefaultDicomEncoding()); 1118 ASSERT_EQ(Encoding_Ascii, GetDefaultDicomEncoding());
1119 1119
1120 { 1120 {
1121 DicomMap m; 1121 DicomMap m;
1122 ParsedDicomFile dicom(m); 1122 ParsedDicomFile dicom(m, GetDefaultDicomEncoding(), false);
1123 ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card()); 1123 ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card());
1124 CheckEncoding(dicom, Encoding_Ascii); 1124 CheckEncoding(dicom, Encoding_Ascii);
1125 } 1125 }
1126 1126
1127 { 1127 {
1132 } 1132 }
1133 1133
1134 { 1134 {
1135 DicomMap m; 1135 DicomMap m;
1136 m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "ISO_IR 148", false); 1136 m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "ISO_IR 148", false);
1137 ParsedDicomFile dicom(m); 1137 ParsedDicomFile dicom(m, GetDefaultDicomEncoding(), false);
1138 ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card()); 1138 ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card());
1139 CheckEncoding(dicom, Encoding_Latin5); 1139 CheckEncoding(dicom, Encoding_Latin5);
1140 } 1140 }
1141 1141
1142 { 1142 {