From 7219336508f917e9771a674bd4a3c135928072ca Mon Sep 17 00:00:00 2001
From: Martin Blanchard <tchaik@gmx.com>
Date: Sun, 22 May 2016 20:35:52 +0200
Subject: [PATCH] Better JPEG 2000 MIME type support (JP2, JPX, JPM, MJ2, JPC)

Enhance JPEG 2000 MIME type support by distinguishing subtypes:
  - JPC: JPEG 2000 codestream (image/x-jp2-codestream)
  - JP2: JPEG 2000 JP2/Part 1 image (image/jp2)
  - JPX: JPEG 2000 JPX/Part 2 image (image/jpx)
  - JPM: JPEG 2000 JPM/Part 6 image (image/jpm)
  - MJ2: JPEG 2000 MJ2/Part 3 video (video/mj2)
See RFC 3745 for details, MIME types and extensions.

https://bugs.freedesktop.org/show_bug.cgi?id=94423
---
 freedesktop.org.xml.in |  52 ++++++++++++++++++++++++++++++++++++++++++-------
 tests/list             |   1 +
 tests/test.jpc         | Bin 0 -> 1109 bytes
 3 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 tests/test.jpc

diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 81ad68a..8cebc3d 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -4267,21 +4267,59 @@ command to generate the output files.
     <glob pattern="*.jpe"/>
     <alias type="image/pjpeg"/>
   </mime-type>
+  <mime-type type="image/x-jp2-codestream">
+    <_comment>JPEG 2000 codestream</_comment>
+    <acronym>JPC</acronym>
+    <expanded-acronym>JPEG 2000 Codestream</expanded-acronym>
+    <magic priority="50">
+      <match type="big32" value="0xff4fff51" offset="0"/>
+    </magic>
+    <glob pattern="*.j2c"/>
+    <glob pattern="*.j2k"/>
+    <glob pattern="*.jpc"/>
+  </mime-type>
   <mime-type type="image/jp2">
-    <_comment>JPEG-2000 image</_comment>
+    <_comment>JPEG 2000 JP2 image</_comment>
+    <acronym>JP2</acronym>
+    <expanded-acronym>JPEG 2000</expanded-acronym>
     <alias type="image/jpeg2000"/>
-    <alias type="image/jpx"/>
     <alias type="image/jpeg2000-image"/>
     <alias type="image/x-jpeg2000-image"/>
     <magic priority="50">
-      <match value="\xFF\x4F\xFF\x51\x00" type="string" offset="0" />
-      <match type="big32" value="0x0c6a5020" offset="3"/>
-      <match type="string" value="jp2" offset="20"/>
+      <match type="string" mask="0xffffffffffffffffffffffff0000000000000000ffffffff" value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a        jp2\x20" offset="0"/>
     </magic>
     <glob pattern="*.jp2"/>
-    <glob pattern="*.jpx"/>
+    <glob pattern="*.jpg2"/>
+  </mime-type>
+  <mime-type type="image/jpx">
+    <_comment>JPEG 2000 JPX image</_comment>
+    <acronym>JPX</acronym>
+    <expanded-acronym>JPEG 2000 eXtended</expanded-acronym>
+    <magic priority="50">
+      <match type="string" mask="0xffffffffffffffffffffffff0000000000000000ffffffff" value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a        jpx\x20" offset="0"/>
+    </magic>
     <glob pattern="*.jpf"/>
-
+    <glob pattern="*.jpx"/>
+  </mime-type>
+  <mime-type type="image/jpm">
+    <_comment>JPEG 2000 JPM image</_comment>
+    <acronym>JPM</acronym>
+    <expanded-acronym>JPEG 2000 Mixed</expanded-acronym>
+    <magic priority="50">
+      <match type="string" mask="0xffffffffffffffffffffffff0000000000000000ffffffff" value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a        jpm\x20" offset="0"/>
+    </magic>
+    <glob pattern="*.jpm"/>
+    <glob pattern="*.jpgm"/>
+  </mime-type>
+  <mime-type type="video/mj2">
+    <_comment>JPEG 2000 MJ2 video</_comment>
+    <acronym>MJ2</acronym>
+    <expanded-acronym>Motion JPEG 2000</expanded-acronym>
+    <magic priority="50">
+      <match type="string" mask="0xffffffffffffffffffffffff0000000000000000ffffffff" value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a        mjp2" offset="0"/>
+    </magic>
+    <glob pattern="*.mj2"/>
+    <glob pattern="*.mjp2"/>
   </mime-type>
   <mime-type type="image/openraster">
     <_comment>OpenRaster archiving image</_comment>
