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

Add clang-format (#1086)

Browse Source 
Co-authored-by: mwilsnd <mwilsnd@gmail.com>
This commit is contained in:
Bart Louwers
2023-05-01 16:57:37 +02:00
committed by GitHub
parent 403a12bd1b
commit 71f6da2722
1018 changed files with 27876 additions and 25862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
platform/android/src/test/test_runner_common.cpp
View File

@@ -27,7 +27,9 @@ int severityToPriority(EventSeverity severity) {
template <class T>
class JavaWrapper {
public:
JavaWrapper(JNIEnv* env_, T obj_) : env(env_), obj(obj_) {}
JavaWrapper(JNIEnv* env_, T obj_)
: env(env_),
obj(obj_) {}
~JavaWrapper() {
env->DeleteLocalRef(obj);
env = nullptr;
@@ -115,8 +117,7 @@ bool copyFile(JNIEnv* env,
} else {
auto res = static_cast<off_t>(std::fwrite(fileData, sizeof(char), fileLen, newFile.get()));
if (fileLen != res) {
mbgl::Log::Warning(
mbgl::Event::General, "Failed to generate file entry" + fileName + "from assets");
mbgl::Log::Warning(mbgl::Event::General, "Failed to generate file entry" + fileName + "from assets");
}
}
}
@@ -179,22 +180,21 @@ void unZipFile(JNIEnv* env, const std::string& zipFilePath, const std::string& d
if (!(env->CallBooleanMethod(f, fileIsDirectory))) {
jmethodID mkdirs = env->GetMethodID(fileClass, "mkdirs", "()Z");
bool success = (env->CallBooleanMethod(f, mkdirs));
std::string fileNameStr =
jstringToStdString(env, static_cast<jstring>(env->CallObjectMethod(f, fileGetName)));
std::string fileNameStr = jstringToStdString(
env, static_cast<jstring>(env->CallObjectMethod(f, fileGetName)));
if (!success) {
mbgl::Log::Warning(
mbgl::Event::General, "Failed to create folder entry " + fileNameStr + " from zip");
mbgl::Log::Warning(mbgl::Event::General,
"Failed to create folder entry " + fileNameStr + " from zip");
}
}
} else if (!(env->CallBooleanMethod(f, fileExists))) {
bool success = env->CallBooleanMethod(f, createNewFile);
std::string fileNameStr =
jstringToStdString(env, static_cast<jstring>(env->CallObjectMethod(f, fileGetName)));
std::string fileNameStr = jstringToStdString(env,
static_cast<jstring>(env->CallObjectMethod(f, fileGetName)));
if (!success) {
mbgl::Log::Warning(
mbgl::Event::General, "Failed to create folder entry" + fileNameStr + "from zip");
mbgl::Log::Warning(mbgl::Event::General, "Failed to create folder entry" + fileNameStr + "from zip");
continue;
}