comparison UnitTestsSources/ImageTests.cpp @ 1916:5bcf721bde4f

IImageWriter
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Feb 2016 15:26:37 +0100
parents b1291df2f780
children a1c1c606ce98
comparison
equal deleted inserted replaced
1915:7454019be8f3 1916:5bcf721bde4f
64 p[1] = (y % 3 == 1) ? 255 : 0; 64 p[1] = (y % 3 == 1) ? 255 : 0;
65 p[2] = (y % 3 == 2) ? 255 : 0; 65 p[2] = (y % 3 == 2) ? 255 : 0;
66 } 66 }
67 } 67 }
68 68
69 w.WriteToFile("UnitTestsResults/ColorPattern.png", width, height, pitch, Orthanc::PixelFormat_RGB24, &image[0]); 69 Orthanc::ImageAccessor accessor;
70 accessor.AssignReadOnly(Orthanc::PixelFormat_RGB24, width, height, pitch, &image[0]);
71
72 w.WriteToFile("UnitTestsResults/ColorPattern.png", accessor);
70 73
71 std::string f, md5; 74 std::string f, md5;
72 Orthanc::Toolbox::ReadFile(f, "UnitTestsResults/ColorPattern.png"); 75 Orthanc::Toolbox::ReadFile(f, "UnitTestsResults/ColorPattern.png");
73 Orthanc::Toolbox::ComputeMD5(md5, f); 76 Orthanc::Toolbox::ComputeMD5(md5, f);
74 ASSERT_EQ("604e785f53c99cae6ea4584870b2c41d", md5); 77 ASSERT_EQ("604e785f53c99cae6ea4584870b2c41d", md5);
89 { 92 {
90 *p = y; 93 *p = y;
91 } 94 }
92 } 95 }
93 96
94 w.WriteToFile("UnitTestsResults/Gray8Pattern.png", width, height, pitch, Orthanc::PixelFormat_Grayscale8, &image[0]); 97 Orthanc::ImageAccessor accessor;
98 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale8, width, height, pitch, &image[0]);
99
100 w.WriteToFile("UnitTestsResults/Gray8Pattern.png", accessor);
95 101
96 std::string f, md5; 102 std::string f, md5;
97 Orthanc::Toolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.png"); 103 Orthanc::Toolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.png");
98 Orthanc::Toolbox::ComputeMD5(md5, f); 104 Orthanc::Toolbox::ComputeMD5(md5, f);
99 ASSERT_EQ("5a9b98bea3d0a6d983980cc38bfbcdb3", md5); 105 ASSERT_EQ("5a9b98bea3d0a6d983980cc38bfbcdb3", md5);
116 { 122 {
117 *p = v; 123 *p = v;
118 } 124 }
119 } 125 }
120 126
121 w.WriteToFile("UnitTestsResults/Gray16Pattern.png", width, height, pitch, Orthanc::PixelFormat_Grayscale16, &image[0]); 127 Orthanc::ImageAccessor accessor;
128 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]);
129 w.WriteToFile("UnitTestsResults/Gray16Pattern.png", accessor);
122 130
123 std::string f, md5; 131 std::string f, md5;
124 Orthanc::Toolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.png"); 132 Orthanc::Toolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.png");
125 Orthanc::Toolbox::ComputeMD5(md5, f); 133 Orthanc::Toolbox::ComputeMD5(md5, f);
126 ASSERT_EQ("0785866a08bf0a02d2eeff87f658571c", md5); 134 ASSERT_EQ("0785866a08bf0a02d2eeff87f658571c", md5);
143 { 151 {
144 *p = v; 152 *p = v;
145 } 153 }
146 } 154 }
147 155
156 Orthanc::ImageAccessor accessor;
157 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]);
158
148 std::string s; 159 std::string s;
149 w.WriteToMemory(s, width, height, pitch, Orthanc::PixelFormat_Grayscale16, &image[0]); 160 w.WriteToMemory(s, accessor);
150 161
151 { 162 {
152 Orthanc::PngReader r; 163 Orthanc::PngReader r;
153 r.ReadFromMemory(s); 164 r.ReadFromMemory(s);
154 165