You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ma...@apache.org on 2021/10/01 12:07:10 UTC
svn commit: r1893779 -
/poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java
Author: mariusvolkhart
Date: Fri Oct 1 12:07:10 2021
New Revision: 1893779
URL: http://svn.apache.org/viewvc?rev=1893779&view=rev
Log:
Reduce allocations and copying when extracting PNGs created by Mac
This logic is covered by the TestHSSFPictureData#testMacPicture() test.
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java
Modified: poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java?rev=1893779&r1=1893778&r2=1893779&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java Fri Oct 1 12:07:10 2021
@@ -18,19 +18,15 @@
package org.apache.poi.sl.image;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.commons.io.input.UnsynchronizedByteArrayInputStream;
import org.apache.poi.poifs.filesystem.FileMagic;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.RecordFormatException;
+
+import java.util.Arrays;
public final class ImageHeaderPNG {
private static final int MAGIC_OFFSET = 16;
- private byte[] data;
+ private final byte[] data;
/**
* @param data The raw image data
@@ -46,12 +42,11 @@ public final class ImageHeaderPNG {
public byte[] extractPNG() {
//
//Just cut it off!.
- try (InputStream is = new UnsynchronizedByteArrayInputStream(data)) {
- if (is.skip(MAGIC_OFFSET) == MAGIC_OFFSET && FileMagic.valueOf(is) == FileMagic.PNG) {
- return IOUtils.toByteArray(is);
+ if (data.length >= MAGIC_OFFSET) {
+ byte[] newData = Arrays.copyOfRange(data, MAGIC_OFFSET, data.length);
+ if (FileMagic.valueOf(newData) == FileMagic.PNG) {
+ return newData;
}
- } catch (IOException e) {
- throw new RecordFormatException("Unable to parse PNG header", e);
}
return data;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org