Mercurial > hg > orthanc

comparison UnitTestsSources/FromDcmtkTests.cpp @ 2411:82d5e305fbd9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix gcc warnings in unit tests
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 29 Sep 2017 10:16:28 +0200
parents e4045b3c9772
children 6e5bc5c6d1a4
comparison
equal deleted inserted replaced
2410:3590c936e56f 2411:82d5e305fbd9
1093 ASSERT_EQ(Encoding_Ascii, GetDefaultDicomEncoding()); 1093 ASSERT_EQ(Encoding_Ascii, GetDefaultDicomEncoding());
1094 1094
1095 { 1095 {
1096 DicomMap m; 1096 DicomMap m;
1097 ParsedDicomFile dicom(m); 1097 ParsedDicomFile dicom(m);
1098 ASSERT_EQ(1, dicom.GetDcmtkObject().getDataset()->card()); 1098 ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card());
1099 CheckEncoding(dicom, Encoding_Ascii); 1099 CheckEncoding(dicom, Encoding_Ascii);
1100 } 1100 }
1101 1101
1102 { 1102 {
1103 DicomMap m; 1103 DicomMap m;
1104 ParsedDicomFile dicom(m, Encoding_Latin4); 1104 ParsedDicomFile dicom(m, Encoding_Latin4);
1105 ASSERT_EQ(1, dicom.GetDcmtkObject().getDataset()->card()); 1105 ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card());
1106 CheckEncoding(dicom, Encoding_Latin4); 1106 CheckEncoding(dicom, Encoding_Latin4);
1107 } 1107 }
1108 1108
1109 { 1109 {
1110 DicomMap m; 1110 DicomMap m;
1111 m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "ISO_IR 148", false); 1111 m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "ISO_IR 148", false);
1112 ParsedDicomFile dicom(m); 1112 ParsedDicomFile dicom(m);
1113 ASSERT_EQ(1, dicom.GetDcmtkObject().getDataset()->card()); 1113 ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card());
1114 CheckEncoding(dicom, Encoding_Latin5); 1114 CheckEncoding(dicom, Encoding_Latin5);
1115 } 1115 }
1116 1116
1117 { 1117 {
1118 DicomMap m; 1118 DicomMap m;
1119 m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "ISO_IR 148", false); 1119 m.SetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET, "ISO_IR 148", false);
1120 ParsedDicomFile dicom(m, Encoding_Latin1); 1120 ParsedDicomFile dicom(m, Encoding_Latin1);
1121 ASSERT_EQ(1, dicom.GetDcmtkObject().getDataset()->card()); 1121 ASSERT_EQ(1u, dicom.GetDcmtkObject().getDataset()->card());
1122 CheckEncoding(dicom, Encoding_Latin5); 1122 CheckEncoding(dicom, Encoding_Latin5);
1123 } 1123 }
1124 } 1124 }
1125 1125
1126 1126