diff --git a/src/java/org/apache/poi/ddf/EscherPictBlip.java b/src/java/org/apache/poi/ddf/EscherPictBlip.java index 802b267e2..5920d97b9 100644 --- a/src/java/org/apache/poi/ddf/EscherPictBlip.java +++ b/src/java/org/apache/poi/ddf/EscherPictBlip.java @@ -20,7 +20,6 @@ import org.apache.poi.util.HexDump; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; -import org.apache.poi.hslf.blip.Metafile; import java.awt.Dimension; import java.awt.Rectangle; @@ -101,22 +100,6 @@ public class EscherPictBlip return bytesAfterHeader + HEADER_SIZE; } - private byte[] read(byte[] data, int pos) throws IOException { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - ByteArrayInputStream bis = new ByteArrayInputStream(data); - Metafile.Header header = new Metafile.Header(); - header.read(data, pos); - bis.skip(pos + header.getSize()); - InflaterInputStream inflater = new InflaterInputStream( bis ); - byte[] chunk = new byte[4096]; - int count; - while ((count = inflater.read(chunk)) >=0 ) { - out.write(chunk,0,count); - } - inflater.close(); - return out.toByteArray(); - } - /** * Serializes the record to an existing byte array. * diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java index 2d7d6be36..b58bb88d6 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java @@ -42,7 +42,7 @@ public class TestHSSFPictureData extends TestCase{ static String cwd = System.getProperty("HSSF.testdata.path"); public void testPictures() throws IOException { - FileInputStream is = new FileInputStream(new File(cwd, "SimpleWithImages-win.xls")); + FileInputStream is = new FileInputStream(new File(cwd, "SimpleWithImages.xls")); HSSFWorkbook wb = new HSSFWorkbook(is); is.close();