<!-- Don't forget to update status.xml too! -->
<release version="3.5-beta5" date="2008-??-??">
+ <action dev="POI-DEVELOPERS" type="add">46320 - added HSSFPictureData.getFormat()</action>
+ <action dev="POI-DEVELOPERS" type="fix">fixed HSSFSheet.shiftRow to move hyperlinks</action>
<action dev="POI-DEVELOPERS" type="fix">fixed formula parser to correctly resolve sheet-level names</action>
<action dev="POI-DEVELOPERS" type="fix">46433 - support for shared formulas in XSSF</action>
<action dev="POI-DEVELOPERS" type="add">46299 - support for carriage return and line break in XWPFRun</action>
<!-- Don't forget to update changes.xml too! -->
<changes>
<release version="3.5-beta5" date="2008-??-??">
+ <action dev="POI-DEVELOPERS" type="add">46320 - added HSSFPictureData.getFormat()</action>
+ <action dev="POI-DEVELOPERS" type="fix">fixed HSSFSheet.shiftRow to move hyperlinks</action>
<action dev="POI-DEVELOPERS" type="fix">fixed formula parser to correctly resolve sheet-level names</action>
<action dev="POI-DEVELOPERS" type="fix">46433 - support for shared formulas in XSSF</action>
<action dev="POI-DEVELOPERS" type="add">46299 - support for carriage return and line break in XWPFRun</action>
return blip.getPicturedata();
}
- /* (non-Javadoc)
- * @see org.apache.poi.hssf.usermodel.PictureData#suggestFileExtension()
+ /**
+ *
+ * @return format of the picture.
+ * @see HSSFWorkbook#PICTURE_TYPE_DIB
+ * @see HSSFWorkbook#PICTURE_TYPE_WMF
+ * @see HSSFWorkbook#PICTURE_TYPE_EMF
+ * @see HSSFWorkbook#PICTURE_TYPE_PNG
+ * @see HSSFWorkbook#PICTURE_TYPE_JPEG
+ * @see HSSFWorkbook#PICTURE_TYPE_PICT
*/
+ public int getFormat(){
+ return blip.getRecordId() - (short)0xF018;
+ }
+
+ /**
+ * @see #getFormat
+ */
public String suggestFileExtension()
{
switch (blip.getRecordId())
assertNotNull(jpg);\r
assertEquals(192, jpg.getWidth());\r
assertEquals(176, jpg.getHeight());\r
+ assertEquals(HSSFWorkbook.PICTURE_TYPE_JPEG, pict.getFormat());\r
} else if (ext.equals("png")){\r
//try to read image data using javax.imageio.* (JDK 1.4+)\r
BufferedImage png = ImageIO.read(new ByteArrayInputStream(data));\r
assertNotNull(png);\r
assertEquals(300, png.getWidth());\r
assertEquals(300, png.getHeight());\r
+ assertEquals(HSSFWorkbook.PICTURE_TYPE_PNG, pict.getFormat());\r
} else {\r
//TODO: test code for PICT, WMF and EMF\r
}\r