oiiotool --iccread and --iccwrite

--iccread reads a named file and directly adds its contents as the
"ICCProfile" metadata of the top image (as a byte array).

--iccwrite takes the "ICCProfile" metadata of the top image and
writes it to a named file.

Author: lgritz

src/doc/oiiotool.rst

@@ -4200,6 +4200,21 @@ bottom you will see the list of all color spaces, looks, and displays that
         Include/exclude subimages (see :ref:`sec-oiiotool-subimage-modifier`).
 
 
+.. option:: --iccread <filename>
+
+    The `--iccread` command adds an `"ICCProfile"` attribute to the top image,
+    as a byte array consisting of the entire contents of the named file.
+
+    This was added to OpenImageIO 2.5.
+
+.. option:: --iccwrite <filename>
+
+    Extract the `"ICCProfile"` attribute from the top image and writing it to
+    the named file.
+
+    This was added to OpenImageIO 2.5.
+
+
 |
 
 :program:`oiiotool` commands for deep images

src/oiiotool/oiiotool.cpp

@@ -2436,6 +2436,84 @@ set_full_to_pixels(int argc, const char* argv[])
 
 
 
+// --iccwrite  (output extracted ICC profile)
+static void
+icc_write(cspan<const char*> argv)
+{
+    OIIO_DASSERT(argv.size() == 2);
+    if (ot.postpone_callback(1, icc_write, argv))
+        return;
+    string_view command  = ot.express(argv[0]);
+    std::string filename = ot.express(argv[1]);
+    OTScopedTimer timer(ot, command);
+    // auto options      = ot.extract_options(command);
+    // bool allsubimages = options.get_int("allsubimages", ot.allsubimages);
+
+    ot.read();
+    ImageRecRef A = ot.curimg;
+    ImageSpec& spec(*A->spec(0));
+    const ParamValue* icc = spec.find_attribute("ICCProfile");
+    if (icc) {
+        bool ok = Filesystem::write_binary_file(
+            filename, cspan<char>((const char*)icc->data(), icc->datasize()));
+        if (!ok) {
+            ot.errorfmt(command, "Could not write ICC profile to {}", filename);
+        }
+    } else {
+        ot.errorfmt(command, "No ICC profile found in image.", A->name());
+    }
+    ot.num_outputs += 1;
+}
+
+
+
+// --iccread
+static void
+icc_read(cspan<const char*> argv)
+{
+    OIIO_DASSERT(argv.size() == 2);
+    if (ot.postpone_callback(1, icc_read, argv))
+        return;
+    string_view command  = ot.express(argv[0]);
+    std::string filename = ot.express(argv[1]);
+    OTScopedTimer timer(ot, command);
+    auto options      = ot.extract_options(command);
+    bool allsubimages = options.get_int("allsubimages", ot.allsubimages);
+
+    if (!Filesystem::exists(filename)) {
+        ot.errorfmt(command, "ICC profile file {} does not exist", filename);
+        return;
+    }
+    size_t len = Filesystem::file_size(filename);
+
+    // Validity check: ICC profiles have a 128 byte header, and we also
+    // presume they are no more than 64k, so file outside that range should
+    // be rejected. (Is that a fair assumption?)
+    if (len < 1 || len >= 64 * 1024 * 1024) {
+        ot.errorfmt(command, "File {} is not a valid ICC profile", filename);
+        return;
+    }
+
+    std::unique_ptr<char[]> icc(new char[len]);
+    size_t size = Filesystem::read_bytes(filename, icc.get(), len);
+    if (size != len) {
+        ot.errorfmt(command, "Could not read ICC profile from {}", filename);
+        return;
+    }
+
+    ot.read();
+    ImageRecRef A = ot.curimg;
+    int subimages = allsubimages ? A->subimages() : 1;
+    for (int s = 0; s < subimages; ++s) {
+        (*A)(s).specmod().attribute("ICCProfile",
+                                    TypeDesc(TypeDesc::UINT8, len), icc.get());
+        A->update_spec_from_imagebuf(s);
+    }
+    A->metadata_modified(true);
+}
+
+
+
 // --colorconfig
 static int
 set_colorconfig(int argc, const char* argv[])
@@ -6596,6 +6674,12 @@ Oiiotool::getargs(int argc, char* argv[])
     ap.arg("--repremult")
       .help("Multiply all color channels of the current image by the alpha, but don't crush alpha=0 pixels to black.")
       .action(action_repremult);
+    ap.arg("--iccwrite %s:FILENAME")
+      .help("Output the current image's ICC profile as a separate file")
+      .action(icc_write);
+    ap.arg("--iccread %s:FILENAME")
+      .help("Add the contents of the file to the top image as its ICC profile")
+      .action(icc_read);
     // clang-format on
 
     if (ap.parse_args(argc, (const char**)argv) < 0) {

testsuite/oiiotool-attribs/ref/out-jpeg9d.txt

@@ -109,3 +109,16 @@ attrib0.exr          :   64 x   64, 3 channel, half openexr
     oiio:subimagename: "subimage01"
     oiio:subimages: 2
     openexr:chunkCount: 4
+Reading tahoe-icc.jpg
+tahoe-icc.jpg        :  128 x   96, 3 channel, uint8 jpeg
+    SHA-1: 9119399610EF6CACDAD0EBAF4D663E4EDEF70B58
+    channel list: R, G, B
+    ICCProfile: 0, 0, 12, 72, 76, 105, 110, 111, 2, 16, 0, 0, 109, 110, 116, 114, ... [3144 x uint8]
+    Orientation: 1 (normal)
+    ResolutionUnit: "in"
+    XResolution: 72
+    YResolution: 72
+    Exif:ExifVersion: "0230"
+    Exif:FlashPixVersion: "0100"
+    jpeg:subsampling: "4:2:0"
+    oiio:ColorSpace: "sRGB"

testsuite/oiiotool-attribs/ref/out.txt

@@ -109,3 +109,16 @@ attrib0.exr          :   64 x   64, 3 channel, half openexr
     oiio:subimagename: "subimage01"
     oiio:subimages: 2
     openexr:chunkCount: 4
+Reading tahoe-icc.jpg
+tahoe-icc.jpg        :  128 x   96, 3 channel, uint8 jpeg
+    SHA-1: BC4C6090E793819E1A2869AAA8FBEE3587CC6947
+    channel list: R, G, B
+    ICCProfile: 0, 0, 12, 72, 76, 105, 110, 111, 2, 16, 0, 0, 109, 110, 116, 114, ... [3144 x uint8]
+    Orientation: 1 (normal)
+    ResolutionUnit: "in"
+    XResolution: 72
+    YResolution: 72
+    Exif:ExifVersion: "0230"
+    Exif:FlashPixVersion: "0100"
+    jpeg:subsampling: "4:2:0"
+    oiio:ColorSpace: "sRGB"

testsuite/oiiotool-attribs/ref/srgb.icc

@@ -25,3 +25,13 @@
 command += oiiotool ("attrib2.exr " +
                      "--eraseattrib:allsubimages=1 foo -d half -o attrib0.exr")
 command += info_command ("attrib0.exr", safematch=True)
+
+# Test adding and extracting ICC profiles
+command += oiiotool ("../common/tahoe-tiny.tif --iccread ref/srgb.icc -o tahoe-icc.jpg")
+command += info_command ("tahoe-icc.jpg", safematch=True)
+command += oiiotool ("tahoe-icc.jpg --iccwrite srgb.icc")
+
+outputs = [
+            "srgb.icc",
+            "out.txt"
+]