Mercurial > hg > orthanc
changeset 1611:5e9b2aac8b89
fix for visual studio
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 04 Sep 2015 16:30:42 +0200 |
| parents | 2dff2bdffdb8 |
| children | 96582230ddcb |
| files | Core/ImageFormats/Font.cpp Core/ImageFormats/Font.h UnitTestsSources/ImageTests.cpp |
| diffstat | 3 files changed, 25 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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; }; }
--- 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);