Merge branch 'master' into ATS-0000_refactor_packages [skip ci]

# Conflicts:
#	alfresco-transform-misc/alfresco-transform-misc/pom.xml
This commit is contained in:
alandavis
2022-07-12 10:38:28 +01:00
3 changed files with 8 additions and 11 deletions

View File

@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox-tools</artifactId>
<version>2.0.25</version>
<version>${dependency.pdfbox.version}</version>
</dependency>
<!-- OOXMLThumbnailContentTransformer -->

View File

@@ -32,7 +32,7 @@ import java.io.PushbackInputStream;
import java.util.HashSet;
import java.util.Set;
import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.poifs.filesystem.FileMagic;
import org.apache.poi.util.IOUtils;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
@@ -95,10 +95,7 @@ public class TikaOfficeDetectParser implements Parser
}
// Which is it?
if (initial4[0] == POIFSConstants.OOXML_FILE_HEADER[0] &&
initial4[1] == POIFSConstants.OOXML_FILE_HEADER[1] &&
initial4[2] == POIFSConstants.OOXML_FILE_HEADER[2] &&
initial4[3] == POIFSConstants.OOXML_FILE_HEADER[3])
if (FileMagic.valueOf(initial4) == FileMagic.OOXML)
{
ooxmlParser.parse(wrapped, handler, metadata, parseContext);
}