Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/third_party/jpeg-xl/lib/extras/dec/color_hints.cc b/third_party/jpeg-xl/lib/extras/dec/color_hints.cc
index 5c6d7b84a0..b1edd9f6ea 100644
--- a/third_party/jpeg-xl/lib/extras/dec/color_hints.cc
+++ b/third_party/jpeg-xl/lib/extras/dec/color_hints.cc
@@ -43,20 +43,21 @@ Status ApplyColorHints(const ColorHints& color_hints,
         } else if (key == "icc") {
           const uint8_t* data = reinterpret_cast<const uint8_t*>(value.data());
           std::vector<uint8_t> icc(data, data + value.size());
-          ppf->icc.swap(icc);
+          ppf->icc = std::move(icc);
+          ppf->primary_color_representation = PackedPixelFile::kIccIsPrimary;
           got_color_space = true;
         } else if (key == "exif") {
           const uint8_t* data = reinterpret_cast<const uint8_t*>(value.data());
           std::vector<uint8_t> blob(data, data + value.size());
-          ppf->metadata.exif.swap(blob);
+          ppf->metadata.exif = std::move(blob);
         } else if (key == "xmp") {
           const uint8_t* data = reinterpret_cast<const uint8_t*>(value.data());
           std::vector<uint8_t> blob(data, data + value.size());
-          ppf->metadata.xmp.swap(blob);
+          ppf->metadata.xmp = std::move(blob);
         } else if (key == "jumbf") {
           const uint8_t* data = reinterpret_cast<const uint8_t*>(value.data());
           std::vector<uint8_t> blob(data, data + value.size());
-          ppf->metadata.jumbf.swap(blob);
+          ppf->metadata.jumbf = std::move(blob);
         } else {
           JXL_WARNING("Ignoring %s hint", key.c_str());
         }