You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by le...@apache.org on 2016/10/26 02:37:07 UTC
[2/7] tika git commit: Merge branch 'master' into TIKA-1343
Merge branch 'master' into TIKA-1343
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/4aff4839
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/4aff4839
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/4aff4839
Branch: refs/heads/master
Commit: 4aff4839aece41a739b93169cf7a475ecfc5c70c
Parents: d4fb28f c93ff3e
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Thu May 5 14:03:01 2016 -0700
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Thu May 5 14:03:01 2016 -0700
----------------------------------------------------------------------
.../org/apache/tika/mime/tika-mimetypes.xml | 8 +
.../tika/parser/code/SourceCodeParser.java | 142 ++++++++--------
.../apache/tika/parser/image/ICNSParser.java | 117 +++++++++++++
.../org/apache/tika/parser/image/ICNSType.java | 170 +++++++++++++++++++
.../parser/mp4/DirectFileReadDataSource.java | 2 +-
.../org/apache/tika/parser/mp4/MP4Parser.java | 13 +-
.../services/org.apache.tika.parser.Parser | 3 +-
.../org/apache/tika/mime/TestMimeTypes.java | 8 +
.../tika/parser/image/ICNSParserTest.java | 65 +++++++
.../test/resources/test-documents/testICNS.icns | Bin 0 -> 2472 bytes
.../test-documents/testICNS_basic.icns | Bin 0 -> 18199 bytes
.../resources/test-documents/testKeynoteNew.key | Bin 0 -> 274397 bytes
.../test-documents/testNumbersNew.numbers | Bin 0 -> 179147 bytes
.../resources/test-documents/testPagesNew.pages | Bin 0 -> 237567 bytes
14 files changed, 447 insertions(+), 81 deletions(-)
----------------------------------------------------------------------