Mercurial > hg > orthanc

comparison OrthancFramework/UnitTestsSources/ImageTests.cpp @ 4311:cb9aef006229

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
turning IImageWriter into a pure interface
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 09 Nov 2020 15:07:55 +0100
parents afad57ac30ef
children b96aedfa8cc1
comparison
equal deleted inserted replaced
4310:2ae905070221 4311:cb9aef006229
63 } 63 }
64 64
65 Orthanc::ImageAccessor accessor; 65 Orthanc::ImageAccessor accessor;
66 accessor.AssignReadOnly(Orthanc::PixelFormat_RGB24, width, height, pitch, &image[0]); 66 accessor.AssignReadOnly(Orthanc::PixelFormat_RGB24, width, height, pitch, &image[0]);
67 67
68 w.WriteToFile("UnitTestsResults/ColorPattern.png", accessor); 68 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/ColorPattern.png", accessor);
69 69
70 std::string f, md5; 70 std::string f, md5;
71 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/ColorPattern.png"); 71 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/ColorPattern.png");
72 Orthanc::Toolbox::ComputeMD5(md5, f); 72 Orthanc::Toolbox::ComputeMD5(md5, f);
73 ASSERT_EQ("604e785f53c99cae6ea4584870b2c41d", md5); 73 ASSERT_EQ("604e785f53c99cae6ea4584870b2c41d", md5);
91 } 91 }
92 92
93 Orthanc::ImageAccessor accessor; 93 Orthanc::ImageAccessor accessor;
94 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale8, width, height, pitch, &image[0]); 94 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale8, width, height, pitch, &image[0]);
95 95
96 w.WriteToFile("UnitTestsResults/Gray8Pattern.png", accessor); 96 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/Gray8Pattern.png", accessor);
97 97
98 std::string f, md5; 98 std::string f, md5;
99 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.png"); 99 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.png");
100 Orthanc::Toolbox::ComputeMD5(md5, f); 100 Orthanc::Toolbox::ComputeMD5(md5, f);
101 ASSERT_EQ("5a9b98bea3d0a6d983980cc38bfbcdb3", md5); 101 ASSERT_EQ("5a9b98bea3d0a6d983980cc38bfbcdb3", md5);
120 } 120 }
121 } 121 }
122 122
123 Orthanc::ImageAccessor accessor; 123 Orthanc::ImageAccessor accessor;
124 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]); 124 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]);
125 w.WriteToFile("UnitTestsResults/Gray16Pattern.png", accessor); 125 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/Gray16Pattern.png", accessor);
126 126
127 std::string f, md5; 127 std::string f, md5;
128 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.png"); 128 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.png");
129 Orthanc::Toolbox::ComputeMD5(md5, f); 129 Orthanc::Toolbox::ComputeMD5(md5, f);
130 ASSERT_EQ("0785866a08bf0a02d2eeff87f658571c", md5); 130 ASSERT_EQ("0785866a08bf0a02d2eeff87f658571c", md5);
151 151
152 Orthanc::ImageAccessor accessor; 152 Orthanc::ImageAccessor accessor;
153 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]); 153 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]);
154 154
155 std::string s; 155 std::string s;
156 w.WriteToMemory(s, accessor); 156 Orthanc::IImageWriter::WriteToMemory(w, s, accessor);
157 157
158 { 158 {
159 Orthanc::PngReader r; 159 Orthanc::PngReader r;
160 r.ReadFromMemory(s); 160 r.ReadFromMemory(s);
161 161
216 *p = value++; 216 *p = value++;
217 } 217 }
218 } 218 }
219 219
220 Orthanc::JpegWriter w; 220 Orthanc::JpegWriter w;
221 w.WriteToFile("UnitTestsResults/hello.jpg", img); 221 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/hello.jpg", img);
222 222
223 w.WriteToMemory(s, img); 223 Orthanc::IImageWriter::WriteToMemory(w, s, img);
224 Orthanc::SystemToolbox::WriteFile(s, "UnitTestsResults/hello2.jpg"); 224 Orthanc::SystemToolbox::WriteFile(s, "UnitTestsResults/hello2.jpg");
225 225
226 std::string t; 226 std::string t;
227 Orthanc::SystemToolbox::ReadFile(t, "UnitTestsResults/hello.jpg"); 227 Orthanc::SystemToolbox::ReadFile(t, "UnitTestsResults/hello.jpg");
228 ASSERT_EQ(s.size(), t.size()); 228 ASSERT_EQ(s.size(), t.size());
272 } 272 }
273 273
274 Orthanc::ImageAccessor accessor; 274 Orthanc::ImageAccessor accessor;
275 accessor.AssignReadOnly(Orthanc::PixelFormat_RGB24, width, height, pitch, &image[0]); 275 accessor.AssignReadOnly(Orthanc::PixelFormat_RGB24, width, height, pitch, &image[0]);
276 276
277 w.WriteToFile("UnitTestsResults/ColorPattern.pam", accessor); 277 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/ColorPattern.pam", accessor);
278 278
279 std::string f, md5; 279 std::string f, md5;
280 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/ColorPattern.pam"); 280 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/ColorPattern.pam");
281 Orthanc::Toolbox::ComputeMD5(md5, f); 281 Orthanc::Toolbox::ComputeMD5(md5, f);
282 ASSERT_EQ("81a3441754e88969ebbe53e69891e841", md5); 282 ASSERT_EQ("81a3441754e88969ebbe53e69891e841", md5);
300 } 300 }
301 301
302 Orthanc::ImageAccessor accessor; 302 Orthanc::ImageAccessor accessor;
303 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale8, width, height, pitch, &image[0]); 303 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale8, width, height, pitch, &image[0]);
304 304
305 w.WriteToFile("UnitTestsResults/Gray8Pattern.pam", accessor); 305 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/Gray8Pattern.pam", accessor);
306 306
307 std::string f, md5; 307 std::string f, md5;
308 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.pam"); 308 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.pam");
309 Orthanc::Toolbox::ComputeMD5(md5, f); 309 Orthanc::Toolbox::ComputeMD5(md5, f);
310 ASSERT_EQ("7873c408d26a9d11dd1c1de5e69cc0a3", md5); 310 ASSERT_EQ("7873c408d26a9d11dd1c1de5e69cc0a3", md5);
329 } 329 }
330 } 330 }
331 331
332 Orthanc::ImageAccessor accessor; 332 Orthanc::ImageAccessor accessor;
333 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]); 333 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]);
334 w.WriteToFile("UnitTestsResults/Gray16Pattern.pam", accessor); 334 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/Gray16Pattern.pam", accessor);
335 335
336 std::string f, md5; 336 std::string f, md5;
337 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.pam"); 337 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.pam");
338 Orthanc::Toolbox::ComputeMD5(md5, f); 338 Orthanc::Toolbox::ComputeMD5(md5, f);
339 ASSERT_EQ("b268772bf28f3b2b8520ff21c5e3dcb6", md5); 339 ASSERT_EQ("b268772bf28f3b2b8520ff21c5e3dcb6", md5);
360 360
361 Orthanc::ImageAccessor accessor; 361 Orthanc::ImageAccessor accessor;
362 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]); 362 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]);
363 363
364 std::string s; 364 std::string s;
365 w.WriteToMemory(s, accessor); 365 Orthanc::IImageWriter::WriteToMemory(w, s, accessor);
366 366
367 { 367 {
368 Orthanc::PamReader r(true); 368 Orthanc::PamReader r(true);
369 r.ReadFromMemory(s); 369 r.ReadFromMemory(s);
370 370