From c21b50d699bdbb43d499482dfe412f8a77697782 Mon Sep 17 00:00:00 2001
From: Mirco Miranda <mirco.miranda@systemceramics.com>
Date: Fri, 10 Jul 2026 15:35:38 +0200
Subject: [PATCH] EXIF: add support for Windows Explorer tags

---
 README.md                             |   3 +
 autotests/read/jxl/gimp_exif.jxl      | Bin 14497 -> 11426 bytes
 autotests/read/jxl/gimp_exif.jxl.json |   8 +++
 autotests/read/jxr/metadata.jxr       | Bin 92860 -> 87207 bytes
 autotests/read/jxr/metadata.jxr.json  |   8 +++
 autotests/write/basic/jxl.json        |   8 +++
 autotests/write/basic/jxr.json        |   4 ++
 src/imageformats/jxr.cpp              |  11 +++
 src/imageformats/microexif.cpp        |  97 ++++++++++++++++++++++++--
 src/imageformats/microexif_p.h        |  23 +++++-
 src/imageformats/util_p.h             |   2 +
 11 files changed, 159 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 6b37ef4..4110b14 100644
--- a/README.md
+++ b/README.md
@@ -146,6 +146,7 @@ About the image:
   scanned.
 - `HostComputer`: The computer and/or operating system in use at the time 
   of image creation.
+- `Keywords`: Keywords, separated by semicolons, that represent the image.
 - `Latitude`: Floating-point number indicating the latitude in degrees 
   north of the equator (e.g. 27.717).
 - `Longitude`: Floating-point number indicating the longitude in degrees 
@@ -154,6 +155,8 @@ About the image:
   without milliseconds (e.g. 2024-03-23T15:30:43). This value should be 
   updated every time the image is saved.
 - `Owner`: Name of the owner of the image.
+- `Rating`: Integer number indicating the image rating (usually between 1 
+  and 5).
 - `Software`: Name and version number of the software package(s) used to 
   create the image.
 - `Speed`: Floating-point number indicating the speed of GPS receiver 
