Commit: 250253ec0de3bc8ba414ea187fa4148031f6366e - deb-shared-mime-info (git)

自分用にカスタマイズしたshared-mime-infoのソース

Commit MetaInfo

• Revision: 250253ec0de3bc8ba414ea187fa4148031f6366e (tree)
• Time: 2017-06-11 09:03:12
• Author: Martin Blanchard <tchaik@gmx....>
• Commiter: Bastien Nocera

Log Message

Better JPEG 2000 MIME type support

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.
Test files, except MJ2, contributed by Johan van der Knijff
at https://github.com/bitsgalore/jp2kMagic

https://bugs.freedesktop.org/show_bug.cgi?id=94423

Change Summary

• modified: freedesktop.org.xml.in
• add: tests/balloon.j2c
• add: tests/balloon.jp2
• add: tests/balloon.jpf
• add: tests/balloon.jpm
• add: tests/balloon.mj2
• modified: tests/list
• delete: tests/test.jp2

Incremental Difference

--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -4493,21 +4493,57 @@ 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>
+    <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>

Binary files /dev/null and b/tests/balloon.j2c differ

Binary files /dev/null and b/tests/balloon.jp2 differ

Binary files /dev/null and b/tests/balloon.jpf differ

Binary files /dev/null and b/tests/balloon.jpm differ

Binary files /dev/null and b/tests/balloon.mj2 differ

--- a/tests/list
+++ b/tests/list
@@ -23,10 +23,15 @@ test.ico image/vnd.microsoft.icon
 # From https://bugs.freedesktop.org/show_bug.cgi?id=20070#c3
 test.ilbm image/x-ilbm
 test.im1 image/x-sun-raster x
-test.jp2 image/jp2
 test.jpg image/jpeg
 # Possible false positive for a JPEG 2000 image
 img_5304.jpg image/jpeg
+# From https://github.com/bitsgalore/jp2kMagic
+balloon.j2c image/x-jp2-codestream
+balloon.jp2 image/jp2
+balloon.jpf image/jpx
+balloon.jpm image/jpm
+balloon.mj2 video/mj2
 # From https://bugzilla.freedesktop.org/show_bug.cgi?id=55339
 test.mng video/x-mng
 test.pat image/x-pat xxx

Binary files a/tests/test.jp2 and /dev/null differ