Merge pull request #2788 from OSGeo/backport-2787-to-8.1

[Backport 8.1] GeoTIFF grid reading: perf improvements (fixes #2785)

1 files changed, 17 insertions, 6 deletions

diff --git a/src/log.cpp b/src/log.cpp
index 4a2cc73d..9c96f53a 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -46,25 +46,36 @@ void pj_stderr_logger( void *app_data, int level, const char *msg )
 }
 
 /************************************************************************/
-/*                               pj_vlog()                              */
+/*                           pj_log_active()                            */
 /************************************************************************/
 
-static
-void pj_vlog( PJ_CONTEXT *ctx, int level, const PJ* P, const char *fmt, va_list args )
-
+bool pj_log_active( PJ_CONTEXT *ctx, int level )
 {
-    char *msg_buf;
     int debug_level = ctx->debug_level;
     int shutup_unless_errno_set = debug_level < 0;
 
     /* For negative debug levels, we first start logging when errno is set */
     if (ctx->last_errno==0 && shutup_unless_errno_set)
-        return;
+        return false;
 
     if (debug_level < 0)
         debug_level = -debug_level;
 
     if( level > debug_level )
+        return false;
+    return true;
+}
+
+/************************************************************************/
+/*                               pj_vlog()                              */
+/************************************************************************/
+
+static
+void pj_vlog( PJ_CONTEXT *ctx, int level, const PJ* P, const char *fmt, va_list args )
+
+{
+    char *msg_buf;
+    if( !pj_log_active(ctx, level) )
         return;
 
     constexpr size_t BUF_SIZE = 100000;