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

syntax fixes

Browse source
This commit is contained in:
Roman Sorokin 2014-07-07 20:00:18 +02:00 • committed by Alex Zolotarev
parent f082162114
commit 4d2d3244dc
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drape_head/drape_head.pro
View file

@ -8,7 +8,7 @@ TARGET = DrapeHead
TEMPLATE = app
CONFIG += warn_on
QT *= core gui widgets
#DEFINES += USE_TESTING_ENGINE
DEFINES += USE_TESTING_ENGINE
win32* {
LIBS += -lopengl32 -lws2_32 -lshell32 -liphlpapi

9
font_generator/engine.cpp
View file

@ -305,7 +305,7 @@ namespace
static void processGlyph(unsigned char * glyphImage, int32_t width, int32_t height,
vector<uint8_t> & image, int32_t & newW, int32_t & newH)
{
static uint32_t border = 4;
uint32_t const border = 4;
int32_t const sWidth = width + 2 * border;
int32_t const sHeight = height + 2 * border;
@ -402,11 +402,12 @@ void Engine::RunExport()
if (!m_workThread->isFinished())
m_workThread->wait();
QString inPathName(m_dirName.trimmed() + "/font_temp.png");
QString dirName(m_dirName.trimmed());
QString inPathName(dirName + "/font_temp.png");
m_tempPngFile = inPathName;
QString outPathName(m_dirName.trimmed() + "/font.png");
QString outPathName(dirName + "/font.png");
GetImage().save(m_dirName.trimmed() + "/font_temp.png", "png");
GetImage().save(dirName + "/font_temp.png", "png");
QString params = QString("/opt/local/bin/convert %1 %2 %3")
.arg(inPathName)