tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Browse Source 
Conflicts:
	platform/default/glfw_view.cpp
	platform/default/headless_view.cpp
	src/mbgl/map/map.cpp
This commit is contained in:
Leith Bade
2014-12-23 11:33:26 +13:00
parent b5483d3e81 7eaa4fabde
commit ff3ea3e20b
9 changed files with 158 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mbgl/map/map.cpp
View File

@@ -38,7 +38,7 @@
#endif
// Check libuv library version.
const static bool uv_version_check = []() {
const static bool uvVersionCheck = []() {
const unsigned int version = uv_version();
const unsigned int major = (version >> 16) & 0xFF;
const unsigned int minor = (version >> 8) & 0xFF;
@@ -60,7 +60,7 @@ const static bool uv_version_check = []() {
#include <zlib.h>
// Check zlib library version.
const static bool zlib_version_check = []() {
const static bool zlibVersionCheck = []() {
const char *const version = zlibVersion();
if (version[0] != ZLIB_VERSION[0]) {
throw std::runtime_error(mbgl::util::sprintf<96>(
@@ -73,7 +73,7 @@ const static bool zlib_version_check = []() {
#include <sqlite3.h>
// Check sqlite3 library version.
const static bool sqlite_version_check = []() {
const static bool sqliteVersionCheck = []() {
if (sqlite3_libversion_number() != SQLITE_VERSION_NUMBER) {
throw std::runtime_error(mbgl::util::sprintf<96>(
"sqlite3 libversion mismatch: headers report %d, but library reports %d",
@@ -320,7 +320,7 @@ void Map::run() {
void Map::checkForPause() {
std::unique_lock<std::mutex> lockRun (mutexRun);
while (pausing) {
view.make_inactive();
view.deactivate();
mutexPause.lock();
isPaused = true;
@@ -329,7 +329,7 @@ void Map::checkForPause() {
condRun.wait(lockRun);
view.make_active();
view.activate();
}
mutexPause.lock();
@@ -372,7 +372,7 @@ void Map::terminate() {
void Map::setup() {
assert(std::this_thread::get_id() == mapThread);
assert(painter);
view.make_active();
view.activate();
painter->setup();
}