# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1441377042 -7200
# Node ID 5e9b2aac8b8924050952edcc4637824a98f59b23
# Parent  2dff2bdffdb884e055c7c0d8de97aa85fc0973a3
fix for visual studio

diff -r 2dff2bdffdb8 -r 5e9b2aac8b89 Core/ImageFormats/Font.cpp
--- a/Core/ImageFormats/Font.cpp	Fri Sep 04 13:44:21 2015 +0200
+++ b/Core/ImageFormats/Font.cpp	Fri Sep 04 16:30:42 2015 +0200
@@ -272,24 +272,24 @@
   }
 
 
-  void Font::DrawText(ImageAccessor& target,
-                      const std::string& utf8,
-                      int x,
-                      int y,
-                      uint8_t grayscale) const
+  void Font::Draw(ImageAccessor& target,
+                  const std::string& utf8,
+                  int x,
+                  int y,
+                  uint8_t grayscale) const
   {
     uint8_t color[4] = { grayscale, grayscale, grayscale, 255 };
     DrawInternal(target, utf8, x, y, color);
   }
 
 
-  void Font::DrawText(ImageAccessor& target,
-                      const std::string& utf8,
-                      int x,
-                      int y,
-                      uint8_t r,
-                      uint8_t g,
-                      uint8_t b) const
+  void Font::Draw(ImageAccessor& target,
+                  const std::string& utf8,
+                  int x,
+                  int y,
+                  uint8_t r,
+                  uint8_t g,
+                  uint8_t b) const
   {
     uint8_t color[4] = { r, g, b, 255 };
     DrawInternal(target, utf8, x, y, color);
diff -r 2dff2bdffdb8 -r 5e9b2aac8b89 Core/ImageFormats/Font.h
--- a/Core/ImageFormats/Font.h	Fri Sep 04 13:44:21 2015 +0200
+++ b/Core/ImageFormats/Font.h	Fri Sep 04 16:30:42 2015 +0200
@@ -88,18 +88,18 @@
       return size_;
     }
 
-    void DrawText(ImageAccessor& target,
-                  const std::string& utf8,
-                  int x,
-                  int y,
-                  uint8_t grayscale) const;
+    void Draw(ImageAccessor& target,
+              const std::string& utf8,
+              int x,
+              int y,
+              uint8_t grayscale) const;
 
-    void DrawText(ImageAccessor& target,
-                  const std::string& utf8,
-                  int x,
-                  int y,
-                  uint8_t r,
-                  uint8_t g,
-                  uint8_t b) const;
+    void Draw(ImageAccessor& target,
+              const std::string& utf8,
+              int x,
+              int y,
+              uint8_t r,
+              uint8_t g,
+              uint8_t b) const;
   };
 }
diff -r 2dff2bdffdb8 -r 5e9b2aac8b89 UnitTestsSources/ImageTests.cpp
--- a/UnitTestsSources/ImageTests.cpp	Fri Sep 04 13:44:21 2015 +0200
+++ b/UnitTestsSources/ImageTests.cpp	Fri Sep 04 16:30:42 2015 +0200
@@ -251,7 +251,7 @@
   memset(s.GetBuffer(), 0, s.GetPitch() * s.GetHeight());
 
   ASSERT_GE(1, Orthanc::Configuration::GetFontRegistry().GetSize());
-  Orthanc::Configuration::GetFontRegistry().GetFont(0).DrawText(s, "Hello world É\n\rComment ça va ?\nq", 50, 60, 255, 0, 0);
+  Orthanc::Configuration::GetFontRegistry().GetFont(0).Draw(s, "Hello world É\n\rComment ça va ?\nq", 50, 60, 255, 0, 0);
 
   Orthanc::PngWriter w;
   w.WriteToFile("UnitTestsResults/font.png", s);