Change all remaining oetf to transferFunction.

Author: MarkCallow

tools/imageio/formatdesc.h

@@ -203,7 +203,7 @@ struct FormatDescriptor {
                uint32_t bLength, uint32_t offset,
                khr_df_sample_datatype_qualifiers_e dataType
                   = static_cast<khr_df_sample_datatype_qualifiers_e>(0),
-               khr_df_transfer_e oetf = KHR_DF_TRANSFER_UNSPECIFIED,
+               khr_df_transfer_e tf = KHR_DF_TRANSFER_UNSPECIFIED,
                khr_df_model_e m = KHR_DF_MODEL_RGBSDA) {
             bitOffset = offset;
             bitLength = bLength - 1;
@@ -217,7 +217,7 @@ struct FormatDescriptor {
             qualifierSigned = (dataType & KHR_DF_SAMPLE_DATATYPE_SIGNED) != 0;
             qualifierExponent = (dataType & KHR_DF_SAMPLE_DATATYPE_EXPONENT) != 0;
             qualifierLinear = (dataType & KHR_DF_SAMPLE_DATATYPE_LINEAR) != 0;
-            if (oetf > KHR_DF_TRANSFER_LINEAR
+            if (tf > KHR_DF_TRANSFER_LINEAR
                 && channelType == KHR_DF_CHANNEL_RGBSDA_ALPHA) {
                 qualifierLinear = 1;
             }
@@ -266,9 +266,9 @@ struct FormatDescriptor {
                uint32_t sampleLower, uint32_t sampleUpper,
                khr_df_sample_datatype_qualifiers_e dataType
                   = static_cast<khr_df_sample_datatype_qualifiers_e>(0),
-               khr_df_transfer_e oetf = KHR_DF_TRANSFER_UNSPECIFIED,
+               khr_df_transfer_e tf = KHR_DF_TRANSFER_UNSPECIFIED,
                khr_df_model_e m = KHR_DF_MODEL_RGBSDA)
-               : sample(chanType, bitLength, offset, dataType, oetf, m)
+               : sample(chanType, bitLength, offset, dataType, tf, m)
         {
             if (qualifierFloat) {
                 throw std::runtime_error(

tools/imageio/image.hpp

@@ -685,8 +685,8 @@ class Image {
     uint32_t getWidth() const { return width; }
     uint32_t getHeight() const { return height; }
     uint32_t getPixelCount() const { return width * height; }
-    khr_df_transfer_e getOetf() const { return oetf; }
-    void setOetf(khr_df_transfer_e noetf) { this->oetf = noetf; }
+    khr_df_transfer_e getTransferFunction() const { return transferFunction; }
+    void setTransferFunction(khr_df_transfer_e tf) { transferFunction = tf; }
     khr_df_primaries_e getPrimaries() const { return primaries; }
     void setPrimaries(khr_df_primaries_e nprimaries) {
         this->primaries = nprimaries;
@@ -733,11 +733,11 @@ class Image {
   protected:
     Image() : Image(0, 0) { }
     Image(uint32_t w, uint32_t h)
-            : width(w), height(h), oetf(KHR_DF_TRANSFER_UNSPECIFIED),
+            : width(w), height(h), transferFunction(KHR_DF_TRANSFER_UNSPECIFIED),
               primaries(KHR_DF_PRIMARIES_BT709) { }
 
     uint32_t width, height;  // In pixels
-    khr_df_transfer_e oetf;
+    khr_df_transfer_e transferFunction;
     khr_df_primaries_e primaries;
 };
 
@@ -1113,7 +1113,7 @@ class ImageT : public Image {
         using namespace basisu;
 
         auto target = std::make_unique<ImageT<componentType, componentCount>>(targetWidth, targetHeight);
-        target->setOetf(oetf);
+        target->setTransferFunction(transferFunction);
         target->setPrimaries(primaries);
 
         const auto sourceWidth = width;
@@ -1149,7 +1149,7 @@ class ImageT : public Image {
 
         const TransferFunctionSRGB tfSRGB;
         const TransferFunctionLinear tfLinear;
-        const TransferFunction& tf = oetf == KHR_DF_TRANSFER_SRGB ?
+        const TransferFunction& tf = transferFunction == KHR_DF_TRANSFER_SRGB ?
                 static_cast<const TransferFunction&>(tfSRGB) :
                 static_cast<const TransferFunction&>(tfLinear);
 
@@ -1290,7 +1290,7 @@ class ImageT : public Image {
         assert(getComponentSize() == dst.getComponentSize());
         assert(width == dst.getWidth() && height == dst.getHeight());
 
-        dst.setOetf(oetf);
+        dst.setTransferFunction(transferFunction);
         dst.setPrimaries(primaries);
         for (size_t i = 0; i < getPixelCount(); i++) {
             uint32_t c;

tools/ktxtools_mainpage.md

@@ -42,7 +42,7 @@ The command-line syntax and semantics differ from the old tools including, but n
 * The `ktx validate` tool also supports validating KTX 2.0 files against the additional restrictions defined by the _KHR\_texture\_basisu_ extension. Use the `--gltf-basisu` command-line option to verify glTF and WebGL compatibility.
 * The new `ktx info` tool produces a unified and complete output of all metadata in KTX 2.0 files and can provide output in human readable text format or in JSON format (both formatted and minified options are available), as controlled by the `--format` command-line option.
 * The source repository also includes the JSON schemas that the JSON outputs of the `ktx info` and `ktx validate` tools comply to.
-* The `ktx create` tool takes an explicit Vulkan format argument (`--format`) instead of inferring the format based on the provided input files as `toktx`, and thus doesn't perform any implicit color-space conversions except gamma 2.2 to sRGB. Use the `--assign-oetf`, `--convert-oetf`, `--assign-primaries`, and the new `--convert-primaries` for fine grained control over color-space interpretation and conversion.
+* The `ktx create` tool takes an explicit Vulkan format argument (`--format`) instead of inferring the format based on the provided input files as `toktx`, and thus doesn't perform any implicit color-space conversions except gamma 2.2 to sRGB. Use the `--assign-tf`, `--convert-tf`, `--assign-primaries`, and the new `--convert-primaries` for fine grained control over color-space interpretation and conversion.
 * The `ktx create` tool does not support resizing or scaling like `toktx`, and, in general, does not perform any image transformations except the optional color-space conversion and mipmap generation options. Users should resize input images to the appropriate resolution before converting them to KTX 2.0 files.
 * The `ktx create` and `ktx extract` tools consume and produce, respectively, image file formats that best suit the used Vulkan format. In general, barring special cases, 8-bit and 16-bit normalized integer formats are imported from and exported to PNG files, while integer and floating point formats are imported from and exported to EXR files based on predefined rules. This may be extended in the future using additional command line options and in response to support for other image file formats.
 * The new tools and updated `libktx` support ZLIB supercompression besides the BasisLZ and Zstd supercompression schemes supported previously.

tools/toktx/toktx.cc

@@ -1103,7 +1103,7 @@ toktxApp::createImage(const targetImageSpec& target, ImageInput& in)
         }
     }
     image->setPrimaries((khr_df_primaries_e)target.format().primaries());
-    image->setOetf((khr_df_transfer_e)target.format().transfer());
+    image->setTransferFunction((khr_df_transfer_e)target.format().transfer());
 
     if (options.scale != 1.0f) {
         auto scaledWidth = image->getWidth() * options.scale;