updated opt names and values

- add generic GPUJPEG_VAL_TRUE and _FALSE (for the dec opt)
- for GPUJPEG_ENC_OPT_OUT accept GPUJPEG_ENC_OUT_VAL_PAGEABLE and
GPUJPEG_ENC_OUT_VAL_PINNED

refer to GH-97

Author: MartinPulec

libgpujpeg/gpujpeg_decoder.h

@@ -269,7 +269,7 @@ gpujpeg_decoder_get_image_info(uint8_t *image, size_t image_size, struct gpujpeg
 
 /// use RLE when writing TGA with gpujpeg_image_save_to_file (default is true), 0 or 1 please note that the option is
 /// global so it affects all decoder instances
-#define GPUJPEG_DECODER_OPT_TGA_RLE "dec_tga_rle"
+#define GPUJPEG_DEC_OPT_TGA_RLE_BOOL "dec_opt_tga_rle" ///< GPUJPEG_VAL_TRUE or GPUJPEG_VAL_FALSE
 /**
  * sets decoder option
  * @retval GPUJPEG_NOERR  option was sucessfully set

libgpujpeg/gpujpeg_encoder.h

@@ -214,8 +214,12 @@ GPUJPEG_API int
 gpujpeg_encoder_suggest_restart_interval(const struct gpujpeg_image_parameters* param_image,
                                          gpujpeg_sampling_factor_t subsampling, bool interleaved, int verbose);
 
-/// buffer returned from gpujpeg_encoder_encode() should be in pinned memory
-#define GPUJPEG_ENCODER_OPT_OUT_PINNED  "enc_out_pinned"
+#define GPUJPEG_ENCODER_OPT_OUT_PINNED  "enc_out_pinned" ///< deprecated - use GPUJPEG_ENC_OPT_OUT
+/// location of buffer returned from gpujpeg_encoder_encode()
+#define GPUJPEG_ENC_OPT_OUT          "enc_opt_out"
+#define GPUJPEG_ENC_OUT_VAL_PAGEABLE "enc_out_val_pageable"  ///< default
+#define GPUJPEG_ENC_OUT_VAL_PINNED   "enc_out_val_pinned"
+
 /**
  * sets encoder option
  * @retval GPUJPEG_NOERR  option was sucessfully set

libgpujpeg/gpujpeg_type.h

@@ -1,6 +1,6 @@
 /**
  * @file
- * Copyright (c) 2011-2024, CESNET
+ * Copyright (c) 2011-2025, CESNET
  * Copyright (c) 2011, Silicon Genome, LLC.
  *
  * All rights reserved.
@@ -76,6 +76,9 @@ extern "C" {
 #define GPUJPEG_ERR_RESTART_CHANGE              (-2)
 /// @}
 
+#define GPUJPEG_VAL_TRUE  "1"
+#define GPUJPEG_VAL_FALSE "0"
+
 /**
  * Color spaces for JPEG codec
  */

src/gpujpeg_decoder.c

@@ -485,12 +485,12 @@ gpujpeg_decoder_set_option(struct gpujpeg_decoder* decoder, const char *opt, con
     if ( decoder == NULL || opt == NULL || val == NULL ) {
         return GPUJPEG_ERROR;
     }
-    if ( strcmp(opt, GPUJPEG_DECODER_OPT_TGA_RLE) == 0 ) {
-        if ( (val[0] != '0' && val[0] != '1') || val[1] != '\0' ) {
-            ERROR_MSG("Unexpeceted value %s for " GPUJPEG_DECODER_OPT_TGA_RLE "\n", val);
+    if ( strcmp(opt, GPUJPEG_DEC_OPT_TGA_RLE_BOOL) == 0 ) {
+        if ( strcmp(val, GPUJPEG_VAL_TRUE) != 0 && strcmp(val, GPUJPEG_VAL_FALSE) != 0 ) {
+            ERROR_MSG("Unexpeceted value %s for " GPUJPEG_DEC_OPT_TGA_RLE_BOOL "\n", val);
             return GPUJPEG_ERROR;
         }
-        image_delegate_stbi_tga_set_rle(val[0] == '1');
+        image_delegate_stbi_tga_set_rle(strcmp(val, GPUJPEG_VAL_TRUE) == 0);
         return GPUJPEG_NOERR;
     }
     ERROR_MSG("Invalid decoder option: %s!\n", opt);

src/gpujpeg_encoder.c

@@ -652,12 +652,21 @@ gpujpeg_encoder_set_option(struct gpujpeg_encoder* encoder, const char *opt, con
     if ( encoder == NULL || opt == NULL || val == NULL ) {
         return GPUJPEG_ERROR;
     }
+    if ( strcmp(opt, GPUJPEG_ENC_OPT_OUT) == 0 ) {
+        if ( strcmp(val, GPUJPEG_ENC_OUT_VAL_PAGEABLE) != 0 && strcmp(val, GPUJPEG_ENC_OUT_VAL_PINNED) != 0 ) {
+            ERROR_MSG("Unexpeceted value %s for " GPUJPEG_ENC_OPT_OUT "\n", val);
+            return GPUJPEG_ERROR;
+        }
+        encoder->writer->buffer_pinned = strcmp(val, GPUJPEG_ENC_OUT_VAL_PINNED) == 0;
+        return GPUJPEG_NOERR;
+    }
     if ( strcmp(opt, GPUJPEG_ENCODER_OPT_OUT_PINNED) == 0 ) {
-        if ( (val[0] != '0' && val[0] != '1') || val[1] != '\0' ) {
+        WARN_MSG("deprecated, use GPUJPEG_ENC_OUT_VAL_PAGEABLE (" GPUJPEG_ENC_OUT_VAL_PAGEABLE ") instead!\n");
+        if ( strcmp(val, GPUJPEG_VAL_TRUE) != 0 && strcmp(val, GPUJPEG_VAL_FALSE) != 0 ) {
             ERROR_MSG("Unexpeceted value %s for " GPUJPEG_ENCODER_OPT_OUT_PINNED "\n", val);
             return GPUJPEG_ERROR;
         }
-        encoder->writer->buffer_pinned = val[0] == '1';
+        encoder->writer->buffer_pinned = strcmp(val, GPUJPEG_VAL_TRUE) == 0;
         return GPUJPEG_NOERR;
     }
     ERROR_MSG("Invalid encoder option: %s!\n", opt);