Make CoverityScan happy

Author: rouault

apps/gdalalg_raster_tile.cpp

@@ -1588,14 +1588,15 @@ template <class Resource> class ResourceManager /* non final */
 
     const std::string &GetErrorMsg() const
     {
+        std::lock_guard oLock(m_oMutex);
         return m_errorMsg;
     }
 
   protected:
     virtual std::unique_ptr<Resource> CreateResources() = 0;
 
   private:
-    std::mutex m_oMutex{};
+    mutable std::mutex m_oMutex{};
     std::vector<std::unique_ptr<Resource>> m_oResources{};
     std::string m_errorMsg{};
 };
@@ -1929,9 +1930,8 @@ bool GDALRasterTileAlgorithm::RunImpl(GDALProgressFunc pfnProgress,
             m_tileSize = 256;
         if (m_maxZoomLevel < 0)
         {
-            m_maxZoomLevel = static_cast<int>(std::ceil(std::log2(std::max(
-                1.0, static_cast<double>(std::max(nSrcWidth, nSrcHeight) /
-                                         m_tileSize)))));
+            m_maxZoomLevel = static_cast<int>(std::ceil(std::log2(
+                std::max(1, std::max(nSrcWidth, nSrcHeight) / m_tileSize))));
         }
         if (bHasNorthUpSrcGT)
         {

port/cpl_worker_thread_pool.cpp

@@ -210,14 +210,15 @@ bool CPLWorkerThreadPool::SubmitJob(std::function<void()> task)
 
         {
             std::lock_guard<std::mutex> oGuardWT(psWorkerThread->m_mutex);
-            // coverity[ uninit_use_in_call]
+            // coverity[uninit_use_in_call]
             oGuard.unlock();
             psWorkerThread->m_cv.notify_one();
         }
 
         CPLFree(psToFree);
     }
 
+    // coverity[double_unlock]
     return true;
 }
 
@@ -300,7 +301,7 @@ bool CPLWorkerThreadPool::SubmitJobs(CPLThreadFunc pfnFunc,
 #endif
             {
                 std::lock_guard<std::mutex> oGuardWT(psWorkerThread->m_mutex);
-                // coverity[ uninit_use_in_call]
+                // coverity[uninit_use_in_call]
                 oGuard.unlock();
                 psWorkerThread->m_cv.notify_one();
             }
@@ -453,9 +454,9 @@ void CPLWorkerThreadPool::DeclareJobFinished()
 std::function<void()>
 CPLWorkerThreadPool::GetNextJob(CPLWorkerThread *psWorkerThread)
 {
+    std::unique_lock<std::mutex> oGuard(m_mutex);
     while (true)
     {
-        std::unique_lock<std::mutex> oGuard(m_mutex);
         if (eState == CPLWTS_STOP)
             return std::function<void()>();
 
@@ -505,6 +506,7 @@ CPLWorkerThreadPool::GetNextJob(CPLWorkerThread *psWorkerThread)
         oGuard.unlock();
         // coverity[wait_not_in_locked_loop]
         psWorkerThread->m_cv.wait(oGuardThisThread);
+        oGuard.lock();
     }
 }