You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2024/03/21 14:41:37 UTC
(tika) branch TIKA-4217 created (now b0d539516)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch TIKA-4217
in repository https://gitbox.apache.org/repos/asf/tika.git
at b0d539516 TIKA-4217 -- require new line or white space as part of bitmap magic
This branch includes the following new commits:
new b0d539516 TIKA-4217 -- require new line or white space as part of bitmap magic
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(tika) 01/01: TIKA-4217 -- require new line or white space as part of bitmap magic
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-4217
in repository https://gitbox.apache.org/repos/asf/tika.git
commit b0d5395162c837dc308171d5bbd589f0248b49dd
Author: tallison <ta...@apache.org>
AuthorDate: Thu Mar 21 10:41:23 2024 -0400
TIKA-4217 -- require new line or white space as part of bitmap magic
---
.../org/apache/tika/mime/tika-mimetypes.xml | 53 ++++++++++++++++++----
1 file changed, 44 insertions(+), 9 deletions(-)
diff --git a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
index 675ba1180..7176332ef 100644
--- a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
+++ b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
@@ -6702,8 +6702,16 @@
<acronym>PBM</acronym>
<_comment>Portable Bit Map</_comment>
<magic priority="50">
- <match value="P1" type="string" offset="0"/>
- <match value="P4" type="string" offset="0"/>
+ <match value="P1" type="string" offset="0">
+ <match value="\x0a" type="string" offset="2"/>
+ <match value="\x0d" type="string" offset="2"/>
+ <match value="\x20" type="string" offset="2"/>
+ </match>
+ <match value="P4" type="regex" offset="0">
+ <match value="\x0a" type="string" offset="2"/>
+ <match value="\x0d" type="string" offset="2"/>
+ <match value="\x20" type="string" offset="2"/>
+ </match>
</magic>
<glob pattern="*.pbm"/>
</mime-type>
@@ -6713,9 +6721,16 @@
<acronym>PGM</acronym>
<_comment>Portable Graymap Graphic</_comment>
<magic priority="50">
- <match value="P2" type="string" offset="0"/>
- <match value="P5" type="string" offset="0"/>
- <match offset="0" type="string" value="\x50\x35\x0a"/>
+ <match value="P2" type="string" offset="0">
+ <match value="\x0a" type="string" offset="2"/>
+ <match value="\x0d" type="string" offset="2"/>
+ <match value="\x20" type="string" offset="2"/>
+ </match>
+ <match value="P5" type="regex" offset="0">
+ <match value="\x0a" type="string" offset="2"/>
+ <match value="\x0d" type="string" offset="2"/>
+ <match value="\x20" type="string" offset="2"/>
+ </match>
</magic>
<glob pattern="*.pgm"/>
</mime-type>
@@ -6725,13 +6740,33 @@
<acronym>PXM</acronym>
<_comment>UNIX Portable Bitmap Graphic</_comment>
<magic priority="50">
- <match value="P3" type="string" offset="0"/>
- <match value="P6" type="string" offset="0"/>
- <match value="P7" type="string" offset="0"/>
- <match offset="0" type="string" value="\x50\x34\x0a"/>
+ <match value="P3" type="string" offset="0">
+ <match value="\x0a" type="string" offset="2"/>
+ <match value="\x0d" type="string" offset="2"/>
+ <match value="\x20" type="string" offset="2"/>
+ </match>
+ <match value="P6" type="regex" offset="0">
+ <match value="\x0a" type="string" offset="2"/>
+ <match value="\x0d" type="string" offset="2"/>
+ <match value="\x20" type="string" offset="2"/>
+ </match>
</magic>
<glob pattern="*.ppm"/>
</mime-type>
+ <mime-type type="image/x-portable-arbitrarymap">
+ <sub-class-of type="image/x-portable-anymap"/>
+ <acronym>PAM</acronym>
+ <_comment>UNIX Portable Bitmap Graphic Arbitrary Map</_comment>
+ <magic priority="50">
+ <match value="P7" type="string" offset="0">
+ <match value="\x0a" type="string" offset="2"/>
+ <match value="\x0d" type="string" offset="2"/>
+ <match value="\x20" type="string" offset="2"/>
+ </match>
+ </magic>
+ <glob pattern="*.pam"/>
+ </mime-type>
+
<mime-type type="image/x-raw-adobe">
<acronym>DNG</acronym>