diff --git a/tests/list b/tests/list
index 98198a5..7351681 100644
--- a/tests/list
+++ b/tests/list
@@ -24,6 +24,7 @@ test.ico image/vnd.microsoft.icon
 test.ilbm image/x-ilbm
 test.im1 image/x-sun-raster x
 test.jp2 image/jp2
+test.jpc image/x-jp2-codestream
 test.jpg image/jpeg
 # Possible false positive for a JPEG 2000 image
 img_5304.jpg image/jpeg
diff --git a/tests/test.jpc b/tests/test.jpc
new file mode 100644
index 0000000000000000000000000000000000000000..715f40a4d5b6c16327e6731b4aeaa1d5456a4533
GIT binary patch
literal 1109
zcmezG|38pHp8*6!pcu@-;4`x`GD6V*6b5AmM(3i`#FG3XD+RB_;(*j5g|O73;>`R!
z1w%bc0|Pz7|3M5qKr<K_Sy@;Z82`sG2s=1<cmyD$|FH}rj95jPFhwUYaDm*#yas64
z<l|RZ*zJJ?3;%&1j*JICH#PilZ2a8BP|v`49>{C_#MFL^iETfJJ;V6}T=D@t{Bs02
z)R|f9fpYCv*x9eJaQJf-=X1m#zr}9PU{Slkfo&5z_osT+{PPF+{v1@Wb5LM?dY?zm
zVL!v+S8UDCd6}Pc2+ZX@)g{M0w{dx-J%f$y_v5$t<uh#L12ly4G_<WItmbz6F?HLq
zRs7%gUcL^NbFsS+Ae8cyd7t=uu57vWeaBtuxx{zh^gH-@O7nAF_A6Ta6RXbLQJeYT
zwff(C8qe7sp2(cC7qQ}ElG1r_Tep>0eTICX{9komwojMkH&=$rO761Cu1vJc+j@d$
z-IlJOh6g`SZoi_-_(?#<%UELDo9T<0y|PYC)x7VbcA#GAi^ad3xJR01&2OXxMf}|S
zz6i@6y|2`^<ni2S(f#!WCqm9x_3uCYN(^WM^K&)kFNb~k=L)Kuy_-C_QsKCBd!(wU
z@Mh7jzwbp`ZqKOJn!EANZM_fHt=BKknJ-n>C}#BO?{xQ+-1;puSza!31cvIx1wUVW
zuq#hsy0$%ca-yorCO3Zl;Gl;mzK8pJI<KiUI&Z&y604A`oOhJh$|p~A8E*f)RsUPg
zR=hK^>V>V8Xotd-zWgfIRhRdx8O@7~6q&jvZdY`t0%I}%y@-?@vFl&99*Vd(r_t=}
z-d&eIOuG>w(3W+$EbH&)6-(kd!tXMFT0h<5sg2e7%dxSw*-zygK6nWfz1~{S{3QFz
zegWlEDeIJE&s8|67;QZ=UC1*%KSSlk$><M^)BPkCylHTst$9KxdSc3f8}HQ^S7o@#
zdw=V{y#K&Y$pb&79PFeVIC;39&o63kip!Z<{&tOarENe=!s?lE&eQf;xEjRQ9uK_h
znW!{>jq|R?^2~437*DzJxaut4a`w`FxsK$=2UR}F1ux88F==rplY%$5_Mu44#!t8T
z!cK%vu1&JYsy9$}>Ebx_R&!CkAz$*`EZ!xTTAjbli^%NoEGl+3Q8}=bUrv{CPK)){
zo0@?N8xQ=Hb^N@yp~jR!_?wp4#>s4jolm>I=B$anaPsm!1Gd%a)$h!Coz0UZwz@7n
zWP7N8W$Y$NVO5r;Mt}D$-eI*^*(YIJy$z!g!_Q}@{$)CD%<oXOSzuy%_wL-I8`d`N
z_fiQC_qyz?^|9;UYK5JpjS^E|ZT+huxFP9Zm=8NQx51P6*PQ2bg0~)75nHu)Y3UE;
idFn4553MwNRG#_!z3lJLtMWEXxs&v<mgnB_|2F~Z#@4F<

literal 0
HcmV?d00001

-- 
2.5.5