Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from OSGeo:master #55

Merged
merged 1 commit into from
Jan 8, 2025
Merged

[pull] master from OSGeo:master #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/gdalalg_abstract_pipeline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,14 @@ template <class StepAlgorithm>
std::string GDALAbstractPipelineAlgorithm<StepAlgorithm>::GetUsageAsJSON() const
{
CPLJSONDocument oDoc;
oDoc.LoadMemory(GDALAlgorithm::GetUsageAsJSON());
CPL_IGNORE_RET_VAL(oDoc.LoadMemory(GDALAlgorithm::GetUsageAsJSON()));

CPLJSONArray jPipelineSteps;
for (const std::string &name : m_stepRegistry.GetNames())
{
auto alg = GetStepAlg(name);
CPLJSONDocument oStepDoc;
oStepDoc.LoadMemory(alg->GetUsageAsJSON());
CPL_IGNORE_RET_VAL(oStepDoc.LoadMemory(alg->GetUsageAsJSON()));
jPipelineSteps.Add(oStepDoc.GetRoot());
}
oDoc.GetRoot().Add("pipeline_algorithms", jPipelineSteps);
Expand Down
11 changes: 3 additions & 8 deletions frmts/libertiff/libertiffdataset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,11 @@ struct LIBERTIFFDatasetFileReader final : public LIBERTIFF_NS::FileReader

uint64_t size() const override
{
// coverity[missing_lock,lock_evasion]
std::lock_guard oLock(m_oMutex);
if (m_nFileSize == 0)
{
std::lock_guard oLock(m_oMutex);
// cppcheck-suppress identicalInnerCondition
if (m_nFileSize == 0)
{
m_fp->Seek(0, SEEK_END);
m_nFileSize = m_fp->Tell();
}
m_fp->Seek(0, SEEK_END);
m_nFileSize = m_fp->Tell();
}
return m_nFileSize;
}
Expand Down
Loading