Mercurial > hg > orthanc

diff 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
line wrap: on
line diff
--- a/OrthancFramework/UnitTestsSources/ImageTests.cpp	Mon Nov 09 14:40:51 2020 +0100
+++ b/OrthancFramework/UnitTestsSources/ImageTests.cpp	Mon Nov 09 15:07:55 2020 +0100
@@ -65,7 +65,7 @@
   Orthanc::ImageAccessor accessor;
   accessor.AssignReadOnly(Orthanc::PixelFormat_RGB24, width, height, pitch, &image[0]);
 
-  w.WriteToFile("UnitTestsResults/ColorPattern.png", accessor);
+  Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/ColorPattern.png", accessor);
 
   std::string f, md5;
   Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/ColorPattern.png");
@@ -93,7 +93,7 @@
   Orthanc::ImageAccessor accessor;
   accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale8, width, height, pitch, &image[0]);
 
-  w.WriteToFile("UnitTestsResults/Gray8Pattern.png", accessor);
+  Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/Gray8Pattern.png", accessor);
 
   std::string f, md5;
   Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.png");
@@ -122,7 +122,7 @@
 
   Orthanc::ImageAccessor accessor;
   accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]);
-  w.WriteToFile("UnitTestsResults/Gray16Pattern.png", accessor);
+  Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/Gray16Pattern.png", accessor);
 
   std::string f, md5;
   Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.png");
@@ -153,7 +153,7 @@
   accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]);
 
   std::string s;
-  w.WriteToMemory(s, accessor);
+  Orthanc::IImageWriter::WriteToMemory(w, s, accessor);
 
   {
     Orthanc::PngReader r;
@@ -218,9 +218,9 @@
     }
 
     Orthanc::JpegWriter w;
-    w.WriteToFile("UnitTestsResults/hello.jpg", img);
+    Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/hello.jpg", img);
 
-    w.WriteToMemory(s, img);
+    Orthanc::IImageWriter::WriteToMemory(w, s, img);
     Orthanc::SystemToolbox::WriteFile(s, "UnitTestsResults/hello2.jpg");
 
     std::string t;
@@ -274,7 +274,7 @@
   Orthanc::ImageAccessor accessor;
   accessor.AssignReadOnly(Orthanc::PixelFormat_RGB24, width, height, pitch, &image[0]);
 
-  w.WriteToFile("UnitTestsResults/ColorPattern.pam", accessor);
+  Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/ColorPattern.pam", accessor);
 
   std::string f, md5;
   Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/ColorPattern.pam");
@@ -302,7 +302,7 @@
   Orthanc::ImageAccessor accessor;
   accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale8, width, height, pitch, &image[0]);
 
-  w.WriteToFile("UnitTestsResults/Gray8Pattern.pam", accessor);
+  Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/Gray8Pattern.pam", accessor);
 
   std::string f, md5;
   Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.pam");
@@ -331,7 +331,7 @@
 
   Orthanc::ImageAccessor accessor;
   accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]);
-  w.WriteToFile("UnitTestsResults/Gray16Pattern.pam", accessor);
+  Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/Gray16Pattern.pam", accessor);
 
   std::string f, md5;
   Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.pam");
@@ -362,7 +362,7 @@
   accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]);
 
   std::string s;
-  w.WriteToMemory(s, accessor);
+  Orthanc::IImageWriter::WriteToMemory(w, s, accessor);
 
   {
     Orthanc::PamReader r(true);