Mercurial > hg > orthanc-stone
comparison Framework/Toolbox/TextRenderer.cpp @ 1086:3dbdcecccf5d
fix
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Tue, 22 Oct 2019 17:28:59 +0200 |
parents | 63539e826355 |
children | b8521df3944a |
comparison
equal
deleted
inserted
replaced
1085:63539e826355 | 1086:3dbdcecccf5d |
---|---|
26 #include <../../Framework/Scene2D/FloatTextureSceneLayer.h> | 26 #include <../../Framework/Scene2D/FloatTextureSceneLayer.h> |
27 #include <../../Framework/Scene2D/TextSceneLayer.h> | 27 #include <../../Framework/Scene2D/TextSceneLayer.h> |
28 #include <../../Framework/Fonts/GlyphBitmapAlphabet.h> | 28 #include <../../Framework/Fonts/GlyphBitmapAlphabet.h> |
29 #include <../../Framework/Fonts/FontRenderer.h> | 29 #include <../../Framework/Fonts/FontRenderer.h> |
30 #include <Core/Images/PngWriter.h> | 30 #include <Core/Images/PngWriter.h> |
31 #include <Core/Toolbox.h> | |
31 | 32 |
32 #include "Core/Images/Image.h" | 33 #include "Core/Images/Image.h" |
33 #include "Core/Images/ImageProcessing.h" | 34 #include "Core/Images/ImageProcessing.h" |
34 | 35 |
35 namespace OrthancStone | 36 namespace OrthancStone |
63 Orthanc::ImageAccessor* TextRenderer::RenderWithAlpha(Orthanc::EmbeddedResources::FileResourceId resource, | 64 Orthanc::ImageAccessor* TextRenderer::RenderWithAlpha(Orthanc::EmbeddedResources::FileResourceId resource, |
64 unsigned int fontSize, | 65 unsigned int fontSize, |
65 const std::string& utf8String, | 66 const std::string& utf8String, |
66 uint8_t foreground) | 67 uint8_t foreground) |
67 { | 68 { |
68 std::auto_ptr<Orthanc::ImageAccessor> renderedText8(RenderWhiteOnBlack(resource, fontSize, utf8String)); | 69 std::auto_ptr<Orthanc::ImageAccessor> renderedText8(Render(resource, fontSize, utf8String)); |
69 std::auto_ptr<Orthanc::Image> target(new Orthanc::Image(Orthanc::PixelFormat_RGBA32, renderedText8->GetWidth(), renderedText8->GetHeight(), true)); | 70 std::auto_ptr<Orthanc::Image> target(new Orthanc::Image(Orthanc::PixelFormat_RGBA32, renderedText8->GetWidth(), renderedText8->GetHeight(), true)); |
70 | 71 |
71 Orthanc::ImageProcessing::Set(*target, foreground, foreground, foreground, *renderedText8); | 72 Orthanc::ImageProcessing::Set(*target, foreground, foreground, foreground, *renderedText8); |
72 return target.release(); | 73 return target.release(); |
73 } | 74 } |