pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

improved text alignment

Browse source
This commit is contained in:
Roman Sorokin 2014-07-22 12:08:33 +03:00 • committed by Alex Zolotarev
parent 7cc8b47725
commit c5d8ae92a8
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
font_generator/engine.cpp
View file

@ -221,11 +221,11 @@ namespace
GlyphInfo info;
info.m_unicodePoint = unicodeCode;
info.m_glyphIndex = glyphCode;
info.m_width = width/sc;
info.m_height = height/sc;
info.m_xoff = xoff /*/ (float)GlyphScaler*/;
info.m_yoff = yoff /*/ (float)GlyphScaler*/;
info.m_advance = advance * (scale /*/ (float) GlyphScaler*/);
info.m_width = width/sc*2.0f + 2*4;
info.m_height = height/sc*2.0f + 2*4;
info.m_xoff = xoff/sc*2.0f + 4/*/ (float)GlyphScaler*/;
info.m_yoff = yoff/sc*2.0f - 4/*/ (float)GlyphScaler*/;
info.m_advance = advance * (scale /*/ (float) GlyphScaler*/)/sc*2.0f;
if (info.m_width == 0 || info.m_height == 0)
{
emptyInfos.push_back(info);
@ -328,7 +328,7 @@ namespace
static void processGlyph(unsigned char * glyphImage, int32_t width, int32_t height,
vector<uint8_t> & im, int32_t & newW, int32_t & newH, float sc)
{
sc = 2.0f;
sc /= 2.0f;
image img(height, width, glyphImage);
uint32_t const border = 4;
image imgWithBorder(img.add_border(border * sc));
@ -435,11 +435,11 @@ void Engine::RunExport()
m_workThread->wait();
QString dirName(m_dirName.trimmed());
QString inPathName(dirName + "/font_temp.png");
QString inPathName(dirName + "/font.png");
m_tempPngFile = inPathName;
QString outPathName(dirName + "/font.png");
GetImage().save(dirName + "/font_temp.png", "png");
GetImage().save(dirName + "/font.png", "png");
// QString params = QString("/opt/local/bin/convert %1 %2 %3")
// .arg(inPathName)

4
font_generator/image.cpp
View file

@ -31,8 +31,8 @@ void mexFunction(image & img, image & out)
image gx(img.height, img.width);
image gy(img.height, img.width);
short * xdist = (short*)malloc(mrows*ncols*sizeof(short));
short * ydist = (short*)malloc(mrows*ncols*sizeof(short));
short * xdist = (short*)malloc(img.width*img.height*sizeof(short));
short * ydist = (short*)malloc(img.width*img.height*sizeof(short));
img.computegradient(gx, gy);
img.edtaa3(gx, gy, img.width, img.height, xdist, ydist, out);
// Pixels with grayscale>0.5 will have a negative distance.