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

[msvc] Compilation fixes.

Browse source
This commit is contained in:
vng 2011-05-07 01:48:28 +03:00 • committed by Alex Zolotarev
parent c399e6d9fe
commit 63e3f9ab46
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3party/3party.pro
View file

@ -2,7 +2,7 @@
TEMPLATE = subdirs
SUBDIRS = expat freetype fribidi zlib bzip2 jansson protobuf tomcrypt
SUBDIRS = expat freetype fribidi zlib bzip2 jansson tomcrypt
!iphone*:!bada* {
SUBDIRS += gflags \

2
platform/location_manager.cpp
View file

@ -3,6 +3,8 @@
#include "../std/target_os.hpp"
#include "../std/vector.hpp"
#include "../std/bind.hpp"
#include "../std/ctime.hpp"
double ApproxDistanceSquareInMetres(double lat1, double lon1, double lat2, double lon2)
{

2
platform/wifi_location_service.cpp
View file

@ -5,11 +5,13 @@
#include "../base/logging.hpp"
#include "../std/bind.hpp"
#include "../std/ctime.hpp"
#include "../3party/jansson/myjansson.hpp"
#define MWM_GEOLOCATION_SERVER "http://geolocation.server/"
namespace location
{
class WiFiLocationService : public LocationService

2
yg/glyph_layout.cpp
View file

@ -200,7 +200,7 @@ namespace yg
return;
m_entries[symPos].m_angle = pivotPt.m_angle;
double centerOffset = metrics.m_xOffset + metrics.m_width / 2.0;
//double centerOffset = metrics.m_xOffset + metrics.m_width / 2.0;
//m_entries[symPos].m_pt = pivotPt.m_pp.m_pt.Move(-centerOffset, pivotPt.m_angle);
m_entries[symPos].m_pt = startPt.m_pt;
}