You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by rg...@apache.org on 2013/09/03 14:26:23 UTC
svn commit: r1519664 - in /tika/trunk/tika-core/src:
main/resources/org/apache/tika/mime/tika-mimetypes.xml
test/java/org/apache/tika/mime/MimeDetectionTest.java
test/resources/org/apache/tika/mime/plotutils-bin-cgm-v3.cgm
Author: rgauss
Date: Tue Sep 3 12:26:23 2013
New Revision: 1519664
URL: http://svn.apache.org/r1519664
Log:
TIKA-1170: Insufficiently specific magic for binary image/cgm files
- Applied patch from Andrew Jackson which…
- Added additional matches to image/cgm magic
- Added example cgm file
- Added test of image/cgm to MimeDetectionTest
Added:
tika/trunk/tika-core/src/test/resources/org/apache/tika/mime/plotutils-bin-cgm-v3.cgm (with props)
Modified:
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java
Modified: tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=1519664&r1=1519663&r2=1519664&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml (original)
+++ tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml Tue Sep 3 12:26:23 2013
@@ -3883,6 +3883,12 @@
<magic priority="50">
<match value="BEGMF" type="string" offset="0"/>
<match value="0x0020" mask="0xffe0" type="string" offset="0"/>
+ <match value="0x0020" mask="0xffe0" type="string" offset="0">
+ <match value="0x10220001" type="string" offset="2:64"/>
+ <match value="0x10220002" type="string" offset="2:64"/>
+ <match value="0x10220003" type="string" offset="2:64"/>
+ <match value="0x10220004" type="string" offset="2:64"/>
+ </match>
</magic>
<glob pattern="*.cgm"/>
</mime-type>
Modified: tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java?rev=1519664&r1=1519663&r2=1519664&view=diff
==============================================================================
--- tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java (original)
+++ tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java Tue Sep 3 12:26:23 2013
@@ -66,6 +66,8 @@ public class MimeDetectionTest extends T
testFile("text/html", "testlargerbuffer.html");
// test fragment of HTML with <div> (TIKA-1102)
testFile("text/html", "htmlfragment");
+ // test binary CGM detection (TIKA-1170)
+ testFile("image/cgm", "plotutils-bin-cgm-v3.cgm");
}
public void testByteOrderMark() throws Exception {
Added: tika/trunk/tika-core/src/test/resources/org/apache/tika/mime/plotutils-bin-cgm-v3.cgm
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/resources/org/apache/tika/mime/plotutils-bin-cgm-v3.cgm?rev=1519664&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tika/trunk/tika-core/src/test/resources/org/apache/tika/mime/plotutils-bin-cgm-v3.cgm
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream