grok.h: harmonize

GrokImageCompression · Feb 1, 2025 · b2f1f5c · b2f1f5c
1 parent d044b11
commit b2f1f5c
Show file tree

Hide file tree

Showing 4 changed files with 530 additions and 528 deletions.
diff --git a/bindings/rust/examples/initialize_grok.rs b/bindings/rust/examples/initialize_grok.rs
@@ -45,11 +45,11 @@ fn cleanup(grk_cparameters: *mut _grk_cparameters) {
 }
 
 fn initialize_grk() -> Result<(), GrokError> {
-    let num_workers = 0;  // Pass 0 for number of worker threads
+    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_workers, verbose);
+        grk_initialize(ptr::null(), num_threads, verbose);
     }
 
     Ok(())

diff --git a/src/lib/codec/jp2/GrkCompress.cpp b/src/lib/codec/jp2/GrkCompress.cpp
@@ -931,7 +931,7 @@ GrkRC GrkCompress::pluginMain(int argc, char* argv[], CompressInitParams* initPa
 #endif
    initParams->initialized = true;
    // load plugin but do not actually create codec
-   if(!grk_initialize(initParams->pluginPath, initParams->parameters.num_workers,
+   if(!grk_initialize(initParams->pluginPath, initParams->parameters.num_threads,
                       initParams->parameters.verbose))
    {
       return GrkRCFail;
@@ -1204,7 +1204,7 @@ GrkRC GrkCompress::parseCommandLine(int argc, char* argv[], CompressInitParams*
          parameters->rate_control_algorithm = (GRK_RATE_CONTROL_ALGORITHM)rateControlAlgorithm;
    }
    if(numThreadsOpt->count() > 0)
-      parameters->num_workers = numThreads;
+      parameters->num_threads = numThreads;
    if(deviceIdOpt->count() > 0)
       parameters->device_id = deviceId;
    if(durationOpt->count() > 0)

diff --git a/src/lib/codec/jp2/GrkDecompress.cpp b/src/lib/codec/jp2/GrkDecompress.cpp
@@ -832,7 +832,7 @@ GrkRC GrkDecompress::parseCommandLine(int argc, char* argv[], DecompressInitPara
    if(precisionOpt->count() > 0 && !parsePrecision(precision.c_str(), parameters))
       return GrkRCParseArgsFailed;
    if(numThreadsOpt->count() > 0)
-      parameters->num_workers = numThreads;
+      parameters->num_threads = numThreads;
    if(decodeRegionOpt->count() > 0)
    {
       size_t size_optarg = (size_t)strlen(decodeRegion.c_str()) + 1U;
@@ -984,7 +984,7 @@ GrkRC GrkDecompress::pluginMain(int argc, char* argv[], DecompressInitParams* in
 #endif
    initParams->initialized = true;
    // loads plugin but does not actually create codec
-   grk_initialize(initParams->pluginPath, initParams->parameters.num_workers,
+   grk_initialize(initParams->pluginPath, initParams->parameters.num_threads,
                   initParams->parameters.verbose);
 
    // create codec
@@ -1153,8 +1153,8 @@ bool GrkDecompress::encodeInit(grk_plugin_decompress_callback_info* info)
    else if(cod_format == GRK_FMT_JPG || cod_format == GRK_FMT_PNG)
       compression_level = parameters->compression_level;
    if(!imageFormat->encodeInit(info->image, outfileStr, compression_level,
-                               info->decompressor_parameters->num_workers
-                                   ? info->decompressor_parameters->num_workers
+                               info->decompressor_parameters->num_threads
+                                   ? info->decompressor_parameters->num_threads
                                    : std::thread::hardware_concurrency()))
    {
       spdlog::error("Outfile {} not generated", outfileStr);