# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1392300671 -3600
# Node ID c87a1d529e13d0b4ebc4f0daaf549e697110e0f7
# Parent  6c90ce085261971b17bd9291db48dded68c006a5
test pngreader

diff -r 6c90ce085261 -r c87a1d529e13 Core/FileFormats/PngReader.h
--- a/Core/FileFormats/PngReader.h	Thu Feb 13 15:06:38 2014 +0100
+++ b/Core/FileFormats/PngReader.h	Thu Feb 13 15:11:11 2014 +0100
@@ -96,6 +96,11 @@
 
     void ReadFromFile(const char* filename);
 
+    void ReadFromFile(const std::string& filename)
+    {
+      ReadFromFile(filename.c_str());
+    }
+
     void ReadFromMemory(const void* buffer,
                         size_t size);
 
diff -r 6c90ce085261 -r c87a1d529e13 UnitTestsSources/Png.cpp
--- a/UnitTestsSources/Png.cpp	Thu Feb 13 15:06:38 2014 +0100
+++ b/UnitTestsSources/Png.cpp	Thu Feb 13 15:11:11 2014 +0100
@@ -112,6 +112,7 @@
     Orthanc::PngReader r;
     r.ReadFromMemory(s);
 
+    ASSERT_EQ(r.GetFormat(), Orthanc::PixelFormat_Grayscale16);
     ASSERT_EQ(r.GetWidth(), width);
     ASSERT_EQ(r.GetHeight(), height);
 
@@ -127,14 +128,17 @@
   }
 
   {
-    Toolbox::TemporaryFile tmp;
-    Toolbox::WriteFile(s, tmp.GetPath());
+    Orthanc::Toolbox::TemporaryFile tmp;
+    Orthanc::Toolbox::WriteFile(s, tmp.GetPath());
 
     Orthanc::PngReader r2;
     r2.ReadFromFile(tmp.GetPath());
 
+    ASSERT_EQ(r2.GetFormat(), Orthanc::PixelFormat_Grayscale16);
     ASSERT_EQ(r2.GetWidth(), width);
     ASSERT_EQ(r2.GetHeight(), height);
+
+    v = 0;
     for (int y = 0; y < height; y++)
     {
       uint16_t *p = reinterpret_cast<uint16_t*>((uint8_t*) r2.GetBuffer() + y * r2.GetPitch());