grok.h: update

Author: Grok Compression

bindings/rust/examples/initialize_grok.rs

@@ -46,10 +46,8 @@ fn cleanup(grk_cparameters: *mut _grk_cparameters) {
 
 fn initialize_grk() -> Result<(), GrokError> {
     let num_threads = 0;  // Pass 0 for number of worker threads
-    let verbose = true;   // Example: set verbose to true
-
     unsafe {
-        grk_initialize(ptr::null(), num_threads, verbose);
+        grk_initialize(ptr::null(), num_threads);
     }
 
     Ok(())

examples/core/core_compress.cpp

@@ -80,7 +80,7 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char** argv)
    bool useCallbacks = true;
 
    // initialize library
-   grk_initialize(nullptr, 0, true);
+   grk_initialize(nullptr, 0);
 
    grk_stream_params streamParams = {};
    WriteStreamInfo sinfo(&streamParams);

examples/core/core_decompress.cpp

@@ -155,7 +155,7 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char** argv)
    grk_object* codec = nullptr;
 
    // initialize library
-   grk_initialize(nullptr, 0, true);
+   grk_initialize(nullptr, 0);
 
    // create j2k file stream
    inputFileStr = inputFilePath.c_str();

src/lib/codec/common/common.cpp

@@ -27,7 +27,6 @@
 #define strcasecmp _stricmp
 #endif
 
-#include "spdlog/spdlog.h"
 #include "common.h"
 
 namespace grk
@@ -387,5 +386,70 @@ void infoCallback(const char* msg, [[maybe_unused]] void* client_data)
 {
 	spdlog::default_logger()->info(msg);
 }
+void debugCallback(const char* msg, [[maybe_unused]] void* client_data)
+{
+  spdlog::default_logger()->debug(msg);
+}
+
+void traceCallback(const char* msg, [[maybe_unused]] void* client_data)
+{
+  spdlog::default_logger()->trace(msg);
+}
+
+
+// Configuration function
+void configureLogging(const std::string& logfile) {
+  // Step 1: Set up the logger
+  std::shared_ptr<spdlog::logger> logger;
+  if (!logfile.empty()) {
+    logger = spdlog::basic_logger_mt("grk", logfile); // File logger
+  } else {
+    // Console logger with color
+    auto sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
+    logger = std::make_shared<spdlog::logger>("grk", sink);
+  }
+  spdlog::set_default_logger(logger);
+
+  // Step 2: Determine log level
+  spdlog::level::level_enum log_level = spdlog::level::err; // Default to errors only
+
+  const char* debug_env = std::getenv("GRK_DEBUG");
+  if (debug_env) {
+    int level = std::atoi(debug_env);
+    switch (level) {
+      case 0: log_level = spdlog::level::off; break;
+      case 1: log_level = spdlog::level::err; break;
+      case 2: log_level = spdlog::level::warn; break;
+      case 3: log_level = spdlog::level::info; break;
+      case 4: log_level = spdlog::level::debug; break;
+      case 5: log_level = spdlog::level::trace; break;
+      default:
+        if (level > 5) log_level = spdlog::level::trace; // Cap at trace
+        break;
+    }
+  } else {
+    log_level = spdlog::level::off;
+  }
+  spdlog::set_level(log_level);
+  spdlog::set_pattern("[%Y-%m-%d %H:%M:%S.%e] [%^%l%$] %v");
+
+  // Step 3: Set up grk_msg_handlers
+  grk_msg_handlers handlers = {
+    infoCallback,
+    nullptr,
+    debugCallback,
+    nullptr,
+   traceCallback,
+    nullptr,
+     warningCallback,
+    nullptr,
+    errorCallback, // Always active
+    nullptr
+  };
+
+  grk_set_msg_handlers(handlers);
+
+}
+
 
 } // namespace grk

src/lib/codec/common/common.h

@@ -32,6 +32,15 @@
 #endif /* _WIN32 */
 #include <chrono>
 
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsign-conversion"
+#include "spdlog/spdlog.h"
+#include <spdlog/sinks/basic_file_sink.h> // Required for basic_logger_mt
+#include <spdlog/sinks/stdout_color_sinks.h>
+#pragma GCC diagnostic pop
+
+
 #include "grok.h"
 #include "Serializer.h"
 

src/lib/codec/image_format/BMPFormat.cpp

@@ -21,7 +21,6 @@
 #include <cstdio>
 #include <cstdlib>
 #include "grk_apps_config.h"
-#include "spdlog/spdlog.h"
 #include "grok.h"
 #include "BMPFormat.h"
 #include "convert.h"

src/lib/codec/image_format/FileStreamIO.cpp

@@ -17,7 +17,6 @@
  */
 
 #include <FileStreamIO.h>
-#include "spdlog/spdlog.h"
 #include "common.h"
 
 FileStreamIO::FileStreamIO() : fileHandle_(nullptr) {}

src/lib/codec/image_format/ImageFormat.cpp

@@ -16,8 +16,6 @@
 
 #include "ImageFormat.h"
 #include "convert.h"
-#include <algorithm>
-#include "spdlog/spdlog.h"
 #include "common.h"
 #include "FileStreamIO.h"
 

src/lib/codec/image_format/JPEGFormat.cpp

@@ -18,7 +18,6 @@
 #include <cstdlib>
 #include "grk_apps_config.h"
 #include "grok.h"
-#include "spdlog/spdlog.h"
 #include "JPEGFormat.h"
 #include "convert.h"
 #include <cstring>

src/lib/codec/image_format/PGXFormat.cpp

@@ -30,7 +30,6 @@
 #include <cstdlib>
 #include "grk_apps_config.h"
 #include "grok.h"
-#include "spdlog/spdlog.h"
 #include "PGXFormat.h"
 #include "convert.h"
 #include <cstring>