Author: jukka
Date: Tue Feb 3 21:20:52 2009
New Revision: 740455
URL: http://svn.apache.org/viewvc?rev=740455&view=rev
Log:
TIKA-192: Add glob and magic patterns for image types
Improved BMP type information, plus relevant tests.
Modified:
lucene/tika/trunk/src/main/resources/mime/tika-mimetypes.xml
lucene/tika/trunk/src/test/java/org/apache/tika/mime/TestMimeTypes.java
Modified: lucene/tika/trunk/src/main/resources/mime/tika-mimetypes.xml
URL:
http://svn.apache.org/viewvc/lucene/tika/trunk/src/main/resources/mime/tika-mimetypes.xml?rev=740455&r1=740454&r2=740455&view=diff
==============================================================================
--- lucene/tika/trunk/src/main/resources/mime/tika-mimetypes.xml (original)
+++ lucene/tika/trunk/src/main/resources/mime/tika-mimetypes.xml Tue Feb 3
21:20:52 2009
@@ -1030,8 +1030,15 @@
</mime-type>
<mime-type type="image/x-ms-bmp">
+ <acronym>BMP</acronym>
+ <comment>Windows bitmap</comment>
+ <magic priority="50">
+ <match value="BM" type="string" offset="0" />
+ </magic>
<glob pattern="*.bmp" />
+ <glob pattern="*.dib" />
</mime-type>
+
<mime-type type="image/x-portable-bitmap">
<magic priority="50">
<match value="P1" type="string" offset="0" />
Modified:
lucene/tika/trunk/src/test/java/org/apache/tika/mime/TestMimeTypes.java
URL:
http://svn.apache.org/viewvc/lucene/tika/trunk/src/test/java/org/apache/tika/mime/TestMimeTypes.java?rev=740455&r1=740454&r2=740455&view=diff
==============================================================================
--- lucene/tika/trunk/src/test/java/org/apache/tika/mime/TestMimeTypes.java
(original)
+++ lucene/tika/trunk/src/test/java/org/apache/tika/mime/TestMimeTypes.java Tue
Feb 3 21:20:52 2009
@@ -127,6 +127,15 @@
assertTypeByName("image/png", "x.PNG");
}
+ public void testBmpDetection() throws Exception {
+ assertType("image/x-ms-bmp", "testBMP.bmp");
+ assertTypeByData("image/x-ms-bmp", "testBMP.bmp");
+ assertTypeByName("image/x-ms-bmp", "x.bmp");
+ assertTypeByName("image/x-ms-bmp", "x.BMP");
+ assertTypeByName("image/x-ms-bmp", "x.dib");
+ assertTypeByName("image/x-ms-bmp", "x.DIB");
+ }
+
/**
* Tests MimeTypes.getMimeType(URL), which examines both the byte header
* and, if necessary, the URL's extension.
