treewide: fix whitespace
All checks were successful
Check flake / build-amd64-linux (push) Successful in 3m12s
All checks were successful
Check flake / build-amd64-linux (push) Successful in 3m12s
This commit is contained in:
@ -16,7 +16,7 @@ index f4e0b633..6d5bbd05 100644
|
||||
@@ -131,22 +131,6 @@ IPAManager::IPAManager()
|
||||
<< "No IPA found in '" << modulePaths << "'";
|
||||
}
|
||||
|
||||
|
||||
- /*
|
||||
- * When libcamera is used before it is installed, load IPAs from the
|
||||
- * same build directory as the libcamera library itself.
|
||||
@ -35,7 +35,7 @@ index f4e0b633..6d5bbd05 100644
|
||||
-
|
||||
/* Finally try to load IPAs from the installed system path. */
|
||||
ipaCount += addDir(IPA_MODULE_DIR);
|
||||
|
||||
|
||||
diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp
|
||||
index 69975d8f..cd9284a3 100644
|
||||
--- a/src/libcamera/ipa_proxy.cpp
|
||||
@ -43,7 +43,7 @@ index 69975d8f..cd9284a3 100644
|
||||
@@ -122,33 +122,11 @@ std::string IPAProxy::configurationFile(const std::string &name,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
- std::string root = utils::libcameraSourcePath();
|
||||
- if (!root.empty()) {
|
||||
- /*
|
||||
@ -74,12 +74,12 @@ index 69975d8f..cd9284a3 100644
|
||||
- return confPath;
|
||||
- }
|
||||
}
|
||||
|
||||
|
||||
if (fallbackName.empty()) {
|
||||
@@ -197,28 +175,6 @@ std::string IPAProxy::resolvePath(const std::string &file) const
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
- /*
|
||||
- * When libcamera is used before it is installed, load proxy workers
|
||||
- * from the same build directory as the libcamera directory itself.
|
||||
@ -112,7 +112,7 @@ index 5ea2ca78..fd8555ca 100644
|
||||
@@ -561,25 +561,8 @@ std::string PipelineHandler::configurationFile(const std::string &subdir,
|
||||
struct stat statbuf;
|
||||
int ret;
|
||||
|
||||
|
||||
- std::string root = utils::libcameraSourcePath();
|
||||
- if (!root.empty()) {
|
||||
- /*
|
||||
@ -134,9 +134,8 @@ index 5ea2ca78..fd8555ca 100644
|
||||
- }
|
||||
+ confPath = std::string(LIBCAMERA_DATA_DIR)
|
||||
+ + "/pipeline/" + subdir + '/' + name;
|
||||
|
||||
|
||||
ret = stat(confPath.c_str(), &statbuf);
|
||||
if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
|
||||
--
|
||||
--
|
||||
2.44.1
|
||||
|
||||
|
Reference in New Issue
Block a user