From c9d379c8ee92251cd10c2b9014bb41effadc07b0 Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Tue, 30 Apr 2024 00:27:53 -0600
Subject: Prefer image/vnd.fpx over image/x-fpx and improve its detection

0x46506978 is the ASCII string "FPix", which was the Macintosh file type
code for FlashPix, but FlashPix files do not start with "FPix". Rather,
they are OLE Compound Storage files that have the root class identifier
{56616700-c154-11ce-8553-00aa00a1f95b}.

https://www.iana.org/assignments/media-types/image/vnd.fpx
http://fileformats.archiveteam.org/wiki/OLE
http://fileformats.archiveteam.org/wiki/FlashPix
---
 data/freedesktop.org.xml.in | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'data')

diff --git a/data/freedesktop.org.xml.in b/data/freedesktop.org.xml.in
index 876b756..41c7ef6 100644
--- a/data/freedesktop.org.xml.in
+++ b/data/freedesktop.org.xml.in
@@ -6066,13 +6066,16 @@ command to generate the output files.
     <alias type="image/x-fits"/>
     <alias type="image/fits"/>
   </mime-type>
-  <mime-type type="image/x-fpx">
-    <comment>FPX image</comment>
-    <acronym>FPX</acronym>
-    <expanded-acronym>FlashPiX</expanded-acronym>
-    <magic>
-      <match type="big32" value="0x46506978" offset="0"/>
+  <mime-type type="image/vnd.fpx">
+    <comment>FlashPix image</comment>
+    <sub-class-of type="application/x-ole-storage"/>
+    <magic priority="60">
+      <match type="string" value="\xd0\xcf\x11\xe0\xa1\xb1\x1a\xe1" offset="0">
+        <match type="string" value="\x00\x67\x61\x56\x54\xc1\xce\x11\x85\x53\x00\xaa\x00\xa1\xf9\x5b" offset="592:8192"/>
+      </match>
     </magic>
+    <glob pattern="*.fpx"/>
+    <alias type="image/x-fpx"/>
   </mime-type>
   <mime-type type="image/x-gzeps">
     <comment>EPS image (gzip-compressed)</comment>
-- 
cgit v1.2.3