diff options
| author | Bastien Nocera <hadess@hadess.net> | 2013-09-30 12:03:46 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2013-09-30 12:07:32 +0200 |
| commit | 9d8849fa72720b458171acbcbcc13696f983d134 (patch) | |
| tree | 57fae75f0be8e5a208ab23ec96040cc87ed13af0 | |
| parent | 99446c516c178a888ac9550c8eca241c0dac2ae2 (diff) | |
Correct JPEG2000 definition
*.jpc and *.j2k relate to JPEG 2000 codestreams, not to JPEG 2000
images, so remove those globs.
Remove the jP magic, as it creates false positives (and add a test for
that). Also add the jp2 string magic.
With help from Steve Fosdick <other@fosdick.me.uk>
https://bugs.freedesktop.org/show_bug.cgi?id=11942
| -rw-r--r-- | freedesktop.org.xml.in | 7 | ||||
| -rw-r--r-- | tests/img_5304.jpg | bin | 0 -> 102400 bytes | |||
| -rw-r--r-- | tests/list | 3 | ||||
| -rw-r--r-- | tests/test.jpc | bin | 1089 -> 0 bytes |
4 files changed, 6 insertions, 4 deletions
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in index ab1df47..1eadc68 100644 --- a/freedesktop.org.xml.in +++ b/freedesktop.org.xml.in @@ -3969,16 +3969,17 @@ command to generate the output files. <_comment>JPEG-2000 image</_comment> <alias type="image/jpeg2000"/> <alias type="image/jpx"/> + <alias type="image/jpeg2000-image"/> + <alias type="image/x-jpeg2000-image"/> <magic priority="50"> - <match value="jP" type="string" offset="4" /> <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"/> </magic> <glob pattern="*.jp2"/> - <glob pattern="*.jpc"/> <glob pattern="*.jpx"/> - <glob pattern="*.j2k"/> <glob pattern="*.jpf"/> + </mime-type> <mime-type type="image/openraster"> <_comment>OpenRaster archiving image</_comment> diff --git a/tests/img_5304.jpg b/tests/img_5304.jpg Binary files differnew file mode 100644 index 0000000..db855f5 --- /dev/null +++ b/tests/img_5304.jpg @@ -25,7 +25,8 @@ test.ilbm image/x-ilbm test.im1 image/x-sun-raster x test.jp2 image/jp2 test.jpg image/jpeg -test.jpc image/jp2 +# Possible false positive for a JPEG 2000 image +img_5304.jpg image/jpeg # From https://bugzilla.freedesktop.org/show_bug.cgi?id=55339 test.mng video/x-mng test.pat image/x-pat xxx diff --git a/tests/test.jpc b/tests/test.jpc Binary files differdeleted file mode 100644 index c4300b5..0000000 --- a/tests/test.jpc +++ /dev/null |
