diff options
author | Leith Bade <leith@mapbox.com> | 2014-11-22 21:40:49 +1100 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2014-11-22 21:40:49 +1100 |
commit | a438459e3b0b46d7d532d815e5ee99b9b6f5d8a7 (patch) | |
tree | 0660a90dc814a14045fb189c4540a8e218a48baf /platform/android | |
parent | 67f2996fbc49e781d7babb8a053e00e71403dc6f (diff) | |
download | qtlocation-mapboxgl-a438459e3b0b46d7d532d815e5ee99b9b6f5d8a7.tar.gz |
Rewrite EGL config choosing
Diffstat (limited to 'platform/android')
-rw-r--r-- | platform/android/asset_request_baton.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/platform/android/asset_request_baton.cpp b/platform/android/asset_request_baton.cpp index a0349b9f6a..84909a50e7 100644 --- a/platform/android/asset_request_baton.cpp +++ b/platform/android/asset_request_baton.cpp @@ -77,8 +77,7 @@ void AssetRequestBaton::run(uv_async_t *async) { } struct zip_stat stat; - if ((zip_stat(ptr->apk, apk_file_path.c_str(), ZIP_FL_NOCASE, &stat) != 0) || - ptr->canceled || !ptr->request) { + if ((zip_stat(ptr->apk, apk_file_path.c_str(), ZIP_FL_NOCASE, &stat) != 0) || ptr->canceled || !ptr->request) { // Stating failed or was canceled. We already have an open file handle // though, which we'll have to close. notify_error(async, 500, zip_strerror(ptr->apk)); @@ -92,8 +91,7 @@ void AssetRequestBaton::run(uv_async_t *async) { const std::unique_ptr<char[]> data = boost::make_unique<char[]>(stat.size); - if (static_cast<zip_uint64_t>(zip_fread(ptr->apk_file, reinterpret_cast<void *>(data.get()), stat.size)) != stat.size || - ptr->canceled || !ptr->request) { + if (static_cast<zip_uint64_t>(zip_fread(ptr->apk_file, reinterpret_cast<void *>(data.get()), stat.size)) != stat.size || ptr->canceled || !ptr->request) { // Reading failed or was canceled. We already have an open file handle // though, which we'll have to close. notify_error(async, 500, zip_file_strerror(ptr->apk_file)); |