Mercurial > hg > orthanc-stone
diff Framework/Scene2D/Internals/CairoTextRenderer.cpp @ 860:238693c3bc51 am-dev
merge default -> am-dev
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Mon, 24 Jun 2019 14:35:00 +0200 |
parents | 61ba4b504e9a |
children | 6e888cf6a48b |
line wrap: on
line diff
--- a/Framework/Scene2D/Internals/CairoTextRenderer.cpp Wed Jun 19 17:36:33 2019 +0200 +++ b/Framework/Scene2D/Internals/CairoTextRenderer.cpp Mon Jun 24 14:35:00 2019 +0200 @@ -48,9 +48,7 @@ } const unsigned int width = source->GetWidth(); - const unsigned int red = layer.GetRed(); - const unsigned int green = layer.GetGreen(); - const unsigned int blue = layer.GetBlue(); + const Color& color = layer.GetColor(); for (unsigned int y = 0; y < source->GetHeight(); y++) { @@ -62,9 +60,9 @@ unsigned int alpha = *p; // Premultiplied alpha - q[0] = static_cast<uint8_t>((blue * alpha) / 255); - q[1] = static_cast<uint8_t>((green * alpha) / 255); - q[2] = static_cast<uint8_t>((red * alpha) / 255); + q[0] = static_cast<uint8_t>((color.GetBlue() * alpha) / 255); + q[1] = static_cast<uint8_t>((color.GetGreen() * alpha) / 255); + q[2] = static_cast<uint8_t>((color.GetRed() * alpha) / 255); q[3] = *p; p++; @@ -85,7 +83,9 @@ const TextSceneLayer& layer = GetLayer<TextSceneLayer>(); cairo_t* cr = GetCairoContext(); - cairo_set_source_rgb(cr, layer.GetRedAsFloat(), layer.GetGreenAsFloat(), layer.GetBlueAsFloat()); + cairo_set_source_rgb(cr, layer.GetColor().GetRedAsFloat(), + layer.GetColor().GetGreenAsFloat(), + layer.GetColor().GetBlueAsFloat()); double dx, dy; // In pixels ComputeAnchorTranslation(dx, dy, layer.GetAnchor(), text_.GetWidth(),