kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

eliminated "gray borders" on symbol mask boundaries when rendering texts.

Browse source
This commit is contained in:
rachytski 2010-12-14 21:42:28 +02:00 • committed by Alex Zolotarev
parent 5dc0272990
commit 2c4ace897e
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
yg/glyph_cache.cpp
View file

@ -153,6 +153,7 @@ namespace yg
info->m_xOffset = bitmapGlyph->left;
info->m_yOffset = bitmapGlyph->top - info->m_height;
info->m_xAdvance = int(bitmapGlyph->root.advance.x >> 16);
info->m_color = key.m_isMask ? yg::Color(255, 255, 255, 0) : yg::Color(0, 0, 0, 0);
if ((info->m_width != 0) && (info->m_height != 0))
{

2
yg/glyph_cache.hpp
View file

@ -1,6 +1,7 @@
#pragma once
#include "../std/shared_ptr.hpp"
#include "color.hpp"
namespace yg
{
@ -11,6 +12,7 @@ namespace yg
int m_yOffset;
int m_width;
int m_height;
yg::Color m_color;
vector<unsigned char> m_bitmap;

18
yg/skin_page.cpp
View file

@ -358,22 +358,26 @@ namespace yg
TDynamicTexture::view_t v = dynTexture->view(rect.SizeX(), rect.SizeY());
TDynamicTexture::pixel_t penColorTranslucent(0, 0, 0, 0);
TDynamicTexture::pixel_t pxTranslucent;
gil::get_color(pxTranslucent, gil::red_t()) = gi->m_color.r / TDynamicTexture::channelScaleFactor;
gil::get_color(pxTranslucent, gil::green_t()) = gi->m_color.g / TDynamicTexture::channelScaleFactor;
gil::get_color(pxTranslucent, gil::blue_t()) = gi->m_color.b / TDynamicTexture::channelScaleFactor;
gil::get_color(pxTranslucent, gil::alpha_t()) = 0;
for (size_t y = 0; y < 2; ++y)
for (size_t x = 0; x < rect.SizeX(); ++x)
v(x, y) = penColorTranslucent;
v(x, y) = pxTranslucent;
for (size_t y = rect.SizeY() - 2; y < rect.SizeY(); ++y)
for (size_t x = 0; x < rect.SizeX(); ++x)
v(x, y) = penColorTranslucent;
v(x, y) = pxTranslucent;
for (size_t y = 2; y < rect.SizeY() - 2; ++y)
{
v(0, y) = penColorTranslucent;
v(1, y) = penColorTranslucent;
v(rect.SizeX() - 2, y) = penColorTranslucent;
v(rect.SizeX() - 1, y) = penColorTranslucent;
v(0, y) = pxTranslucent;
v(1, y) = pxTranslucent;
v(rect.SizeX() - 2, y) = pxTranslucent;
v(rect.SizeX() - 1, y) = pxTranslucent;
}
if ((gi->m_width != 0) && (gi->m_height != 0))