diff --git a/autotests/read/jxl/gimp_exif.jxl b/autotests/read/jxl/gimp_exif.jxl
index 2ca161118a43d8e1dd04b348529eb54d788d0936..98edab09141d38b22366d8ffe28d869cbc85aefe 100644
GIT binary patch
delta 541
zcmV+&0^<FlaiUqUkt%<qVsdX{MR;ju8|wf7gom%Cd;cz>mAZSBCTkNqD8}Oq6NN+~
zBt`%_IE91YiHClJtSAmB@D%m%3(Gced%K|xT|`ZsGl<<4Q7X~IK$L$Pn20*xn1mm!
zaV(Le(2HMGQ5eD>uC7H5w+#1aeuX~#3%9xGAEkk%iT-kZ`}lt{x3`ma()QbVMU|?9
z)09us!CX$K`S>&+`q1$1%%>~^0004TVsdX{cx`MT8zut)<j~FL+OSif;E>t}dl6d$
z7sMM<o!7T<e9Ik(hVaXtqn4$4TidPH+LAQVnn#fa9%~LkZF7)@DI<Fin}VP|X1Uvn
z`Y98V$HKU<$Nzs{e`6^|d;BrIQ}3!17R8r)&R+KSul_#u4{+={ou;)V+q}w|pwc$a
zikfWg9>vmQq^L>G1cjbsaSX`w>AAGcv!W&(1G^UqQ4xU6W}|EjrQ{)K2L}hB>Y(c~
z$3U)kg`iuxsQW>X%OQzlK&V%)gxy=MVk7|#rXJ!{_Nae>vZf)GDH@uLhJo{`w$KC3
z>xoq8D_B-5o+%{{0et{=1Dc{i&#}-a*Sb^F$27DCJcl5QofMe`ed!lAn#Qo&!09v_
zjfMq6Y5;<wptBsA`0>7bj7m}FXp36ON8xJ(@QsNRpeZW!9Bbl^+|pXyu-&HQ_<8r3
f<$LIIv?Ud2GE}K?EU4+u=`{C+&kD51o3ZNv6lV_Q

delta 3636
zcmeHKPmkL~6i-@^;D9O+5>mNX(;iA;;{T34s#}$0+eRX=+Kqr7$1~%^tpC+^Hr~CM
zBS-iKz$f6&0lpDmfj5rh?5-+t%z;fbndk9ue($~C^Bcv#zy9sbAHO_q{ywUsZ~&j#
z?D60|nBN}^hVKl9atVHhSL{2(yMw#1d<o+tuq8&0`@?tJ`A4un?d+exe$-*)9({Oc
za1Z96VHjY44D+ur8W`YKen0$VFyL_Y@cwpwIh!9V=13c9_+(<hHqEe!rW4IpbdBgP
z(H%g4a9Ss^^5j{aQ+6gQB@oLf_0d0n{)Lo?`{+A+uFdm_SVgZc3vqh+^@3fVF^{8X
zPn9P%Y3d|TL`4-~NlQ}ui1I8D1Z=siBBdq(sm^@#J%lsK3ZYmd3t|G@&J6@41rN!|
z^hL)2S3X)*RZdiOv)PO`<|r$cs_uE7su`+bU_jvVBCTkR)3SN6qnL`46;WPAS*l1%
z8f5FrM-ad^vLv6+d*-wpwQ-JEmZ&w&RehwXNg~5-(PedX4x76;-ij_47r9WI6H#XC
zf{CMZkya0O`#I}3=j$SFQ{YS$u}A<`f;+wUCF|6qWy;Ga$=e+uT#w3ES(TNmEbpOh
zR1JvTCehz-Q`yB)Md4n~YiY<k*P!6+I`xiuCy(R=4aqcPYnjDt>Z4@?u@auKh!Yt$
z3Bu5FER$o0x)fVXIG8$ti3J;bEU>8Sa&1R6OUsI;Oh_W29z{Sh7J(gvo{m`%1lXe9
z7zd8!V#da{5CI(vbG+OCO%Z|rl*U&hl0+PcbjNY2%NaJzkYUTQDRvzyFNI@rmwQ~d
zk-`~ykrfGrT1N?83iXFNMvANmd44?e5wuTtc^uO!1gMX`iqdu6tu7#caavKSojx`l
z&2b&iv31QH1AEK!ttd)(CR?s;D<Y*Y7MV>Z$3+%KvG7rO^72b1SVu9(QHm5<Ap$vq
z)Kosz;GxZ&ObS7(tXO1O>^Dd{*{;u_;W(}6lvcpDZ}-Kn-9MMzzm=cNGaiK({{@vj
z-WL5;RD#Qku3b;Xo6c(DNNJmeP__-Sr00U8Zjr5Mx)gAXz;nEXMQ<s(7kG|m7&dkp
z6wGoh3%g!uU{4sDGY+Zgz<JZ{FSD@P&_X<4f-XL4WcvG4PI=T;=d&Gpvl5`2lmcry
z*6f>7sE~##Pm66v>dj=^dsj}D9URUpY3|Rzr^;bI&0*a3UT^*PQXIs%)&C%}_fBv1
i@1;11ajXA9Wbd8+-}V2ZSK_9zf29&B`~lj)3)8=s$<rkO

diff --git a/autotests/read/jxl/gimp_exif.jxl.json b/autotests/read/jxl/gimp_exif.jxl.json
index 1a963c6..58d24e4 100644
--- a/autotests/read/jxl/gimp_exif.jxl.json
+++ b/autotests/read/jxl/gimp_exif.jxl.json
@@ -12,6 +12,14 @@
                 "key" : "ModificationDate",
                 "value" : "2025-01-05T10:18:16"
             },
+            {
+                "key" : "Keywords",
+                "value" : "kde;w11"
+            },
+            {
+                "key" : "Rating",
+                "value" : "4"
+            },
             {
                 "key" : "Software" ,
                 "value" : "GIMP 3.0.0-RC2"
diff --git a/autotests/read/jxr/metadata.jxr b/autotests/read/jxr/metadata.jxr
index bce9beefbebb7b99b1d4c01ccf12783cfa12c902..3a9992dc51ad4a7ceab70b865e0ad6b6381323af 100644
GIT binary patch
delta 3015
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
AA^-pY

delta 1586
zcmeH{NlX)A6vy98r`xoaq6HL#3<OlRcBoX%(8VGU5#oXbxo9%9)22X|v;*|w5)*?l
z0mSd1aZ5~0j5n17g!H0#(P%soiHV6@Jb3UzV)SBtrHy>`=-D>k^!NME`(B!Nc=sP@
zGb`G2Jv|vl0D!vXcX7>;U%ihmdL}2PpO;{?{;2>9!@@RXi2*1<HX)xtwjx`QPb0S?
zmm-fLJCSY3XOP>G&B$}eZsaQD+sM~1u&^0<sSoAmEoS|~OXLj8z~@GQ_sEec4)6z_
zH3Ouk^sveToNocBzm(61L;xnkfE8;Dc-Xm52akTm@JS|L5Y7TTEpWfcz;b~zBe}K!
z1B1eFGA;)La!M6c1s{>999Hbm+nto7%49q_N@iJsJY+qk2b`kQCG>W73CEK05hb7!
zzpadXW1XZ%bDZM^K_KHAzdi>!UeZ*V3!D$$Xc~%wt6X!DlV;9U9LSu#IGE*%Tad-S
zE52~P;w$x9PX+xqgmiQ)mXg#+C`3MJ%FA=$Xtj%uTDpo%YnzJuENcD5!B6cz`^FWw
zJf4>Nlvv8^Z*}fzb36X{MhzLz9pWjyt4q?lRWH+;FxyDREDDZfFeG)zVXxZ}3`nW*
z;oRuGRGYK<lk~l}`UYAJh9+9~8|rA44X<f+86C7nj3TXfj80ltjCNWL`~a;oznj(>
zUZV9CUqkB}zmwJ-CKs(kCJ(JQOfGux>1aagm(@rt?8UKDMvZ9A)I)dhn;Y8-Z{6$T
z?Nm~MWF(<R;<4Oh^I?Byx0lC`684NLs_f;7-y)NCONe+Z!T;x<XRxV^cl*)_IWVfI
zf)WdQYA0)bINhwJtg-{QoAn9{dR$I}$fX57)k5qg_R1heZTDEv;p+tQUSuA5qJ_*@
zYjjPbD2XCjuvX8nT7R(4$G8eLz~UF63l9fcbbuF_YjLyYmmpxfoB@0k32XC`%eGxi
Xc7DO;%QA57`xd5}$u4ZSF^8q!u!LWZ

diff --git a/autotests/read/jxr/metadata.jxr.json b/autotests/read/jxr/metadata.jxr.json
index 9153d4c..4d9f98f 100644
--- a/autotests/read/jxr/metadata.jxr.json
+++ b/autotests/read/jxr/metadata.jxr.json
@@ -59,6 +59,14 @@
             {
                 "key" : "Model",
                 "value" : "KImageFormats"
+            },
+            {
+                "key" : "Keywords",
+                "value" : "broacast;test;kde"
+            },
+            {
+                "key" : "Rating",
+                "value" : "5"
             }
         ],
         "resolution" : {
diff --git a/autotests/write/basic/jxl.json b/autotests/write/basic/jxl.json
index f6c495d..9e250be 100644
--- a/autotests/write/basic/jxl.json
+++ b/autotests/write/basic/jxl.json
@@ -37,6 +37,14 @@
             "key" : "Description",
             "value" : "テレビ放送テスト映像。(TV broadcast test image.)"
         },
+        {
+            "key" : "Keywords",
+            "value" : "kde;test"
+        },
+        {
+            "key" : "Rating",
+            "value" : "5"
+        },
         {
             "key" : "Latitude",
             "value" : "44.6478"
diff --git a/autotests/write/basic/jxr.json b/autotests/write/basic/jxr.json
index 7788207..86e1cd7 100644
--- a/autotests/write/basic/jxr.json
+++ b/autotests/write/basic/jxr.json
@@ -29,6 +29,10 @@
             "key" : "Description",
             "value" : "TV broadcast test image."
         },
+        {
+            "key" : "Rating",
+            "value" : "4"
+        },
         {
             "key" : "Latitude",
             "value" : "44.6478"
diff --git a/src/imageformats/jxr.cpp b/src/imageformats/jxr.cpp
index c9473f5..331ce7c 100644
--- a/src/imageformats/jxr.cpp
+++ b/src/imageformats/jxr.cpp
@@ -739,6 +739,13 @@ public:
         DESCRIPTIVEMETADATA meta;
         memset(&meta, 0, sizeof(meta));
 
+        auto ok = false;
+        auto rating = image.text(QStringLiteral(META_KEY_RATING)).toUInt(&ok);
+        if (ok) {
+            meta.pvarRatingStars.vt = DPKVT_UI2;
+            meta.pvarRatingStars.VT.uiVal = quint16(rating);
+        }
+
 #define META_CTEXT(name, field)                                                                                                                                \
     auto field = image.text(QStringLiteral(name)).toUtf8();                                                                                                    \
     if (!field.isEmpty()) {                                                                                                                                    \
@@ -1017,6 +1024,10 @@ private:
             return false;
         }
 
+        if (meta.pvarRatingStars.vt == DPKVT_UI2) {
+            m_txtMeta.insert(QStringLiteral(META_KEY_RATING), QStringLiteral("%1").arg(meta.pvarRatingStars.VT.uiVal));
+        }
+
 #define META_TEXT(name, field)                                                                                                                                 \
     if (meta.field.vt == DPKVT_LPSTR)                                                                                                                          \
         m_txtMeta.insert(QStringLiteral(name), QString::fromUtf8(meta.field.VT.pszVal));                                                                       \
diff --git a/src/imageformats/microexif.cpp b/src/imageformats/microexif.cpp
index 23dd3f4..0190132 100644
--- a/src/imageformats/microexif.cpp
+++ b/src/imageformats/microexif.cpp
@@ -30,6 +30,9 @@
 #define TIFF_ARTIST 0x013B
 #define TIFF_DATETIME 0x0132
 #define TIFF_COPYRIGHT 0x8298
+#define TIFF_XPRATING 0x4746  // added by Windows Explorer Image Properties
+#define TIFF_XPTITLE 0x9C9B // added by Windows Explorer Image Properties
+#define TIFF_XPKEYWORDS 0x9C9E // added by Windows Explorer Image Properties
 
 #define TIFF_VAL_URES_NOABSOLUTE 1
 #define TIFF_VAL_URES_INCH 2
@@ -134,6 +137,9 @@ static const KnownTags staticTagTypes = {
     TagInfo(TIFF_ARTIST, ExifTagType::Utf8),
     TagInfo(TIFF_DATETIME, ExifTagType::Ascii),
     TagInfo(TIFF_COPYRIGHT, ExifTagType::Utf8),
+    TagInfo(TIFF_XPRATING, ExifTagType::Short),
+    TagInfo(TIFF_XPTITLE, ExifTagType::Byte),
+    TagInfo(TIFF_XPKEYWORDS, ExifTagType::Byte),
     TagInfo(EXIF_EXPOSURETIME, ExifTagType::Rational),
     TagInfo(EXIF_FNUMBER, ExifTagType::Rational),
     TagInfo(EXIF_EXIFIFD, ExifTagType::Long),
@@ -206,8 +212,8 @@ static const QList<std::pair<quint16, QString>> exifStrMap = {
     std::pair<quint16, QString>(EXIF_BODYSERIALNUMBER, QStringLiteral(META_KEY_SERIALNUMBER)),
     std::pair<quint16, QString>(EXIF_LENSMAKE, QStringLiteral(META_KEY_LENS_MANUFACTURER)),
     std::pair<quint16, QString>(EXIF_LENSMODEL, QStringLiteral(META_KEY_LENS_MODEL)),
-    std::pair<quint16, QString>(EXIF_LENSSERIALNUMBER, QStringLiteral(META_KEY_LENS_SERIALNUMBER)),
-    std::pair<quint16, QString>(EXIF_IMAGETITLE, QStringLiteral(META_KEY_TITLE)),
+    std::pair<quint16, QString>(EXIF_LENSSERIALNUMBER, QStringLiteral(META_KEY_LENS_SERIALNUMBER))
+    // std::pair<quint16, QString>(EXIF_IMAGETITLE, QStringLiteral(META_KEY_TITLE)) // using functions due to XP title fallback
 };
 // clang-format on
 
@@ -842,6 +848,32 @@ void MicroExif::setCopyright(const QString &s)
     setTiffString(TIFF_COPYRIGHT, s);
 }
 
+QStringList MicroExif::keywords() const
+{
+    auto val = utf16String(m_tiffTags, TIFF_XPKEYWORDS);
+    if (val.isEmpty())
+        return {};
+    return val.split(QChar(u';'), Qt::SkipEmptyParts);
+}
+
+void MicroExif::setKeywords(const QStringList &k)
+{
+    setUtf16String(m_tiffTags, TIFF_XPKEYWORDS, k.join(QChar(u';')));
+}
+
+quint16 MicroExif::rating() const
+{
+    return m_tiffTags.value(TIFF_XPRATING).toUInt();
+}
+
+void MicroExif::setRating(quint16 rating)
+{
+    if (rating == 0)
+        m_tiffTags.remove(TIFF_XPRATING);
+    else
+        m_tiffTags.insert(TIFF_XPRATING, rating);
+}
+
 QString MicroExif::make() const
 {
     return tiffString(TIFF_MAKE);
@@ -964,12 +996,18 @@ void MicroExif::setDateTimeDigitized(const QDateTime &dt)
 
 QString MicroExif::title() const
 {
-    return exifString(EXIF_IMAGETITLE);
+    auto s = exifString(EXIF_IMAGETITLE);
+    if (s.isEmpty()) { // fall back to XP title
+        s = utf16String(m_tiffTags, TIFF_XPTITLE);
+    }
+    return s;
 }
 
-void MicroExif::setImageTitle(const QString &s)
+void MicroExif::setTitle(const QString &s)
 {
     setExifString(EXIF_IMAGETITLE, s);
+    // Since there is an official title tag, I never write the non-standard Microsoft one.
+    setUtf16String(m_tiffTags, TIFF_XPTITLE, QString());
 }
 
 QUuid MicroExif::uniqueId() const
@@ -1337,6 +1375,11 @@ void MicroExif::updateImageMetadata(QImage &targetImage, bool replaceExisting) c
         if (!s.isEmpty())
             targetImage.setText(p.second, s);
     }
+    if (replaceExisting || targetImage.text(QStringLiteral(META_KEY_TITLE)).isEmpty()) {
+        auto s = title();
+        if (!s.isEmpty())
+            targetImage.setText(QStringLiteral(META_KEY_TITLE), s);
+    }
 
     // set date and time
     if (replaceExisting || targetImage.text(QStringLiteral(META_KEY_MODIFICATIONDATE)).isEmpty()) {
@@ -1423,6 +1466,18 @@ void MicroExif::updateImageMetadata(QImage &targetImage, bool replaceExisting) c
         if (v != WhiteBalance::NotSet)
             targetImage.setText(QStringLiteral(META_KEY_WHITEBALANCE), QStringLiteral("%1").arg(quint16(v)));
     }
+
+    // set Microsoft tags
+    if (replaceExisting || targetImage.text(QStringLiteral(META_KEY_KEYWORDS)).isEmpty()) {
+        auto keywords = this->keywords();
+        if (!keywords.isEmpty())
+            targetImage.setText(QStringLiteral(META_KEY_KEYWORDS), keywords.join(QChar(u';')));
+    }
+    if (replaceExisting || targetImage.text(QStringLiteral(META_KEY_RATING)).isEmpty()) {
+        auto v = rating();
+        if (v != 0)
+            targetImage.setText(QStringLiteral(META_KEY_RATING), QStringLiteral("%1").arg(quint16(v)));
+    }
 }
 
 bool MicroExif::updateImageResolution(QImage &targetImage)
@@ -1518,6 +1573,7 @@ MicroExif MicroExif::fromImage(const QImage &image)
     for (auto &&p : exifStrMap) {
         exif.setExifString(p.first, image.text(p.second));
     }
+    exif.setTitle(image.text(QStringLiteral(META_KEY_TITLE)));
 
     // TIFF Software
     if (exif.software().isEmpty()) {
@@ -1587,6 +1643,13 @@ MicroExif MicroExif::fromImage(const QImage &image)
     if (ok)
         exif.setWhiteBalance(WhiteBalance(whtb));
 
+    // Microsoft tags
+    exif.setKeywords(image.text(QStringLiteral(META_KEY_KEYWORDS)).split(QChar(u';'), Qt::SkipEmptyParts));
+
+    auto rating = image.text(QStringLiteral(META_KEY_RATING)).toUInt(&ok);
+    if (ok)
+        exif.setRating(rating);
+
     return exif;
 }
 
@@ -1676,3 +1739,29 @@ QString MicroExif::string(const Tags &tags, quint16 tagId)
 {
     return tags.value(tagId).toString();
 }
+
+void MicroExif::setUtf16String(Tags &tags, quint16 tagId, const QString &s)
+{
+    if (s.isEmpty()) {
+        tags.remove(tagId);
+        return;
+    }
+    auto s16 = s.toStdU16String();
+    QList<quint8> uba;
+    auto ba = QByteArrayView(reinterpret_cast<char*>(s16.data()), s.size() * 2);
+    for(auto&& c : ba)
+        uba.append(quint8(c));
+    uba.append(quint8('\0'));
+    uba.append(quint8('\0'));
+    tags.insert(tagId, QVariant::fromValue(uba));
+}
+
+QString MicroExif::utf16String(const Tags &tags, quint16 tagId)
+{
+    auto ba = tags.value(tagId).value<QList<quint8>>();
+    if (ba.isEmpty())
+        return {};
+    auto p16 = reinterpret_cast<char16_t*>(ba.data());
+    auto sz = std::max(ba.size() / 2 - 1, qsizetype());
+    return QString::fromUtf16(p16, sz);
+}
diff --git a/src/imageformats/microexif_p.h b/src/imageformats/microexif_p.h
index 441d713..cc5bdd0 100644
--- a/src/imageformats/microexif_p.h
+++ b/src/imageformats/microexif_p.h
@@ -251,6 +251,24 @@ public:
     QString copyright() const;
     void setCopyright(const QString& s);
 
+    /*!
+     * \brief keywords
+     * Keywords tag used by Windows.
+     * \note Non-standard, added by Windows Explorer.
+     * \return The list of tags.
+     */
+    QStringList keywords() const;
+    void setKeywords(const QStringList& k);
+
+    /*!
+     * \brief rating
+     * Rating tag used by Windows.
+     * \note Non-standard, added by Windows Explorer.
+     * \return The rating. Usually between 0 (not set) and 5.
+     */
+    quint16 rating() const;
+    void setRating(quint16 rating);
+
     /*!
      * \brief make
      * \return The manufacturer of the recording equipment.
@@ -319,7 +337,7 @@ public:
      * \return The title of the image.
      */
     QString title() const;
-    void setImageTitle(const QString &s);
+    void setTitle(const QString &s);
 
     /*!
      * \brief uniqueId
@@ -555,6 +573,9 @@ private:
     static void setString(Tags &tags, quint16 tagId, const QString &s);
     static QString string(const Tags &tags, quint16 tagId);
 
+    static void setUtf16String(Tags &tags, quint16 tagId, const QString &s);
+    static QString utf16String(const Tags &tags, quint16 tagId);
+
 private:
     Tags m_tiffTags;
     Tags m_exifTags;
diff --git a/src/imageformats/util_p.h b/src/imageformats/util_p.h
index fda946e..c7e79ec 100644
--- a/src/imageformats/util_p.h
+++ b/src/imageformats/util_p.h
@@ -44,10 +44,12 @@
 #define META_KEY_DIRECTION "Direction"
 #define META_KEY_DOCUMENTNAME "DocumentName"
 #define META_KEY_HOSTCOMPUTER "HostComputer"
+#define META_KEY_KEYWORDS "Keywords"
 #define META_KEY_LATITUDE "Latitude"
 #define META_KEY_LONGITUDE "Longitude"
 #define META_KEY_MODIFICATIONDATE "ModificationDate"
 #define META_KEY_OWNER "Owner"
+#define META_KEY_RATING "Rating"
 #define META_KEY_SOFTWARE "Software"
 #define META_KEY_SPEED "Speed"
 #define META_KEY_TITLE "Title"