Merge branch 'master' into linebreak

Conflicts:
	src/map/tile_parser.cpp
	src/text/glyph_store.cpp
This commit is contained in:
Young Hahn
2014-05-30 09:00:29 -04:00
31 changed files with 128 additions and 272 deletions

View File

@@ -7,7 +7,6 @@
#include <llmr/platform/platform.hpp>
#include <uv.h>
#include <algorithm>
#include <iostream>
namespace llmr {
@@ -120,7 +119,9 @@ GlyphPBF::GlyphPBF(const std::string &fontStack, GlyphRange glyphRange)
// TODO: Find more reliable URL normalization function
std::replace(url.begin(), url.end(), ' ', '+');
#if defined(DEBUG)
fprintf(stderr, "%s\n", url.c_str());
#endif
platform::request_http(url, [&](platform::Response *res) {
if (res->code != 200) {