comparison UnitTestsSources/ImageProcessingTests.cpp @ 1207:ddb5b6ed9736

fix unit tests
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 03 Nov 2014 15:27:50 +0100
parents 6d89d5a4a723
children 6e7e5ed91c2d
comparison
equal deleted inserted replaced
1206:f5b0207967bc 1207:ddb5b6ed9736
49 m.SetValue(DICOM_TAG_BITS_ALLOCATED, "16"); 49 m.SetValue(DICOM_TAG_BITS_ALLOCATED, "16");
50 m.SetValue(DICOM_TAG_SAMPLES_PER_PIXEL, "1"); 50 m.SetValue(DICOM_TAG_SAMPLES_PER_PIXEL, "1");
51 m.SetValue(DICOM_TAG_BITS_STORED, "12"); 51 m.SetValue(DICOM_TAG_BITS_STORED, "12");
52 m.SetValue(DICOM_TAG_HIGH_BIT, "11"); 52 m.SetValue(DICOM_TAG_HIGH_BIT, "11");
53 m.SetValue(DICOM_TAG_PIXEL_REPRESENTATION, "0"); 53 m.SetValue(DICOM_TAG_PIXEL_REPRESENTATION, "0");
54 m.SetValue(DICOM_TAG_PHOTOMETRIC_INTERPRETATION, "MONOCHROME2");
54 55
55 DicomImageInformation info(m); 56 DicomImageInformation info(m);
56 PixelFormat format; 57 PixelFormat format;
57 ASSERT_TRUE(info.ExtractPixelFormat(format)); 58 ASSERT_TRUE(info.ExtractPixelFormat(format));
58 ASSERT_EQ(PixelFormat_Grayscale16, format); 59 ASSERT_EQ(PixelFormat_Grayscale16, format);
68 m.SetValue(DICOM_TAG_BITS_ALLOCATED, "16"); 69 m.SetValue(DICOM_TAG_BITS_ALLOCATED, "16");
69 m.SetValue(DICOM_TAG_SAMPLES_PER_PIXEL, "1"); 70 m.SetValue(DICOM_TAG_SAMPLES_PER_PIXEL, "1");
70 m.SetValue(DICOM_TAG_BITS_STORED, "16"); 71 m.SetValue(DICOM_TAG_BITS_STORED, "16");
71 m.SetValue(DICOM_TAG_HIGH_BIT, "15"); 72 m.SetValue(DICOM_TAG_HIGH_BIT, "15");
72 m.SetValue(DICOM_TAG_PIXEL_REPRESENTATION, "1"); 73 m.SetValue(DICOM_TAG_PIXEL_REPRESENTATION, "1");
74 m.SetValue(DICOM_TAG_PHOTOMETRIC_INTERPRETATION, "MONOCHROME2");
73 75
74 DicomImageInformation info(m); 76 DicomImageInformation info(m);
75 PixelFormat format; 77 PixelFormat format;
76 ASSERT_TRUE(info.ExtractPixelFormat(format)); 78 ASSERT_TRUE(info.ExtractPixelFormat(format));
77 ASSERT_EQ(PixelFormat_SignedGrayscale16, format); 79 ASSERT_EQ(PixelFormat_SignedGrayscale16, format);